From 2c8cc793abf98a29529cd3c92d25d1cfd5bc1ac5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 1 Dec 2020 14:29:37 +1300
Subject: [PATCH 001/447] No effective change - tidy test only,
 TestStatelessUpdate

---
 .../org/tests/update/TestStatelessUpdate.java | 165 +++++++++++-------
 1 file changed, 103 insertions(+), 62 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java
index 28addd519..931714dc2 100644
--- a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java
+++ b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java
@@ -1,9 +1,8 @@
 package org.tests.update;
 
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.DB;
 import io.ebean.TransactionalTestCase;
-import org.junit.Assert;
+import io.ebeantest.LoggedSql;
 import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
@@ -20,13 +19,12 @@ import java.util.Set;
 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;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public class TestStatelessUpdate extends TransactionalTestCase {
 
-  private EbeanServer server = server();
-
   @Test
   public void test() {
 
@@ -35,41 +33,50 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     e.setStatus(Status.NEW);
     e.setDescription("wow");
 
-    server.save(e);
+    DB.save(e);
 
     // confirm saved as expected
-    EBasic eBasic = server.find(EBasic.class, e.getId());
-    assertEquals(e.getId(), eBasic.getId());
-    assertEquals(e.getName(), eBasic.getName());
-    assertEquals(e.getStatus(), eBasic.getStatus());
-    assertEquals(e.getDescription(), eBasic.getDescription());
+    EBasic original = DB.find(EBasic.class, e.getId());
+    assertEquals(e.getId(), original.getId());
+    assertEquals(e.getName(), original.getName());
+    assertEquals(e.getStatus(), original.getStatus());
+    assertEquals(e.getDescription(), original.getDescription());
 
     // test updating just the name
-    EBasic updateAll = new EBasic();
-    updateAll.setId(e.getId());
-    updateAll.setName("updAllProps");
+    EBasic updateNameOnly = new EBasic();
+    updateNameOnly.setId(e.getId());
+    updateNameOnly.setName("updateNameOnly");
 
-    server.update(updateAll);
+    LoggedSql.start();
+    DB.update(updateNameOnly);
 
-    eBasic = server.find(EBasic.class, e.getId());
-    assertEquals(e.getStatus(), eBasic.getStatus());
-    assertEquals(e.getDescription(), eBasic.getDescription());
-    assertEquals(updateAll.getName(), eBasic.getName());
+    List<String> sql = LoggedSql.collect();
+    original = DB.find(EBasic.class, e.getId());
+    assertEquals(e.getStatus(), original.getStatus());
+    assertEquals(e.getDescription(), original.getDescription());
+    assertEquals(updateNameOnly.getName(), original.getName());
 
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update e_basic set name=? where id=?; -- bind(updateNameOnly");
 
+    LoggedSql.collect();
     // test setting null
-    EBasic updateDeflt = new EBasic();
-    updateDeflt.setId(e.getId());
-    updateDeflt.setName("updateDeflt");
-    updateDeflt.setDescription(null);
-    server.update(updateDeflt);
+    EBasic updateWithNull = new EBasic();
+    updateWithNull.setId(e.getId());
+    updateWithNull.setName("updateWithNull");
+    updateWithNull.setDescription(null);
+    DB.update(updateWithNull);
+
+    sql = LoggedSql.stop();
 
     // name and description changed (using null)
-    eBasic = server.find(EBasic.class, e.getId());
-    assertEquals(e.getStatus(), eBasic.getStatus());
-    assertEquals(updateDeflt.getName(), eBasic.getName());
-    assertNull(eBasic.getDescription());
+    original = DB.find(EBasic.class, e.getId());
+    assertEquals(e.getStatus(), original.getStatus());
+    assertEquals(updateWithNull.getName(), original.getName());
+    assertNull(original.getDescription());
 
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update e_basic set name=?, description=? where id=?; -- bind(updateWithNull,null,");
   }
 
   @Test(expected = EntityNotFoundException.class)
@@ -80,7 +87,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     basic.setName("something");
     basic.setStatus(Status.ACTIVE);
 
-    Ebean.update(basic);
+    DB.update(basic);
   }
 
   @Test
@@ -91,7 +98,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     basic.setName("something");
     basic.setStatus(Status.ACTIVE);
 
-    assertThat(Ebean.delete(basic)).isFalse();
+    assertThat(DB.delete(basic)).isFalse();
   }
 
   /**
@@ -106,16 +113,17 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     basic.setStatus(Status.NEW);
     basic.setDescription("wow");
 
-    server.save(basic);
+    DB.save(basic);
 
+    LoggedSql.start();
     // act
     EBasic basicWithoutChanges = new EBasic();
     basicWithoutChanges.setId(basic.getId());
-    server.update(basicWithoutChanges);
+    DB.update(basicWithoutChanges);
 
-    // assert
-    // Nothing to check, simply no exception should occur
-    // maybe ensure that no update has been executed
+    // assert no update executed
+    final List<String> sql = LoggedSql.stop();
+    assertThat(sql).isEmpty();
   }
 
   /**
@@ -135,17 +143,18 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     Customer customer = new Customer();
     customer.setName("something");
 
-    server.save(customer);
+    DB.save(customer);
+    LoggedSql.start();
 
     // act
     Customer customerWithoutChanges = new Customer();
     customerWithoutChanges.setId(customer.getId());
-    server.update(customerWithoutChanges);
+    DB.update(customerWithoutChanges);
+    final List<String> sql = LoggedSql.stop();
 
-    Customer result = Ebean.find(Customer.class, customer.getId());
-
-    // assert
+    Customer result = DB.find(Customer.class, customer.getId());
     assertThat(result.getUpdtime()).isEqualToIgnoringMillis(customer.getUpdtime());
+    assertThat(sql).isEmpty();
   }
 
   /**
@@ -163,7 +172,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     customer.setContacts(new ArrayList<>());
     customer.getContacts().add(contact);
 
-    server.save(customer);
+    DB.save(customer);
 
     // act
     Customer customerWithChange = new Customer();
@@ -172,13 +181,17 @@ public class TestStatelessUpdate extends TransactionalTestCase {
 
     // contacts is not loaded
     assertFalse(containsContacts(customerWithChange));
-    server.update(customerWithChange);
+    LoggedSql.start();
+    DB.update(customerWithChange);
+    final List<String> sql = LoggedSql.stop();
 
-    Customer result = Ebean.find(Customer.class, customer.getId());
+    Customer result = DB.find(Customer.class, customer.getId());
 
     // assert null list was ignored (missing children not deleted)
-    Assert.assertNotNull(result.getContacts());
+    assertNotNull(result.getContacts());
     assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty());
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update o_customer set name=?, updtime=? where id=?;");
   }
 
   /**
@@ -198,7 +211,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     customer.setContacts(new ArrayList<>());
     customer.getContacts().add(contact);
 
-    server.save(customer);
+    DB.save(customer);
 
     // act
     Customer customerWithChange = new Customer();
@@ -210,13 +223,17 @@ public class TestStatelessUpdate extends TransactionalTestCase {
 
     // contacts has been initialised to empty BeanList
     assertTrue(containsContacts(customerWithChange));
-    server.update(customerWithChange);
+    LoggedSql.start();
+    DB.update(customerWithChange);
+    final List<String> sql = LoggedSql.stop();
 
-    Customer result = Ebean.find(Customer.class, customer.getId());
+    Customer result = DB.find(Customer.class, customer.getId());
 
     // assert empty bean list was ignore (missing children not deleted)
-    Assert.assertNotNull(result.getContacts());
+    assertNotNull(result.getContacts());
     assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty());
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update o_customer set name=?, updtime=? where id=?;");
   }
 
   @Test
@@ -231,7 +248,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     customer.setContacts(new ArrayList<>());
     customer.getContacts().add(contact);
 
-    server.save(customer);
+    DB.save(customer);
 
     // act
     Customer customerWithChange = new Customer();
@@ -242,16 +259,20 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     customerWithChange.setContacts(Collections.<Contact>emptyList());
 
     assertTrue(containsContacts(customerWithChange));
-    server.update(customerWithChange);
+    LoggedSql.start();
+    DB.update(customerWithChange);
+    final List<String> sql = LoggedSql.stop();
 
-    Customer result = Ebean.find(Customer.class, customer.getId());
+    Customer result = DB.find(Customer.class, customer.getId());
 
     // assert empty bean list was ignore (missing children not deleted)
     assertThat(result.getContacts()).hasSize(1);
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update o_customer set name=?, updtime=? where id=?;");
   }
 
   private boolean containsContacts(Customer cust) {
-    return server.getBeanState(cust).getLoadedProps().contains("contacts");
+    return DB.getBeanState(cust).getLoadedProps().contains("contacts");
   }
 
   /**
@@ -273,7 +294,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     customer.getContacts().add(contact1);
     customer.getContacts().add(contact2);
 
-    server.save(customer);
+    DB.save(customer);
 
     // act
     Contact updateContact1 = new Contact();
@@ -287,11 +308,13 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     updateCustomer.getContacts().add(updateContact1);
     updateCustomer.getContacts().add(updateContact2);
 
-    server.update(updateCustomer);
+    LoggedSql.start();
+    DB.update(updateCustomer);
+    final List<String> sql = LoggedSql.stop();
 
     // assert
-    // maybe check if update instead of insert has been executed,
-    // currently "Unique index or primary key violation" PersistenceException is throwing
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update o_customer set updtime=? where id=?;");
   }
 
   @Test
@@ -308,7 +331,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     customer.getContacts().add(contact1);
     customer.getContacts().add(contact2);
 
-    server.save(customer);
+    DB.save(customer);
 
 
     // act
@@ -324,10 +347,19 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     updateCustomer.getContacts().add(updateContact1);
     updateCustomer.getContacts().add(updateContact3);
 
-    server.update(updateCustomer);
+    LoggedSql.start();
+    DB.update(updateCustomer);
+    final List<String> sql = LoggedSql.stop();
+
+    assertThat(sql).hasSize(5);
+    assertThat(sql.get(0)).contains("update o_customer set updtime=? where id=?");
+    assertThat(sql.get(1)).contains("insert into contact");
+    assertThat(sql.get(2)).contains(" -- bind(");
+    assertThat(sql.get(3)).contains("update contact set last_name=?, customer_id=? where id=?");
+    assertThat(sql.get(4)).contains(" -- bind(");
 
     // assert
-    Customer assCustomer = server.find(Customer.class, customer.getId());
+    Customer assCustomer = DB.find(Customer.class, customer.getId());
     List<Contact> assContacts = assCustomer.getContacts();
     assertThat(assContacts).hasSize(3);
     Set<Integer> ids = new LinkedHashSet<>();
@@ -357,7 +389,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     customer.getContacts().add(contact1);
     customer.getContacts().add(contact2);
 
-    server.save(customer);
+    DB.save(customer);
 
 
     // act
@@ -375,10 +407,19 @@ public class TestStatelessUpdate extends TransactionalTestCase {
     updateCustomer.getContacts().add(updateContact3);
 
     // not adding contact2 but it won't be deleted in this case
-    server.update(updateCustomer);
+    LoggedSql.start();
+    DB.update(updateCustomer);
+    final List<String> sql = LoggedSql.stop();
+
+    assertThat(sql).hasSize(5);
+    assertThat(sql.get(0)).contains("update o_customer set updtime=? where id=?");
+    assertThat(sql.get(1)).contains("insert into contact");
+    assertThat(sql.get(2)).contains(" -- bind(");
+    assertThat(sql.get(3)).contains("update contact set last_name=?, customer_id=? where id=?");
+    assertThat(sql.get(4)).contains(" -- bind(");
 
     // assert
-    Customer assCustomer = server.find(Customer.class, customer.getId());
+    Customer assCustomer = DB.find(Customer.class, customer.getId());
     List<Contact> assContacts = assCustomer.getContacts();
 
     // contact 2 was not deleted this time

From f6c4024ae5e634f476e4b2421f0abb7738498f1e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 1 Dec 2020 21:17:19 +1300
Subject: [PATCH 002/447] No effective change - tidy test only,
 TestStatelessUpdate

---
 .../org/tests/update/TestStatelessUpdate.java  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java
index 931714dc2..d96de03e4 100644
--- a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java
+++ b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java
@@ -368,11 +368,8 @@ public class TestStatelessUpdate extends TransactionalTestCase {
       ids.add(contact.getId());
       names.add(contact.getLastName());
     }
-    assertTrue(ids.contains(contact1.getId()));
-    assertTrue(ids.contains(updateContact3.getId()));
-    assertTrue(ids.contains(contact2.getId()));
-    assertTrue(names.contains(updateContact1.getLastName()));
-    assertTrue(names.contains(updateContact3.getLastName()));
+    assertThat(ids).contains(contact1.getId(), updateContact3.getId(), contact2.getId());
+    assertThat(names).contains(updateContact1.getLastName(), updateContact3.getLastName());
   }
 
   @Test
@@ -391,13 +388,11 @@ public class TestStatelessUpdate extends TransactionalTestCase {
 
     DB.save(customer);
 
-
     // act
     Contact updateContact1 = new Contact();
     updateContact1.setId(contact1.getId());
     updateContact1.setLastName("contact1-changed");
 
-
     Contact updateContact3 = new Contact();
     updateContact3.setLastName("contact3-added");
 
@@ -431,12 +426,7 @@ public class TestStatelessUpdate extends TransactionalTestCase {
       ids.add(contact.getId());
       names.add(contact.getLastName());
     }
-    assertTrue(ids.contains(contact1.getId()));
-    assertTrue(ids.contains(updateContact3.getId()));
-    assertTrue(ids.contains(contact2.getId()));
-
-    assertTrue(names.contains(updateContact1.getLastName()));
-    assertTrue(names.contains(contact2.getLastName()));
-    assertTrue(names.contains(updateContact3.getLastName()));
+    assertThat(ids).contains(contact1.getId(), updateContact3.getId(), contact2.getId());
+    assertThat(names).contains(updateContact1.getLastName(), contact2.getLastName(), updateContact3.getLastName());
   }
 }

From c66875449b93654a9723336f71f5d434c0e10955 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 1 Dec 2020 21:31:53 +1300
Subject: [PATCH 003/447] Add Query.withLock(LockType) and withLock(LockType,
 LockWait) (#2116)

Add Query.withLock(LockType) and withLock(LockType, LockWait)
---
 .../main/java/io/ebean/ExpressionList.java    | 28 +++++++++++++
 ebean-api/src/main/java/io/ebean/Query.java   | 42 ++++++++++++++++---
 .../expression/DefaultExpressionList.java     | 10 +++++
 .../server/expression/JunctionExpression.java | 10 +++++
 .../server/query/DefaultFetchGroupQuery.java  | 10 +++++
 .../server/querydefn/DefaultOrmQuery.java     | 10 +++++
 .../basic/TestQueryForUpdatePostgresLock.java |  2 +-
 .../java/io/ebean/typequery/TQRootBean.java   | 34 +++++++++++++++
 8 files changed, 139 insertions(+), 7 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index 5ac3d7de8..33cf9efcb 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -169,14 +169,38 @@ public interface ExpressionList<T> {
    */
   UpdateQuery<T> asUpdate();
 
+  /**
+   * Execute the query with the given lock type and WAIT.
+   * <p>
+   * Note that <code>forUpdate()</code> is the same as
+   * <code>withLock(LockType.UPDATE)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(Query.LockType lockType);
+
+  /**
+   * Execute the query with the given lock type and lock wait.
+   * <p>
+   * Note that <code>forUpdateNoWait()</code> is the same as
+   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(Query.LockType lockType, Query.LockWait lockWait);
+
   /**
    * Execute using "for update" clause which results in the DB locking the record.
    */
   Query<T> forUpdate();
 
   /**
+   * Deprecated - migrate to withLock().
    * Execute using "for update" with given lock type (currently Postgres only).
    */
+  @Deprecated
   Query<T> forUpdate(Query.LockType lockType);
 
   /**
@@ -188,8 +212,10 @@ public interface ExpressionList<T> {
   Query<T> forUpdateNoWait();
 
   /**
+   * Deprecated - migrate to withLock().
    * Execute using "for update nowait" with given lock type (currently Postgres only).
    */
+  @Deprecated
   Query<T> forUpdateNoWait(Query.LockType lockType);
 
   /**
@@ -201,8 +227,10 @@ public interface ExpressionList<T> {
   Query<T> forUpdateSkipLocked();
 
   /**
+   * Deprecated - migrate to withLock().
    * Execute using "for update skip locked" with given lock type (currently Postgres only).
    */
+  @Deprecated
   Query<T> forUpdateSkipLocked(Query.LockType lockType);
 
   /**
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index 200704cfd..ab1c97122 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -184,7 +184,8 @@ public interface Query<T> {
    */
   enum LockType {
     /**
-     * The default lock type - See PlatformConfig.forUpdateNoKey option.
+     * The default lock type being either UPDATE or NO_KEY_UPDATE based on
+     * PlatformConfig.forUpdateNoKey configuration (Postgres option).
      */
     DEFAULT,
 
@@ -194,17 +195,17 @@ public interface Query<T> {
     UPDATE,
 
     /**
-     * FOR NO KEY UPDATE.
+     * FOR NO KEY UPDATE (Postgres only).
      */
     NO_KEY_UPDATE,
 
     /**
-     * FOR SHARE UPDATE.
+     * FOR SHARE (Postgres only).
      */
     SHARE,
 
     /**
-     * FOR KEY SHARE UPDATE.
+     * FOR KEY SHARE (Postgres only).
      */
     KEY_SHARE
   }
@@ -1643,40 +1644,69 @@ public interface Query<T> {
    */
   String getGeneratedSql();
 
+  /**
+   * Execute the query with the given lock type and WAIT.
+   * <p>
+   * Note that <code>forUpdate()</code> is the same as
+   * <code>withLock(LockType.UPDATE)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(LockType lockType);
+
+  /**
+   * Execute the query with the given lock type and lock wait.
+   * <p>
+   * Note that <code>forUpdateNoWait()</code> is the same as
+   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(LockType lockType, LockWait lockWait);
+
   /**
    * Execute using "for update" clause which results in the DB locking the record.
+   * <p>
+   * The same as <code>withLock(LockType.UPDATE, LockWait.WAIT)</code>.
    */
   Query<T> forUpdate();
 
   /**
    * Execute using "for update" with given lock type (currently Postgres only).
    */
+  @Deprecated
   Query<T> forUpdate(LockType lockType);
 
   /**
    * Execute using "for update" clause with "no wait" option.
    * <p>
    * This is typically a Postgres and Oracle only option at this stage.
-   * </p>
+   * <p>
+   * The same as <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
    */
   Query<T> forUpdateNoWait();
 
   /**
    * Execute using "for update nowait" with given lock type (currently Postgres only).
    */
+  @Deprecated
   Query<T> forUpdateNoWait(LockType lockType);
 
   /**
    * Execute using "for update" clause with "skip locked" option.
    * <p>
    * This is typically a Postgres and Oracle only option at this stage.
-   * </p>
+   * <p>
+   * The same as <code>withLock(LockType.UPDATE, LockWait.SKIPLOCKED)</code>.
    */
   Query<T> forUpdateSkipLocked();
 
   /**
    * Execute using "for update skip locked" with given lock type (currently Postgres only).
    */
+  @Deprecated
   Query<T> forUpdateSkipLocked(LockType lockType);
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 2cb12ea2a..569fb0868 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -486,6 +486,16 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.filterMany(manyProperty).where(expressions, params);
   }
 
+  @Override
+  public Query<T> withLock(Query.LockType lockType) {
+    return query.withLock(lockType);
+  }
+
+  @Override
+  public Query<T> withLock(Query.LockType lockType, Query.LockWait lockWait) {
+    return query.withLock(lockType, lockWait);
+  }
+
   @Override
   public Query<T> forUpdate() {
     return query.forUpdate();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 37dab58f9..81548b19a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -491,6 +491,16 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.findOneOrEmpty();
   }
 
+  @Override
+  public Query<T> withLock(Query.LockType lockType) {
+    return exprList.withLock(lockType);
+  }
+
+  @Override
+  public Query<T> withLock(Query.LockType lockType, Query.LockWait lockWait) {
+    return exprList.withLock(lockType, lockWait);
+  }
+
   @Override
   public Query<T> forUpdate() {
     return exprList.forUpdate();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index f0fc5a923..063f2071c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -544,6 +544,16 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
+  @Override
+  public Query<T> withLock(LockType lockType) {
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
+  }
+
+  @Override
+  public Query<T> withLock(LockType lockType, LockWait lockWait) {
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
+  }
+
   @Override
   public Query<T> forUpdate() {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index a7cb9bd64..0bb1b3e45 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -963,6 +963,16 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public Query<T> withLock(LockType lockType) {
+    return setForUpdateWithMode(LockWait.WAIT, lockType);
+  }
+
+  @Override
+  public Query<T> withLock(LockType lockType, LockWait lockWait) {
+    return setForUpdateWithMode(lockWait, lockType);
+  }
+
   @Override
   public DefaultOrmQuery<T> forUpdate() {
     return setForUpdateWithMode(LockWait.WAIT, LockType.DEFAULT);
diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java
index 799850500..ecda6bee2 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java
@@ -55,7 +55,7 @@ public class TestQueryForUpdatePostgresLock extends BaseTestCase {
   private void lockArticle(Integer id) {
     timePreLock = System.currentTimeMillis();
     log.info("lock start");
-    DB.find(Article.class).setId(id).forUpdate(NO_KEY_UPDATE).findOne();
+    DB.find(Article.class).setId(id).withLock(NO_KEY_UPDATE).findOne();
     sleep(1000);
     timePostLock = System.currentTimeMillis();
     log.info("lock done");
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 5f0e20185..66858dc10 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -685,6 +685,34 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
+  /**
+   * Execute the query with the given lock type and WAIT.
+   * <p>
+   * Note that <code>forUpdate()</code> is the same as
+   * <code>withLock(LockType.UPDATE)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  R withLock(Query.LockType lockType) {
+    query.withLock(lockType);
+    return root;
+  }
+
+  /**
+   * Execute the query with the given lock type and lock wait.
+   * <p>
+   * Note that <code>forUpdateNoWait()</code> is the same as
+   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  R withLock(Query.LockType lockType, Query.LockWait lockWait) {
+    query.withLock(lockType, lockWait);
+    return root;
+  }
+
   /**
    * Execute using "for update" clause which results in the DB locking the record.
    */
@@ -694,8 +722,10 @@ public abstract class TQRootBean<T, R> {
   }
 
   /**
+   * Deprecated - migrate to withLock().
    * Execute using "for update" with given lock type (currently Postgres only).
    */
+  @Deprecated
   public R forUpdate(Query.LockType lockType) {
     query.forUpdate(lockType);
     return root;
@@ -712,8 +742,10 @@ public abstract class TQRootBean<T, R> {
   }
 
   /**
+   * Deprecated - migrate to withLock().
    * Execute using "for update nowait" with given lock type (currently Postgres only).
    */
+  @Deprecated
   public R forUpdateNoWait(Query.LockType lockType) {
     query.forUpdateNoWait(lockType);
     return root;
@@ -731,8 +763,10 @@ public abstract class TQRootBean<T, R> {
   }
 
   /**
+   * Deprecated - migrate to withLock().
    * Execute using "for update skip locked" with given lock type (currently Postgres only).
    */
+  @Deprecated
   public R forUpdateSkipLocked(Query.LockType lockType) {
     query.forUpdateSkipLocked(lockType);
     return root;

From aa1e3ea1bc128c38e710f706f32766d088cf73b6 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 1 Dec 2020 22:04:07 +1300
Subject: [PATCH 004/447] #2118 - Generated code for @DbForeignKey reading
 onDelete and Ignores onUpdate

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

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 340f549be..648cfac83 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -457,7 +457,7 @@ public class PlatformDdl {
 
   protected void appendForeignKeySuffix(WriteForeignKey request, StringBuilder buffer) {
     appendForeignKeyOnDelete(buffer, withDefault(request.onDelete()));
-    appendForeignKeyOnUpdate(buffer, withDefault(request.onDelete()));
+    appendForeignKeyOnUpdate(buffer, withDefault(request.onUpdate()));
   }
 
   protected ConstraintMode withDefault(ConstraintMode mode) {
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index 8546885d0..da85dcd28 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -9,8 +9,9 @@ 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.dbmigration.migration.AlterColumn;
 import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -285,4 +286,34 @@ public class PlatformDdl_AlterColumnTest {
     assertEquals(hanaDdl.useIdentityType(IdType.GENERATOR), IdType.GENERATOR);
     assertEquals(hanaDdl.useIdentityType(IdType.EXTERNAL), IdType.EXTERNAL);
   }
+
+  @Test
+  public void appendForeignKeySuffix_when_defaults() {
+    assertThat(alterFkey(null, null)).isEqualTo(" on delete restrict on update restrict");
+  }
+
+  @Test
+  public void appendForeignKeySuffix_when_RestrictSetNull() {
+    assertThat(alterFkey("RESTRICT", "SET_NULL")).isEqualTo(" on delete restrict on update set null");
+  }
+
+  @Test
+  public void appendForeignKeySuffix_when_SetNullRestrict() {
+    assertThat(alterFkey("SET_NULL", "RESTRICT")).isEqualTo(" on delete set null on update restrict");
+  }
+
+  @Test
+  public void appendForeignKeySuffix_when_SetDefaultCascade() {
+    assertThat(alterFkey("SET_DEFAULT", "CASCADE")).isEqualTo(" on delete set null on update restrict");
+  }
+
+  private String alterFkey(String onDelete, String onUpdate) {
+    AlterForeignKey afk = new AlterForeignKey();
+    afk.setOnDelete(onDelete);
+    afk.setOnUpdate(onUpdate);
+    StringBuilder buffer = new StringBuilder();
+    h2Ddl.appendForeignKeySuffix(new WriteForeignKey(afk), buffer);
+    return buffer.toString();
+  }
+
 }

From 9ab26cfb9d495dc65e0c4483f53c72156f556da3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 3 Dec 2020 09:48:41 +1300
Subject: [PATCH 005/447] #2118 - Fix test only PlatformDdl_AlterColumnTest

---
 .../ddlgeneration/platform/PlatformDdl_AlterColumnTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index da85dcd28..3a0a8d727 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.h2.H2Platform;
@@ -29,7 +29,7 @@ public class PlatformDdl_AlterColumnTest {
   private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
 
   {
-    DatabaseConfig serverConfig = Ebean.getDefaultServer().getPluginApi().getServerConfig();
+    DatabaseConfig serverConfig = DB.getDefault().getPluginApi().getServerConfig();
     sqlServerDdl.configure(serverConfig);
   }
 
@@ -304,7 +304,7 @@ public class PlatformDdl_AlterColumnTest {
 
   @Test
   public void appendForeignKeySuffix_when_SetDefaultCascade() {
-    assertThat(alterFkey("SET_DEFAULT", "CASCADE")).isEqualTo(" on delete set null on update restrict");
+    assertThat(alterFkey("SET_DEFAULT", "CASCADE")).isEqualTo(" on delete set default on update cascade");
   }
 
   private String alterFkey(String onDelete, String onUpdate) {

From 786444a6b9007fd44d616a8804bb08ed19ebe5db Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 3 Dec 2020 13:16:51 +1300
Subject: [PATCH 006/447] Refactor BackgroundExecutor add submit() methods
 returning Future (#2121)

- Adds submit() methods that return Future
- Refactor internals to use DaemonScheduleThreadPool
- Delete the now unused DaemonExecutorService
- Tidy internals using wrapMDC() methods
---
 .../java/io/ebean/BackgroundExecutor.java     |  44 +++---
 .../core/DefaultBackgroundExecutor.java       | 129 +++++++++---------
 .../server/core/DefaultServer.java            |   6 +-
 .../server/core/bootup/BootupClasses.java     |   7 +-
 .../server/lib/DaemonExecutorService.java     |  78 -----------
 .../server/lib/DaemonScheduleThreadPool.java  |  18 +--
 .../server/lib/DaemonThreadFactory.java       |  19 +--
 .../core/DefaultBackgroundExecutorTest.java   |  94 ++++++++++++-
 .../lib/sql/TestDataSourceMaxWithEntity.java  |  67 ---------
 .../sql/TestShutdownWithBackgroundTasks.java  |  57 ++++++++
 .../src/test/resources/logback-test.xml       |   2 +-
 11 files changed, 254 insertions(+), 267 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java
 delete mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java

diff --git a/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java b/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java
index 9ffa4b62b..94900c249 100644
--- a/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java
+++ b/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java
@@ -1,31 +1,40 @@
 package io.ebean;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Background thread pool service for executing of tasks asynchronously.
+ * Background executor service for executing of tasks asynchronously.
  * <p>
- * This service is used internally by Ebean for executing background tasks such
- * as the {@link Query#findFutureList()} and also for executing background tasks
- * periodically.
- * </p>
+ * This service can be used to execute tasks in the background.
  * <p>
- * This service has been made available so you can use it for your application
- * code if you want. It can be useful for some server caching implementations
- * (background population and trimming of the cache etc).
- * </p>
- *
- * @author rbygrave
+ * This service is managed by Ebean and will perform a clean shutdown
+ * waiting for background tasks to complete with a default 30 second
+ * timeout. Shutdown occurs prior to DataSource shutdown.
+ * <p>
+ * This also propagates MDC context from the current thread to the
+ * background task if defined.
  */
 public interface BackgroundExecutor {
 
   /**
-   * Execute a task in the background.
+   * Execute a callable task in the background returning the Future.
    */
-  void execute(Runnable r);
+  <T> Future<T> submit(Callable<T> task);
+
+  /**
+   * Execute a runnable task in the background returning the Future.
+   */
+  Future<?> submit(Runnable task);
+
+  /**
+   * Execute a task in the background. Effectively the same as
+   * {@link BackgroundExecutor#submit(Runnable)} but returns void.
+   */
+  void execute(Runnable task);
 
   /**
    * Execute a task periodically with a fixed delay between each execution.
@@ -36,12 +45,12 @@ public interface BackgroundExecutor {
    * That is, this method has the same behaviour characteristics as
    * {@link ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, TimeUnit)}
    */
-  void executePeriodically(Runnable r, long delay, TimeUnit unit);
+  void executePeriodically(Runnable task, long delay, TimeUnit unit);
 
   /**
    * Execute a task periodically additionally with an initial delay different from delay.
    */
-  void executePeriodically(Runnable r, long initialDelay, long delay, TimeUnit unit);
+  void executePeriodically(Runnable task, long initialDelay, long delay, TimeUnit unit);
 
   /**
    * Schedules a Runnable for one-shot action that becomes enabled after the given delay.
@@ -49,14 +58,13 @@ public interface BackgroundExecutor {
    * @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);
+  ScheduledFuture<?> schedule(Runnable task, 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);
-
+  <V> ScheduledFuture<V> schedule(Callable<V> task, long delay, TimeUnit unit);
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
index 89f6aa333..238911959 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
@@ -1,12 +1,13 @@
 package io.ebeaninternal.server.core;
 
 import io.ebeaninternal.api.SpiBackgroundExecutor;
-import io.ebeaninternal.server.lib.DaemonExecutorService;
 import io.ebeaninternal.server.lib.DaemonScheduleThreadPool;
 import org.slf4j.MDC;
 
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -15,98 +16,94 @@ import java.util.concurrent.TimeUnit;
  */
 public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
-  private final DaemonScheduleThreadPool schedulePool;
-
-  private final DaemonExecutorService pool;
+  private final ScheduledExecutorService executor;
 
   /**
    * Construct the default implementation of BackgroundExecutor.
    */
   public DefaultBackgroundExecutor(int schedulePoolSize, int shutdownWaitSeconds, String namePrefix) {
-    this.pool = new DaemonExecutorService(shutdownWaitSeconds, namePrefix);
-    this.schedulePool = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix + "-periodic-");
+    this.executor = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix);
+  }
+
+  /**
+   * Wrap the task with MDC context if defined.
+   */
+  <T> Callable<T> wrapMDC(Callable<T> task) {
+    final Map<String, String> map = MDC.getCopyOfContextMap();
+    if (map == null) {
+      return task;
+    } else {
+      return () -> {
+        MDC.setContextMap(map);
+        try {
+          return task.call();
+        } finally {
+          MDC.clear();
+        }
+      };
+    }
+  }
+
+  /**
+   * Wrap the task with MDC context if defined.
+   */
+  Runnable wrapMDC(Runnable task) {
+    final Map<String, String> map = MDC.getCopyOfContextMap();
+    if (map == null) {
+      return task;
+    } else {
+      return () -> {
+        MDC.setContextMap(map);
+        try {
+          task.run();
+        } finally {
+          MDC.clear();
+        }
+      };
+    }
+  }
+
+  @Override
+  public <T> Future<T> submit(Callable<T> task) {
+    return executor.submit(wrapMDC(task));
   }
 
   /**
    * Execute a Runnable using a background thread.
    */
   @Override
-  public void execute(Runnable r) {
-    final Map<String, String> map = MDC.getCopyOfContextMap();
-    if (map == null) {
-      pool.execute(r);
-    } else {
-      pool.execute(() -> {
-        MDC.setContextMap(map);
-        try {
-          r.run();
-        } finally {
-          MDC.clear();
-        }
-      });
-    }
+  public Future<?> submit(Runnable task) {
+    return executor.submit(wrapMDC(task));
   }
 
   @Override
-  public void executePeriodically(Runnable r, long delay, TimeUnit unit) {
-    executePeriodically(r, delay, delay, unit);
+  public void execute(Runnable task) {
+    submit(task);
   }
 
   @Override
-  public void executePeriodically(Runnable r, long initialDelay, long delay, TimeUnit unit) {
-    final Map<String, String> map = MDC.getCopyOfContextMap();
-    if (map == null) {
-      schedulePool.scheduleWithFixedDelay(r, initialDelay, delay, unit);
-    } else {
-      schedulePool.scheduleWithFixedDelay(() -> {
-        MDC.setContextMap(map);
-        try {
-          r.run();
-        } finally {
-          MDC.clear();
-        }
-      }, initialDelay, delay, unit);
-    }
+  public void executePeriodically(Runnable task, long delay, TimeUnit unit) {
+    executePeriodically(task, delay, delay, unit);
   }
 
   @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);
-    }
+  public void executePeriodically(Runnable task, long initialDelay, long delay, TimeUnit unit) {
+    executor.scheduleWithFixedDelay(wrapMDC(task), initialDelay, 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(() -> {
-        MDC.setContextMap(map);
-        try {
-          return c.call();
-        } finally {
-          MDC.clear();
-        }
-      }, delay, unit);
-    }
+  public ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit) {
+    return executor.schedule(wrapMDC(task), delay, unit);
+  }
+
+  @Override
+  public <V> ScheduledFuture<V> schedule(Callable<V> task, long delay, TimeUnit unit) {
+    return executor.schedule(wrapMDC(task), delay, unit);
   }
 
   @Override
   public void shutdown() {
-    pool.shutdown();
-    schedulePool.shutdown();
+    executor.shutdown();
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index ae6549457..1b3291d59 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -451,16 +451,20 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     backgroundExecutor.shutdown();
     // shutdown DataSource (if its an Ebean one)
     transactionManager.shutdown(shutdownDataSource, deregisterDriver);
+    dumpMetrics();
     shutdown = true;
     if (shutdownDataSource) {
       config.setDataSource(null);
     }
   }
 
-  private void shutdownPlugins() {
+  private void dumpMetrics() {
     if (config.isDumpMetricsOnShutdown()) {
       new DumpMetrics(this, config.getDumpMetricsOptions()).dump();
     }
+  }
+
+  private void shutdownPlugins() {
     for (Plugin plugin : serverPlugins) {
       try {
         plugin.shutdown();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
index 6e9326afe..f7c1a5fea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
@@ -223,12 +223,9 @@ public class BootupClasses implements ClassFilter {
    */
   private <T> T create(Class<T> cls, boolean logOnException) {
     try {
-      // instantiate via found class
-      Constructor<T> constructor = cls.getConstructor();
-      return constructor.newInstance();
-
+      return cls.getConstructor().newInstance();
     } catch (NoSuchMethodException e) {
-      logger.debug("Ignore/expected - no default constructor", e);
+      logger.debug("Ignore/expected - no default constructor: " +e.getMessage());
       return null;
 
     } catch (Exception e) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java b/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java
deleted file mode 100644
index 48883f87f..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.ebeaninternal.server.lib;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * A "CachedThreadPool" based on Daemon threads.
- * <p>
- * The Threads are created as needed and once idle live for 60 seconds.
- */
-public final class DaemonExecutorService {
-
-  private static final Logger logger = LoggerFactory.getLogger(DaemonExecutorService.class);
-
-  private final ReentrantLock lock = new ReentrantLock(false);
-
-  private final String namePrefix;
-
-  private final int shutdownWaitSeconds;
-
-  private final ExecutorService service;
-
-  /**
-   * Construct the DaemonThreadPool.
-   *
-   * @param shutdownWaitSeconds the time in seconds allowed for the pool to shutdown nicely. After
-   *                            this the pool is forced to shutdown.
-   */
-  public DaemonExecutorService(int shutdownWaitSeconds, String namePrefix) {
-    this.service = Executors.newCachedThreadPool(new DaemonThreadFactory(namePrefix));
-    this.shutdownWaitSeconds = shutdownWaitSeconds;
-    this.namePrefix = namePrefix;
-  }
-
-  /**
-   * Execute the Runnable.
-   */
-  public void execute(Runnable runnable) {
-    service.execute(runnable);
-  }
-
-  /**
-   * Shutdown this thread pool nicely if possible.
-   * <p>
-   * This will wait a maximum of 20 seconds before terminating any threads still
-   * working.
-   * </p>
-   */
-  public void shutdown() {
-    lock.lock();
-    try {
-      if (service.isShutdown()) {
-        logger.debug("DaemonExecutorService[{}] already shut down", namePrefix);
-        return;
-      }
-      try {
-        logger.debug("DaemonExecutorService[{}] shutting down...", namePrefix);
-        service.shutdown();
-        if (!service.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
-          logger.info("DaemonExecutorService[{}] shut down timeout exceeded. Terminating running threads.", namePrefix);
-          service.shutdownNow();
-        }
-
-      } catch (Exception e) {
-        logger.error("Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
-        e.printStackTrace();
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java b/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
index f3ee018af..c6636794d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
@@ -9,15 +9,12 @@ import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Daemon based ScheduleThreadPool.
- * <p>
- * Uses Daemon threads and hooks into shutdown event.
- * </p>
  */
 public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor {
 
   private static final Logger logger = LoggerFactory.getLogger(DaemonScheduleThreadPool.class);
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final String namePrefix;
 
@@ -35,26 +32,25 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
   /**
    * Shutdown this thread pool nicely if possible.
    * <p>
-   * This will wait a maximum of 20 seconds before terminating any threads still
-   * working.
-   * </p>
+   * This will wait a maximum of shutdownWaitSeconds seconds before
+   * terminating any threads still working.
    */
   @Override
   public void shutdown() {
     lock.lock();
     try {
       if (super.isShutdown()) {
-        logger.debug("DaemonScheduleThreadPool {} already shut down", namePrefix);
+        logger.debug("Already shutdown {}", namePrefix);
         return;
       }
       try {
-        logger.debug("DaemonScheduleThreadPool {} shutting down...", namePrefix);
+        logger.trace("Shutting down {} ...", namePrefix);
         super.shutdown();
         if (!super.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
-          logger.info("DaemonScheduleThreadPool shut down timeout exceeded. Terminating running threads.");
+          logger.info("Shutdown wait timeout exceeded. Terminating running threads for {}", namePrefix);
           super.shutdownNow();
         }
-
+        logger.debug("Shutdown complete for {}", namePrefix);
       } catch (Exception e) {
         logger.error("Error during shutdown of " + namePrefix, e);
         e.printStackTrace();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java
index 6656c1fdd..4b1c87770 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.lib;
 
-
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -9,42 +8,28 @@ import java.util.concurrent.atomic.AtomicInteger;
  * <p>
  * Daemon threads do not stop a JVM stopping. If an application only has Daemon
  * threads left it will shutdown.
- * </p>
  * <p>
  * In using Daemon threads you need to either not care about being interrupted
  * on shutdown or register with the JVM shutdown hook to perform a nice shutdown
  * of the daemon threads etc.
- * </p>
- *
- * @author rbygrave
  */
 public class DaemonThreadFactory implements ThreadFactory {
 
-  private static final AtomicInteger poolNumber = new AtomicInteger(1);
-
-  private final ThreadGroup group;
-
   private final AtomicInteger threadNumber = new AtomicInteger(1);
 
   private final String namePrefix;
 
   public DaemonThreadFactory(String namePrefix) {
-    SecurityManager s = System.getSecurityManager();
-    this.group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
-    this.namePrefix = namePrefix != null ? namePrefix : "pool-" + poolNumber.getAndIncrement() + "-thread-";
+    this.namePrefix = namePrefix;
   }
 
   @Override
   public Thread newThread(Runnable r) {
-
-    Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
-
+    Thread t = new Thread(null, r, namePrefix + threadNumber.getAndIncrement(), 0);
     t.setDaemon(true);
-
     if (t.getPriority() != Thread.NORM_PRIORITY) {
       t.setPriority(Thread.NORM_PRIORITY);
     }
-
     return t;
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java
index 647d95613..aa8c56598 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java
@@ -2,12 +2,64 @@ package io.ebeaninternal.server.core;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.slf4j.MDC;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DefaultBackgroundExecutorTest {
 
+  @Test
+  public void submit_callable() throws Exception {
+
+    DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 2, "test");
+
+    final Future<String> future0 = es.submit(() -> "Hello");
+    final Future<String> future1 = es.submit(() -> "There");
+    final Future<String> future2 = es.submit(() -> {
+      try {
+        Thread.sleep(100);
+        return "Slow";
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        return "Interrupted";
+      }
+    });
+
+    es.shutdown();
+
+    assertThat(future0.get()).isEqualTo("Hello");
+    assertThat(future1.get(1, TimeUnit.SECONDS)).isEqualTo("There");
+    assertThat(future2.get()).isEqualTo("Slow");
+  }
+
+  @Test
+  public void shutdown_slowCallable_expect_interrupted() throws Exception {
+
+    int shutdownWaitSecs = 1;
+    DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, shutdownWaitSecs, "test");
+
+    final Future<String> future2 = es.submit(() -> {
+      try {
+        Thread.sleep(1500); // longer than shutdown wait
+        return "Slow";
+      } catch (InterruptedException e) {
+        // expected for this test
+        Thread.currentThread().interrupt();
+        return "Interrupted";
+      }
+    });
+
+    // shutdown waits max shutdownWaitSecs seconds for active tasks
+    es.shutdown();
+    assertThat(future2.get()).isEqualTo("Interrupted");
+  }
+
   @Test
   @Ignore("test takes long time")
-  public void shutdown_when_running_expect_waitAndNiceShutdown() throws Exception {
+  public void shutdown_when_running_expect_waitAndNiceShutdown() {
 
     DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 20, "test");
 
@@ -20,7 +72,7 @@ public class DefaultBackgroundExecutorTest {
 
   @Test
   @Ignore("test takes long time")
-  public void shutdown_when_rougeRunnable_expect_InterruptedException() throws Exception {
+  public void shutdown_when_rougeRunnable_expect_InterruptedException() {
 
     DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 10, "test");
 
@@ -31,8 +83,44 @@ public class DefaultBackgroundExecutorTest {
     es.shutdown();
   }
 
+  @Test
+  public void wrapWithNoMDC() {
+    DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 10, "test");
+    assertThat(MDC.getCopyOfContextMap()).isNull();
+    es.wrapMDC(() -> {
+      assertThat(MDC.getCopyOfContextMap()).isNull();
+    });
+    es.wrapMDC(() -> {
+      assertThat(MDC.getCopyOfContextMap()).isNull();
+      return "Callable";
+    });
+    es.shutdown();
+  }
 
-  class RunFor implements Runnable {
+  @Test
+  public void wrapWithMDC_expect_() {
+    DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 10, "test");
+    MDC.clear();
+    MDC.put("hello", "there");
+    es.wrapMDC(() -> {
+      assertThat(MDC.get("hello")).isEqualTo("there");
+    });
+    es.wrapMDC(() -> {
+      assertThat(MDC.get("hello")).isEqualTo("there");
+      return "Callable";
+    });
+    es.execute(() -> {
+      assertThat(MDC.get("hello")).isEqualTo("there");
+    });
+    es.submit(() -> {
+      assertThat(MDC.get("hello")).isEqualTo("there");
+      return "Callable";
+    });
+    MDC.clear();
+    es.shutdown();
+  }
+
+  private static class RunFor implements Runnable {
 
     final long wait;
     final String id;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java b/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java
deleted file mode 100644
index 73d93c6fb..000000000
--- a/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.ebeaninternal.server.lib.sql;
-
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
-import io.ebeaninternal.server.core.DefaultBackgroundExecutor;
-import org.tests.model.basic.Customer;
-import org.junit.Test;
-
-public class TestDataSourceMaxWithEntity extends BaseTestCase {
-
-  @Test
-  public void test() {
-
-    boolean skipThisTest = true;
-
-    if (skipThisTest) {
-      return;
-    }
-
-    EbeanServer server = Ebean.getServer(null);
-
-
-    DefaultBackgroundExecutor bg = new DefaultBackgroundExecutor(1, 30, "testDs");
-
-    try {
-      for (int i = 0; i < 12; i++) {
-        // Thread.sleep(10*i);
-        bg.execute(new ConnRunner(server, 4000, i));
-      }
-
-      Thread.sleep(30000);
-
-      server.shutdown(true, false);
-
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  private static class ConnRunner implements Runnable {
-
-    final EbeanServer server;
-    final long sleepMillis;
-    final int position;
-
-    ConnRunner(EbeanServer server, long sleepMillis, int position) {
-      this.server = server;
-      this.sleepMillis = sleepMillis;
-      this.position = position;
-    }
-
-    @Override
-    public void run() {
-
-      server.find(Customer.class).findCount();
-      try {
-        System.out.println(position + " sleep " + sleepMillis);
-        Thread.sleep(sleepMillis);
-        System.out.println(position + " sleep done");
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-    }
-  }
-}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java b/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java
new file mode 100644
index 000000000..f8846ac62
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java
@@ -0,0 +1,57 @@
+package io.ebeaninternal.server.lib.sql;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Database;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+
+public class TestShutdownWithBackgroundTasks extends BaseTestCase {
+
+  @Test
+  @Ignore
+  public void test() {
+
+    Database server = DB.getDefault();
+    final BackgroundExecutor bg = server.getBackgroundExecutor();
+    try {
+      for (int i = 0; i < 12; i++) {
+        bg.execute(new Job(server, 500, i));
+      }
+
+      Thread.sleep(1000);
+      server.shutdown();
+
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  private static class Job implements Runnable {
+
+    final Database server;
+    final long sleepMillis;
+    final int position;
+
+    Job(Database server, long sleepMillis, int position) {
+      this.server = server;
+      this.sleepMillis = sleepMillis;
+      this.position = position;
+    }
+
+    @Override
+    public void run() {
+      try {
+        System.out.println(position + " sleep " + sleepMillis);
+        Thread.sleep(sleepMillis);
+        server.find(Customer.class).findCount();
+        System.out.println(position + " sleep done");
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        e.printStackTrace();
+      }
+    }
+  }
+}
diff --git a/ebean-core/src/test/resources/logback-test.xml b/ebean-core/src/test/resources/logback-test.xml
index 97cbf1ec9..1b8a60a9b 100644
--- a/ebean-core/src/test/resources/logback-test.xml
+++ b/ebean-core/src/test/resources/logback-test.xml
@@ -92,7 +92,7 @@
 <!--  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
 <!--  <logger name="io.ebean.cache.COLL" level="TRACE"/>-->
 
-  <!--<logger name="io.ebeaninternal.server.deploy" level="TRACE"/>-->
+  <logger name="io.ebeaninternal.server.lib" level="TRACE"/>
 
   <!--<logger name="io.ebeaninternal.server.autotune" level="TRACE"/>-->
 

From 046033627a7cd67abdf244de4a2d774287116333 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 3 Dec 2020 13:22:13 +1300
Subject: [PATCH 007/447] Update tests - generated sql for add constraint
 foreign key

---
 .../resources/dbmigration/migrationtest/h2/1.0__initial.sql   | 4 ++--
 .../src/test/resources/dbmigration/migrationtest/h2/1.3.sql   | 4 ++--
 .../resources/dbmigration/migrationtest/hana/1.0__initial.sql | 4 ++--
 .../src/test/resources/dbmigration/migrationtest/hana/1.3.sql | 4 ++--
 .../dbmigration/migrationtest/hsqldb/1.0__initial.sql         | 4 ++--
 .../test/resources/dbmigration/migrationtest/hsqldb/1.3.sql   | 4 ++--
 .../dbmigration/migrationtest/mysql/1.0__initial.sql          | 4 ++--
 .../test/resources/dbmigration/migrationtest/mysql/1.3.sql    | 4 ++--
 .../dbmigration/migrationtest/mysql55/1.0__initial.sql        | 4 ++--
 .../test/resources/dbmigration/migrationtest/mysql55/1.3.sql  | 4 ++--
 .../dbmigration/migrationtest/postgres/1.0__initial.sql       | 4 ++--
 .../test/resources/dbmigration/migrationtest/postgres/1.3.sql | 4 ++--
 .../dbmigration/migrationtest/sqlite/1.0__initial.sql         | 4 ++--
 .../dbmigration/migrationtest/sqlserver17/1.0__initial.sql    | 4 ++--
 .../resources/dbmigration/migrationtest/sqlserver17/1.3.sql   | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
index 37db6d4b2..1e2a4095f 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
@@ -164,10 +164,10 @@ 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);
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 
 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_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 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/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
index 79645fc49..a1d6ccad1 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
@@ -14,11 +14,11 @@ create table migtest_e_ref (
 
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_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 restrict;
 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;
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
index 17e451bad..837424e6d 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
@@ -164,10 +164,10 @@ create column table migtest_oto_master (
 -- 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;
+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 restrict;
 
 -- 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;
+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 restrict;
 
 -- 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/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
index 8c8aa59fc..9e3ba6f9f 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
@@ -9,11 +9,11 @@ create column table migtest_e_ref (
 
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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 on update restrict;
 delimiter $$
 do
 begin
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
index b4d627c18..40616be0a 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
@@ -164,10 +164,10 @@ 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);
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 
 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_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 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/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
index ed3b50536..f7f307719 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
@@ -9,11 +9,11 @@ create table migtest_e_ref (
 
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_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 restrict;
 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;
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
index 0267c1545..ce464c473 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
@@ -161,10 +161,10 @@ 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);
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 
 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_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 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/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
index 593f0f3c0..6953c06f5 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
@@ -14,11 +14,11 @@ create table migtest_e_ref (
 
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_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 restrict;
 alter table migtest_e_basic alter status drop default;
 alter table migtest_e_basic modify status varchar(1);
 
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql
index aba5c29eb..0a76ab174 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql
@@ -161,10 +161,10 @@ 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);
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 
 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_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 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/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql
index 593f0f3c0..6953c06f5 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql
@@ -14,11 +14,11 @@ create table migtest_e_ref (
 
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_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 restrict;
 alter table migtest_e_basic alter status drop default;
 alter table migtest_e_basic modify status varchar(1);
 
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index bc920ec22..5229ed032 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -167,10 +167,10 @@ create index idxd_migtest_0 on migtest_oto_child using hash (upper(name)) where
 create index concurrently ix_migtest_oto_child_lowername_id on migtest_oto_child (lower(name),id);
 create index ix_migtest_oto_child_lowername on migtest_oto_child (lower(name));
 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_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 
 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_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 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/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index 1be77e36d..a57b95ae2 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -14,11 +14,11 @@ create table migtest_e_ref (
 
 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 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 restrict;
 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_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 restrict;
 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;
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
index 565b49c14..1a4944f30 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
@@ -24,7 +24,7 @@ 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
+  foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict
 );
 
 create table migtest_fk_cascade_one (
@@ -53,7 +53,7 @@ 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
+  foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict
 );
 
 create table migtest_e_basic (
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
index af322b975..13b5da203 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
@@ -186,10 +186,10 @@ 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;
+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_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_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_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/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
index 645d0879d..76564b73c 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
@@ -10,11 +10,11 @@ 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;
+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;
 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;
+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;
 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);

From ed2455f460128ec785ff38b17f380472f2502236 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 3 Dec 2020 15:47:14 +1300
Subject: [PATCH 008/447] #2121 - Refactor internals move
 DefaultBackgroundExecutor etc

---
 .../java/io/ebeaninternal/server/core/DefaultContainer.java  | 5 +++--
 .../server/{lib => executor}/DaemonScheduleThreadPool.java   | 2 +-
 .../server/{lib => executor}/DaemonThreadFactory.java        | 2 +-
 .../server/{core => executor}/DefaultBackgroundExecutor.java | 3 +--
 .../{core => executor}/DefaultBackgroundExecutorTest.java    | 3 ++-
 .../sql => executor}/TestShutdownWithBackgroundTasks.java    | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{lib => executor}/DaemonScheduleThreadPool.java (97%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{lib => executor}/DaemonThreadFactory.java (95%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{core => executor}/DefaultBackgroundExecutor.java (96%)
 rename ebean-core/src/test/java/io/ebeaninternal/server/{core => executor}/DefaultBackgroundExecutorTest.java (97%)
 rename ebean-core/src/test/java/io/ebeaninternal/server/{lib/sql => executor}/TestShutdownWithBackgroundTasks.java (96%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 46f9124c0..a352a5b6d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -10,14 +10,15 @@ 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.event.ShutdownManager;
 import io.ebean.service.SpiContainer;
+import io.ebeaninternal.api.DbOffline;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.DbOffline;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
-import io.ebean.event.ShutdownManager;
+import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
similarity index 97%
rename from ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
index c6636794d..3bdf15777 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.lib;
+package io.ebeaninternal.server.executor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java
similarity index 95%
rename from ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java
index 4b1c87770..d1bbf3ee1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.lib;
+package io.ebeaninternal.server.executor;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
similarity index 96%
rename from ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
index 238911959..c93cbfac7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
@@ -1,7 +1,6 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.executor;
 
 import io.ebeaninternal.api.SpiBackgroundExecutor;
-import io.ebeaninternal.server.lib.DaemonScheduleThreadPool;
 import org.slf4j.MDC;
 
 import java.util.Map;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java
similarity index 97%
rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java
rename to ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java
index aa8c56598..264edac57 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java
@@ -1,5 +1,6 @@
-package io.ebeaninternal.server.core;
+package io.ebeaninternal.server.executor;
 
+import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.MDC;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java
similarity index 96%
rename from ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java
rename to ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java
index f8846ac62..a0a98c38a 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.lib.sql;
+package io.ebeaninternal.server.executor;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.BaseTestCase;

From 365b7c46000874b128c0ff466147b87586a8df66 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Dec 2020 20:41:40 +1300
Subject: [PATCH 009/447] #2122 - Metrics for ElementCollection query not
 included in reporting (via MetaInfoManager)

---
 .../server/deploy/BeanDescriptor.java         |  7 +++++++
 .../server/deploy/BeanDescriptorElement.java  | 19 ++++++++++++++++++
 .../server/deploy/BeanDescriptorManager.java  |  9 +++++++++
 .../server/deploy/BeanPropertyAssocMany.java  |  7 +++++++
 .../server/query/CQueryPlan.java              | 20 ++++++++++++-------
 .../TestElementCollectionBasic.java           |  6 +++++-
 6 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index e5b8c10f2..bfb32c8fe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2087,6 +2087,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return name;
   }
 
+  /**
+   * Return the simple name of the entity bean.
+   */
+  public String getSimpleName() {
+    return beanType.getSimpleName();
+  }
+
   /**
    * Summary description.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
index 6553a28d2..1d541377d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
@@ -14,13 +14,32 @@ import java.util.Arrays;
  */
 abstract class BeanDescriptorElement<T> extends BeanDescriptor<T> {
 
+  private final String simpleName;
+
   final ElementHelp elementHelp;
 
   BeanDescriptorElement(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
     super(owner, deploy);
+    this.simpleName = shortName(deploy.getName());
     this.elementHelp = elementHelp;
   }
 
+  private String shortName(String name) {
+    int pos = name.lastIndexOf('.');
+    if (pos > 1) {
+      pos = name.lastIndexOf('.', pos - 1);
+      if (pos > 1) {
+        return name.substring(pos + 1);
+      }
+    }
+    return name;
+  }
+
+  @Override
+  public String getSimpleName() {
+    return simpleName;
+  }
+
   @Override
   public boolean isJsonReadCollection() {
     return true;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 15d2bcdc4..9a8c7a233 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -117,6 +117,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   private final TypeManager typeManager;
   private final BootupClasses bootupClasses;
   private final String serverName;
+  private final List<BeanDescriptor> elementDescriptors = new ArrayList<>();
   private final Map<Class<?>, BeanTable> beanTableMap = new HashMap<>();
   private final Map<String, BeanDescriptor<?>> descMap = new HashMap<>();
   private final Map<String, BeanDescriptor<?>> descQueueMap = new HashMap<>();
@@ -644,6 +645,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     if (desc.isDocStoreMapped()) {
       descQueueMap.put(desc.getDocStoreQueueId(), desc);
     }
+    for (BeanPropertyAssocMany many : desc.propertiesMany()) {
+      if (many.isElementCollection()) {
+        elementDescriptors.add(many.getElementDescriptor());
+      }
+    }
   }
 
   /**
@@ -1619,6 +1625,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     for (BeanDescriptor<?> desc : immutableDescriptorList) {
       desc.visitMetrics(visitor);
     }
+    for (BeanDescriptor desc : elementDescriptors) {
+      desc.visitMetrics(visitor);
+    }
   }
 
   public List<MetaQueryPlan> queryPlanInit(QueryPlanInit request) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 8b98e1679..8e1ac1a14 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -569,6 +569,13 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return elementCollection;
   }
 
+  /**
+   * Return the element bean descriptor (for an element collection only).
+   */
+  public BeanDescriptor<T> getElementDescriptor() {
+    return elementDescriptor;
+  }
+
   /**
    * ManyToMany only, join from local table to intersection table.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index af4ad9c48..86e8d209d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -13,6 +13,7 @@ import io.ebeaninternal.api.SpiQueryBindCapture;
 import io.ebeaninternal.api.SpiQueryPlan;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import io.ebeaninternal.server.lib.Str;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataBindCapture;
@@ -106,7 +107,7 @@ public class CQueryPlan implements SpiQueryPlan {
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
     this.label = query.getPlanLabel();
-    this.name = deriveName(label, query.getType());
+    this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName());
     this.location = location();
     this.asOfTableCount = query.getAsOfTableCount();
     this.sql = sqlRes.getSql();
@@ -130,7 +131,7 @@ public class CQueryPlan implements SpiQueryPlan {
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
     this.label = query.getPlanLabel();
-    this.name = deriveName(label, query.getType());
+    this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName());
     this.location = location();
     this.planKey = buildPlanKey(sql, logWhereSql);
     this.asOfTableCount = 0;
@@ -145,14 +146,19 @@ public class CQueryPlan implements SpiQueryPlan {
     this.hash = md5Hash();
   }
 
-  private String deriveName(String label, SpiQuery.Type type) {
+  private String deriveName(String label, SpiQuery.Type type, String simpleName) {
     if (label == null) {
-      return "orm." + beanType.getSimpleName() + "." + type.label();
+      return Str.add("orm.", simpleName, ".", type.label());
     }
-    if (label.startsWith(beanType.getSimpleName())) {
-      return "orm." + label;
+    int pos = simpleName.indexOf('.');
+    if (pos > 1) {
+      // element collection and label
+      return Str.add("orm.", simpleName.substring(0, pos), "_", label);
     }
-    return "orm." + beanType.getSimpleName() + "_" + label;
+    if (label.startsWith(simpleName)) {
+      return Str.add("orm.", label);
+    }
+    return Str.add("orm.", simpleName, "_", label);
   }
 
   private SpiQueryBindCapture initBindCapture(SpiQuery<?> query) {
diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
index 9b304bafc..78562fb6d 100644
--- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
@@ -30,7 +30,11 @@ public class TestElementCollectionBasic extends BaseTestCase {
     assertThat(eventLog()).containsOnly("preInsert", "postInsert");
     assertThat(sql).hasSize(4);
 
-    final EcPerson found = Ebean.find(EcPerson.class, person.getId());
+    final EcPerson found = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      //.setLabel("findById")
+      .findOne();
+
     found.getPhoneNumbers().size();
 
     sql = LoggedSqlCollector.current();

From a23a179bbff059f027788ce23cb07c78e6f86e70 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Dec 2020 20:45:38 +1300
Subject: [PATCH 010/447] Fix test bump kotlin-querybean-generator
 12.6.2-SNAPSHOT

---
 kotlin-querybean-generator/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 8a6753c04..a5c53e5fa 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -106,7 +106,7 @@
                 <annotationProcessorPath>
                   <groupId>io.ebean</groupId>
                   <artifactId>kotlin-querybean-generator</artifactId>
-                  <version>12.6.1-SNAPSHOT</version>
+                  <version>12.6.2-SNAPSHOT</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>

From 9c6dd0989a7ebbb8596bc47e45166f083d901fff Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Dec 2020 21:03:08 +1300
Subject: [PATCH 011/447] Refactor tidy BeanDescriptorManager whitespace and
 raw types

---
 .../server/deploy/BeanDescriptorManager.java  | 118 ++----------------
 1 file changed, 9 insertions(+), 109 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 9a8c7a233..77b3c6c04 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -117,7 +117,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   private final TypeManager typeManager;
   private final BootupClasses bootupClasses;
   private final String serverName;
-  private final List<BeanDescriptor> elementDescriptors = new ArrayList<>();
+  private final List<BeanDescriptor<?>> elementDescriptors = new ArrayList<>();
   private final Map<Class<?>, BeanTable> beanTableMap = new HashMap<>();
   private final Map<String, BeanDescriptor<?>> descMap = new HashMap<>();
   private final Map<String, BeanDescriptor<?>> descQueueMap = new HashMap<>();
@@ -238,7 +238,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Return the versions between timestamp suffix based on the DbHistorySupport.
    */
   private String getVersionsBetweenSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) {
-
     DbHistorySupport historySupport = databasePlatform.getHistorySupport();
     // with historySupport returns a simple view suffix or the sql2011 versions between timestamp suffix
     return (historySupport == null) ? serverConfig.getAsOfViewSuffix() : historySupport.getVersionsBetweenSuffix(serverConfig.getAsOfViewSuffix());
@@ -362,7 +361,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void readEntityMapping(ClassLoader classLoader, XmapEntity entityDeploy) {
-
     String entityClassName = entityDeploy.getClazz();
     Class<?> entityClass;
     try {
@@ -412,7 +410,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * For SQL based modifications we need to invalidate appropriate parts of the cache.
    */
   public void cacheNotify(TransactionEventTable.TableIUD tableIUD, CacheChangeSet changeSet) {
-
     String tableName = tableIUD.getTableName().toLowerCase();
     List<BeanDescriptor<?>> normalBeanTypes = tableToDescMap.get(tableName);
     if (normalBeanTypes != null) {
@@ -448,7 +445,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Invalidate entity beans based on views via their dependent tables.
    */
   public void processViewInvalidation(Set<String> viewInvalidation) {
-
     for (String depTable : viewInvalidation) {
       List<BeanDescriptor<?>> list = tableToViewDescMap.get(depTable.toLowerCase());
       if (list != null) {
@@ -461,12 +457,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   /**
    * Build a map of table names to BeanDescriptors.
-   * <p>
-   * This is generally used to maintain caches from table names.
-   * </p>
    */
   private void readTableToDescriptor() {
-
     for (BeanDescriptor<?> desc : descMap.values()) {
       String baseTable = desc.getBaseTable();
       if (baseTable != null) {
@@ -490,7 +482,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void readForeignKeys() {
-
     for (BeanDescriptor<?> d : descMap.values()) {
       d.initialiseFkeys();
     }
@@ -501,18 +492,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * <p>
    * This occurs after all the BeanDescriptors have been created. This resolves
    * circular relationships between BeanDescriptors.
-   * </p>
    * <p>
    * Also responsible for creating all the BeanManagers which contain the
    * persister, listener etc.
-   * </p>
    */
   private void initialiseAll() {
-
     // now that all the BeanDescriptors are in their map
     // we can initialise them which sorts out circular
     // dependencies for OneToMany and ManyToOne etc
-
     BeanDescriptorInitContext initContext = new BeanDescriptorInitContext(asOfTableMap, draftTableMap, asOfViewSuffix);
 
     // PASS 1:
@@ -570,7 +557,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void checkMissingHashCodeOrEquals(Exception source, Class<?> idType, Class<?> beanType) {
-
     String msg = "SERIOUS ERROR: The hashCode() and equals() methods *MUST* be implemented ";
     msg += "on Embedded bean " + idType + " as it is used as an Id for " + beanType;
     throw new PersistenceException(msg, source);
@@ -604,7 +590,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   @SuppressWarnings("unchecked")
   public <T> BeanManager<T> getBeanManager(Class<T> entityType) {
-
     return (BeanManager<T>) getBeanManager(entityType.getName());
   }
 
@@ -616,14 +601,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Create the BeanControllers, BeanFinders and BeanListeners.
    */
   private void createListeners() {
-
     int qa = beanQueryAdapterManager.getRegisterCount();
     int cc = persistControllerManager.getRegisterCount();
     int pl = postLoadManager.getRegisterCount();
     int pc = postConstructManager.getRegisterCount();
     int lc = persistListenerManager.getRegisterCount();
     int fc = beanFinderManager.getRegisterCount();
-
     logger.debug("BeanPersistControllers[{}] BeanFinders[{}] BeanPersistListeners[{}] BeanQueryAdapters[{}] BeanPostLoaders[{}] BeanPostConstructors[{}]", cc, fc, lc, qa, pl, pc);
   }
 
@@ -640,12 +623,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void registerBeanDescriptor(DeployBeanInfo<?> info) {
-    BeanDescriptor desc = new BeanDescriptor<>(this, info.getDescriptor());
+    BeanDescriptor<?> desc = new BeanDescriptor<>(this, info.getDescriptor());
     descMap.put(desc.getBeanType().getName(), desc);
     if (desc.isDocStoreMapped()) {
       descQueueMap.put(desc.getDocStoreQueueId(), desc);
     }
-    for (BeanPropertyAssocMany many : desc.propertiesMany()) {
+    for (BeanPropertyAssocMany<?> many : desc.propertiesMany()) {
       if (many.isElementCollection()) {
         elementDescriptors.add(many.getElementDescriptor());
       }
@@ -657,10 +640,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * <p>
    * This stops short of reading relationship meta data until after the
    * BeanTables have all been created.
-   * </p>
    */
   private void readEntityDeploymentInitial() {
-
     for (Class<?> entityClass : bootupClasses.getEntities()) {
       DeployBeanInfo<?> info = createDeployBeanInfo(entityClass);
       deployInfoMap.put(entityClass, info);
@@ -693,15 +674,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Create the BeanTable information which has the base table and id.
    * <p>
    * This is determined prior to resolving relationship information.
-   * </p>
    */
   private void readEntityBeanTable() {
-
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       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);
@@ -712,17 +690,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Create the BeanTable information which has the base table and id.
    * <p>
    * This is determined prior to resolving relationship information.
-   * </p>
    */
   private void readEntityDeploymentAssociations() {
-
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       readDeployAssociations(info);
     }
   }
 
   private void readInheritedIdGenerators() {
-
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       DeployBeanDescriptor<?> descriptor = info.getDescriptor();
       InheritInfo inheritInfo = descriptor.getInheritInfo();
@@ -740,17 +715,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Create the BeanTable from the deployment information gathered so far.
    */
   private BeanTable createBeanTable(DeployBeanInfo<?> info) {
-
     DeployBeanDescriptor<?> deployDescriptor = info.getDescriptor();
     DeployBeanTable beanTable = deployDescriptor.createDeployBeanTable();
     return new BeanTable(beanTable, this);
   }
 
   private void readEntityRelationships() {
-
     // 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, primaryKeyJoinCheck);
@@ -758,15 +730,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     for (DeployBeanPropertyAssocOne<?> prop : primaryKeyJoinCheck) {
       checkUniDirectionalPrimaryKeyJoin(prop);
     }
-
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       secondaryPropsJoins(info);
     }
-
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       setInheritanceInfo(info);
     }
-
     for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       if (!info.isEmbedded()) {
         registerBeanDescriptor(info);
@@ -775,12 +744,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   /**
-   * Sets the inheritance info. ~EMG fix for join problem
-   *
-   * @param info the new inheritance info
+   * Sets the inheritance info.
    */
   private void setInheritanceInfo(DeployBeanInfo<?> info) {
-
     for (DeployBeanPropertyAssocOne<?> oneProp : info.getDescriptor().propertiesAssocOne()) {
       if (!oneProp.isTransient()) {
         DeployBeanInfo<?> assoc = deployInfoMap.get(oneProp.getTargetType());
@@ -789,7 +755,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         }
       }
     }
-
     for (DeployBeanPropertyAssocMany<?> manyProp : info.getDescriptor().propertiesAssocMany()) {
       if (!manyProp.isTransient()) {
         DeployBeanInfo<?> assoc = deployInfoMap.get(manyProp.getTargetType());
@@ -801,7 +766,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void secondaryPropsJoins(DeployBeanInfo<?> info) {
-
     DeployBeanDescriptor<?> descriptor = info.getDescriptor();
     for (DeployBeanProperty prop : descriptor.propertiesBase()) {
       if (prop.isSecondaryTable()) {
@@ -825,10 +789,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * This will read join information defined on the 'owning/other' side of the
    * relationship. It also does some extra work for unidirectional
    * relationships.
-   * </p>
    */
   private void checkMappedBy(DeployBeanInfo<?> info, List<DeployBeanPropertyAssocOne<?>> primaryKeyJoinCheck) {
-
     for (DeployBeanPropertyAssocOne<?> oneProp : info.getDescriptor().propertiesAssocOne()) {
       if (!oneProp.isTransient()) {
         if (oneProp.getMappedBy() != null) {
@@ -851,14 +813,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private DeployBeanDescriptor<?> getTargetDescriptor(DeployBeanPropertyAssoc<?> prop) {
-
     Class<?> targetType = prop.getTargetType();
     DeployBeanInfo<?> info = deployInfoMap.get(targetType);
     if (info == null) {
       String msg = "Can not find descriptor [" + targetType + "] for " + prop.getFullBeanName();
       throw new PersistenceException(msg);
     }
-
     return info.getDescriptor();
   }
 
@@ -867,10 +827,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * mark it as unidirectional.
    */
   private boolean findMappedBy(DeployBeanPropertyAssocMany<?> prop) {
-
     // this is the entity bean type - that owns this property
     Class<?> owningType = prop.getOwningType();
-
     Set<String> matchSet = new HashSet<>();
 
     // get the bean descriptor that holds the mappedBy property
@@ -924,7 +882,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
             return true;
           }
         }
-
       }
     }
     // multiple options so should specify mappedBy property
@@ -936,12 +893,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   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());
@@ -949,7 +903,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     orderProperty.setDbUpdateable(orderColumn.isUpdatable());
     orderProperty.setDbRead(true);
     orderProperty.setOwningType(targetDesc.getBeanType());
-
     final InheritInfo targetInheritInfo = targetDesc.getInheritInfo();
     if (targetInheritInfo != null) {
       for (InheritInfo child : targetInheritInfo.getChildren()) {
@@ -957,7 +910,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         childDescriptor.setOrderColumn(orderProperty);
       }
     }
-
     targetDesc.setOrderColumn(orderProperty);
   }
 
@@ -966,19 +918,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * unidirectional.
    * <p>
    * This means that inserts MUST cascade for this property.
-   * </p>
    * <p>
    * Create a "Shadow"/Unidirectional property on the target. It is used with
    * inserts to set the foreign key value (e.g. inserts the foreign key value
    * into the order_id column on the order_lines table).
-   * </p>
    */
   private void makeUnidirectional(DeployBeanPropertyAssocMany<?> oneToMany) {
-
     DeployBeanDescriptor<?> targetDesc = getTargetDescriptor(oneToMany);
-
     Class<?> owningType = oneToMany.getOwningType();
-
     if (!oneToMany.getCascadeInfo().isSave()) {
       // The property MUST have persist cascading so that inserts work.
 
@@ -1026,11 +973,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void checkMappedByOneToOne(DeployBeanPropertyAssocOne<?> prop) {
-
     // check that the mappedBy property is valid and read
     // its associated join information if it is available
     String mappedBy = prop.getMappedBy();
-
     // get the mappedBy property
     DeployBeanDescriptor<?> targetDesc = getTargetDescriptor(prop);
     DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
@@ -1083,10 +1028,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * <p>
    * We can use the join information from the mappedBy property and reverse it
    * for using in the OneToMany direction.
-   * </p>
    */
   private void checkMappedByOneToMany(DeployBeanInfo<?> info, DeployBeanPropertyAssocMany<?> prop) {
-
     if (prop.isElementCollection()) {
       // skip mapping check
       return;
@@ -1167,7 +1110,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * For mappedBy copy the joins from the other side.
    */
   private void checkMappedByManyToMany(DeployBeanPropertyAssocMany<?> prop) {
-
     // get the bean descriptor that holds the mappedBy property
     String mappedBy = prop.getMappedBy();
     if (mappedBy == null) {
@@ -1228,50 +1170,40 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private <T> void setBeanControllerFinderListener(DeployBeanDescriptor<T> descriptor) {
-
     persistControllerManager.addPersistControllers(descriptor);
     postLoadManager.addPostLoad(descriptor);
     postConstructManager.addPostConstructListeners(descriptor);
     persistListenerManager.addPersistListeners(descriptor);
     beanQueryAdapterManager.addQueryAdapter(descriptor);
     beanFinderManager.addFindControllers(descriptor);
-
     if (changeLogRegister != null) {
       ChangeLogFilter changeFilter = changeLogRegister.getChangeFilter(descriptor.getBeanType());
       if (changeFilter != null) {
         descriptor.setChangeLogFilter(changeFilter);
       }
     }
-
   }
 
   /**
    * Read the initial deployment information for a given bean type.
    */
   private <T> DeployBeanInfo<T> createDeployBeanInfo(Class<T> beanClass) {
-
     DeployBeanDescriptor<T> desc = new DeployBeanDescriptor<>(this, beanClass, config);
     beanLifecycleAdapterFactory.addLifecycleMethods(desc);
-
     // set bean controller, finder and listener
     setBeanControllerFinderListener(desc);
     deplyInherit.process(desc);
     desc.checkInheritanceMapping();
 
     createProperties.createProperties(desc);
-
     DeployBeanInfo<T> info = new DeployBeanInfo<>(deployUtil, desc);
-
     readAnnotations.readInitial(info);
     return info;
   }
 
   private <T> void readDeployAssociations(DeployBeanInfo<T> info) {
-
     DeployBeanDescriptor<T> desc = info.getDescriptor();
-
     readAnnotations.readAssociations(info, this);
-
     if (EntityType.SQL == desc.getEntityType()) {
       desc.setBaseTable(null, null, null);
     }
@@ -1279,15 +1211,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     // mark transient properties
     transientProperties.process(desc);
     setScalarType(desc);
-
     if (!desc.isEmbedded()) {
       // Set IdGenerator or use DB Identity
       setIdGeneration(desc);
-
       // find the appropriate default concurrency mode
       setConcurrencyMode(desc);
     }
-
     // generate the byte code
     createByteCode(desc);
   }
@@ -1296,7 +1225,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Set the Identity generation mechanism.
    */
   private <T> void setIdGeneration(DeployBeanDescriptor<T> desc) {
-
     if (desc.getIdGenerator() != null) {
       // already assigned (So custom or UUID)
       return;
@@ -1304,7 +1232,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     if (desc.idProperty() == null) {
       return;
     }
-
     final DeployIdentityMode identityMode = desc.getIdentityMode();
     if (identityMode.isSequence() && !dbIdentity.isSupportsSequence()) {
       // explicit sequence but not supported by the DatabasePlatform
@@ -1361,11 +1288,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void createByteCode(DeployBeanDescriptor<?> deploy) {
-
     // check to see if the bean supports EntityBean interface
     // generate a subclass if required
     setEntityBeanClass(deploy);
-
     // use Code generation or Standard reflection to support
     // getter and setter methods
     setBeanReflect(deploy);
@@ -1379,10 +1304,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * <p>
    * Enums are treated a bit differently in that they always have a ScalarType
    * as one is built for them.
-   * </p>
    */
   private void setScalarType(DeployBeanDescriptor<?> deployDesc) {
-
     for (DeployBeanProperty prop : deployDesc.propertiesAll()) {
       if (!(prop instanceof DeployBeanPropertyAssoc<?>)) {
         deployUtil.setScalarType(prop);
@@ -1396,17 +1319,13 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * This sets the implementation of constructing entity beans and the setting
    * and getting of properties. It is generally faster to use code generation
    * rather than reflection to do this.
-   * </p>
    */
   private void setBeanReflect(DeployBeanDescriptor<?> desc) {
-
     // Set the BeanReflectGetter and BeanReflectSetter that typically
     // use generated code. NB: Due to Bug 166 so now doing this for
     // abstract classes as well.
-
     BeanPropertiesReader reflectProps = new BeanPropertiesReader(desc.getBeanType());
     desc.setProperties(reflectProps.getProperties());
-
     for (DeployBeanProperty prop : desc.propertiesAll()) {
       String propName = prop.getName();
       Integer pos = reflectProps.getPropertyIndex(propName);
@@ -1416,7 +1335,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
             "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());
         }
-
       } else {
         final int propertyIndex = pos;
         prop.setPropertyIndex(propertyIndex);
@@ -1433,7 +1351,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Return true if this is a persistent field (not transient or static).
    */
   private boolean isPersistentField(DeployBeanProperty prop) {
-
     Field field = prop.getField();
     if (field == null) {
       return false;
@@ -1448,12 +1365,10 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * which contain version properties.
    */
   private void setConcurrencyMode(DeployBeanDescriptor<?> desc) {
-
     if (desc.getConcurrencyMode() != null) {
       // concurrency mode explicitly set during deployment
       return;
     }
-
     if (checkForVersionProperties(desc)) {
       desc.setConcurrencyMode(ConcurrencyMode.VERSION);
     } else {
@@ -1465,23 +1380,16 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Search for version properties also including embedded beans.
    */
   private boolean checkForVersionProperties(DeployBeanDescriptor<?> desc) {
-
-    boolean hasVersionProperty = false;
-
-    List<DeployBeanProperty> props = desc.propertiesBase();
-    for (DeployBeanProperty prop : props) {
+    for (DeployBeanProperty prop : desc.propertiesBase()) {
       if (prop.isVersionColumn()) {
-        hasVersionProperty = true;
+        return true;
       }
     }
-
-    return hasVersionProperty;
+    return false;
   }
 
   private boolean hasEntityBeanInterface(Class<?> beanClass) {
-
-    Class<?>[] interfaces = beanClass.getInterfaces();
-    for (Class<?> anInterface : interfaces) {
+    for (Class<?> anInterface : beanClass.getInterfaces()) {
       if (anInterface.equals(EntityBean.class)) {
         return true;
       }
@@ -1493,18 +1401,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Test the bean type to see if it implements EntityBean interface already.
    */
   private void setEntityBeanClass(DeployBeanDescriptor<?> desc) {
-
     Class<?> beanClass = desc.getBeanType();
-
     if (!hasEntityBeanInterface(beanClass)) {
       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);
     }
-
     // the bean already implements EntityBean
     checkInheritedClasses(beanClass);
-
     entityBeanCount++;
   }
 
@@ -1513,7 +1417,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * enhanced or all dynamically subclassed).
    */
   private void checkInheritedClasses(Class<?> beanClass) {
-
     Class<?> superclass = beanClass.getSuperclass();
     if (Object.class.equals(superclass)) {
       // we got to the top of the inheritance
@@ -1572,10 +1475,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   }
 
   private void addPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
-
     String baseTable = prop.getDesc().getBaseTable();
     DeployTableJoin inverse = prop.getTableJoin().createInverse(baseTable);
-
     TableJoin inverseJoin = new TableJoin(inverse, prop.getForeignKey());
     DeployBeanInfo<?> target = deployInfoMap.get(prop.getTargetType());
     target.setPrimaryKeyJoin(inverseJoin);
@@ -1592,7 +1493,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Create a BeanDescriptor for an ElementCollection target.
    */
   public <A> BeanDescriptor<A> createElementDescriptor(DeployBeanDescriptor<A> elementDescriptor, ManyType manyType, boolean scalar) {
-
     ElementHelp elementHelp = elementHelper(manyType);
     if (manyType.isMap()) {
       if (scalar) {
@@ -1625,7 +1525,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     for (BeanDescriptor<?> desc : immutableDescriptorList) {
       desc.visitMetrics(visitor);
     }
-    for (BeanDescriptor desc : elementDescriptors) {
+    for (BeanDescriptor<?> desc : elementDescriptors) {
       desc.visitMetrics(visitor);
     }
   }

From cb0100f02a37f63dd5835f9272c001b8fdbab9d3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Dec 2020 21:11:02 +1300
Subject: [PATCH 012/447] Refactor tidy BeanDescriptor, no effective change

---
 .../server/deploy/BeanDescriptor.java             | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index bfb32c8fe..bc2c87e66 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -522,7 +522,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       return null;
     }
     try {
-      return (EntityBean) beanType.newInstance();
+      return (EntityBean) beanType.getDeclaredConstructor().newInstance();
     } catch (Exception e) {
       throw new IllegalStateException("Error trying to create the prototypeEntityBean for " + beanType, e);
     }
@@ -814,7 +814,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     int propertyLength = toEbi.getPropertyLength();
     String[] names = getProperties();
     for (int i = 0; i < propertyLength; i++) {
-
       if (fromEbi.isLoadedProperty(i)) {
         BeanProperty property = getBeanProperty(names[i]);
         if (!toEbi.isLoadedProperty(i)) {
@@ -1865,17 +1864,12 @@ 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)
+   * We actually need to do a query because we don't know the type without the discriminator value.
    */
   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();
+    return query.setId(id).findOne();
   }
 
   /**
@@ -2278,8 +2272,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   public void lazyLoadRegister(String prefix, EntityBeanIntercept ebi, EntityBean bean, LoadContext loadContext) {
     // load the List/Set/Map proxy objects (deferred fetching of lists)
-    BeanPropertyAssocMany<?>[] manys = propertiesMany();
-    for (BeanPropertyAssocMany<?> many : manys) {
+    for (BeanPropertyAssocMany<?> many : propertiesMany()) {
       if (!ebi.isLoadedProperty(many.getPropertyIndex())) {
         BeanCollection<?> ref = many.createReferenceIfNull(bean);
         if (ref != null && !ref.isRegisteredWithLoadContext()) {

From 9d706056c614bcc60255c5730f7ed70fb0ab69bb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Dec 2020 21:18:55 +1300
Subject: [PATCH 013/447] No functional change, replace new
 ReentrantLock(false) with new ReentrantLock()

---
 ebean-api/src/main/java/io/ebean/DatabaseFactory.java         | 2 +-
 ebean-api/src/main/java/io/ebean/DbContext.java               | 2 +-
 ebean-api/src/main/java/io/ebean/DbPrimary.java               | 2 +-
 .../src/main/java/io/ebean/bean/EntityBeanIntercept.java      | 2 +-
 ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java   | 2 +-
 .../src/main/java/io/ebean/common/AbstractBeanCollection.java | 2 +-
 .../src/main/java/io/ebean/common/CopyOnFirstWriteList.java   | 2 +-
 .../java/io/ebean/config/dbplatform/SequenceIdGenerator.java  | 4 +---
 ebean-api/src/main/java/io/ebean/event/ShutdownManager.java   | 2 +-
 .../server/autotune/service/DefaultAutoTuneService.java       | 2 +-
 .../ebeaninternal/server/autotune/service/ProfileManager.java | 2 +-
 .../ebeaninternal/server/autotune/service/ProfileOrigin.java  | 2 +-
 .../server/autotune/service/ProfileOriginNodeUsage.java       | 2 +-
 .../io/ebeaninternal/server/cache/DefaultCacheHolder.java     | 2 +-
 .../java/io/ebeaninternal/server/cluster/ClusterManager.java  | 2 +-
 .../java/io/ebeaninternal/server/core/DefaultContainer.java   | 2 +-
 .../main/java/io/ebeaninternal/server/core/DefaultServer.java | 2 +-
 .../main/java/io/ebeaninternal/server/core/InternString.java  | 2 +-
 .../io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java   | 2 +-
 .../io/ebeaninternal/server/loadcontext/DLoadBaseContext.java | 2 +-
 .../io/ebeaninternal/server/loadcontext/DLoadBeanContext.java | 2 +-
 .../io/ebeaninternal/server/loadcontext/DLoadManyContext.java | 2 +-
 .../src/main/java/io/ebeaninternal/server/query/CQuery.java   | 2 +-
 .../java/io/ebeaninternal/server/query/CQueryBindCapture.java | 2 +-
 .../io/ebeaninternal/server/query/LimitOffsetPagedList.java   | 2 +-
 .../io/ebeaninternal/server/querydefn/DefaultOrmQuery.java    | 2 +-
 .../server/transaction/DefaultPersistenceContext.java         | 2 +-
 .../server/transaction/DefaultProfileHandler.java             | 2 +-
 .../io/ebeaninternal/server/type/ScalarTypeArrayList.java     | 2 +-
 .../io/ebeaninternal/server/type/ScalarTypeArrayListH2.java   | 2 +-
 .../java/io/ebeaninternal/server/type/ScalarTypeArraySet.java | 2 +-
 .../io/ebeaninternal/server/type/ScalarTypeArraySetH2.java    | 2 +-
 .../src/main/java/io/ebean/test/config/RunOnceMarker.java     | 2 +-
 33 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
index 13a0c4125..11cdf9068 100644
--- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
+++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
@@ -31,7 +31,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class DatabaseFactory {
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
   private static SpiContainer container;
 
   static {
diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java
index cf09dc7fb..18df2169e 100644
--- a/ebean-api/src/main/java/io/ebean/DbContext.java
+++ b/ebean-api/src/main/java/io/ebean/DbContext.java
@@ -27,7 +27,7 @@ final class DbContext {
 
   private final HashMap<String, Database> syncMap = new HashMap<>();
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * The 'default' Database.
diff --git a/ebean-api/src/main/java/io/ebean/DbPrimary.java b/ebean-api/src/main/java/io/ebean/DbPrimary.java
index 9cbdc2eba..ffec8b114 100644
--- a/ebean-api/src/main/java/io/ebean/DbPrimary.java
+++ b/ebean-api/src/main/java/io/ebean/DbPrimary.java
@@ -12,7 +12,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 class DbPrimary {
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
   private static String defaultServerName;
   private static boolean skip;
 
diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 4bb520a32..b49c6f8ae 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -32,7 +32,7 @@ public final class EntityBeanIntercept implements Serializable {
   private static final int STATE_REFERENCE = 1;
   private static final int STATE_LOADED = 2;
 
-  private transient final ReentrantLock lock = new ReentrantLock(false);
+  private transient final ReentrantLock lock = new ReentrantLock();
 
   private transient NodeUsageCollector nodeUsageCollector;
 
diff --git a/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java b/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java
index 4d84ada39..ad4a30b95 100644
--- a/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java
+++ b/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java
@@ -10,7 +10,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public abstract class SingleBeanLoader implements BeanLoader {
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   protected final Database database;
 
diff --git a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java
index 297c6fb9d..f1a608361 100644
--- a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -16,7 +16,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
 
   private static final long serialVersionUID = 3365725236140187588L;
 
-  protected final ReentrantLock lock = new ReentrantLock(false);
+  protected final ReentrantLock lock = new ReentrantLock();
 
   protected boolean readOnly;
 
diff --git a/ebean-api/src/main/java/io/ebean/common/CopyOnFirstWriteList.java b/ebean-api/src/main/java/io/ebean/common/CopyOnFirstWriteList.java
index c4acf4f34..0ef9e3fe4 100644
--- a/ebean-api/src/main/java/io/ebean/common/CopyOnFirstWriteList.java
+++ b/ebean-api/src/main/java/io/ebean/common/CopyOnFirstWriteList.java
@@ -20,7 +20,7 @@ public final class CopyOnFirstWriteList<E> extends AbstractList<E> implements Li
 
   private static final long serialVersionUID = 1L;
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * The underlying List implementation.
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
index 351d1e8b8..7ddcef6f3 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
@@ -26,9 +26,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   protected static final Logger logger = LoggerFactory.getLogger("io.ebean.SEQ");
 
-  private final ReentrantLock lock = new ReentrantLock(false);
-
-  private final ReentrantLock loadLock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * The actual sequence name.
diff --git a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
index f01a22b83..f762b0084 100644
--- a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
+++ b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
@@ -23,7 +23,7 @@ public final class ShutdownManager {
 
   private static final Logger logger = LoggerFactory.getLogger(ShutdownManager.class);
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
 
   private static final List<Database> databases = new ArrayList<>();
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
index 11182ec19..9856e59da 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
@@ -23,7 +23,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultAutoTuneService.class);
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final SpiEbeanServer server;
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
index dfbdc5800..f334208f9 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
@@ -18,7 +18,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class ProfileManager implements ProfilingListener {
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final boolean queryTuningAddVersion;
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java
index 62feec130..b9935f558 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java
@@ -16,7 +16,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 public class ProfileOrigin {
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private static final long RESET_COUNT = -1000000000L;
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
index dc632e2cd..3ba6afa20 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
@@ -21,7 +21,7 @@ public class ProfileOriginNodeUsage {
 
   private static final Logger logger = LoggerFactory.getLogger(ProfileOriginNodeUsage.class);
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final String path;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index d2d38e7cf..cf15c51fe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -27,7 +27,7 @@ class DefaultCacheHolder {
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.ALL");
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
   private final ConcurrentHashMap<String, ServerCache> allCaches = new ConcurrentHashMap<>();
   private final ConcurrentHashMap<String, Set<String>> collectIdCaches = new ConcurrentHashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
index face12592..d2bdaeda7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
@@ -18,7 +18,7 @@ public class ClusterManager implements ServerLookup {
 
   private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final ConcurrentHashMap<String, EbeanServer> serverMap = new ConcurrentHashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index a352a5b6d..300acdb2d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -36,7 +36,7 @@ public class DefaultContainer implements SpiContainer {
 
   private static final Logger logger = LoggerFactory.getLogger("io.ebean.internal.DefaultContainer");
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
   private final ClusterManager clusterManager;
 
   public DefaultContainer(ContainerConfig containerConfig) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 1b3291d59..c6665a757 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -161,7 +161,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultServer.class);
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
   private final DatabaseConfig config;
   private final String serverName;
   private final DatabasePlatform databasePlatform;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java
index c952f8f2d..8a06fc4d4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java
@@ -13,7 +13,7 @@ public final class InternString {
 
   private static final HashMap<String, String> map = new HashMap<>();
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
 
   /**
    * Return the shared instance of this string.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
index d9928c422..3d0a39a8a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
@@ -45,7 +45,7 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator {
 
   private AtomicLong nanoToMilliOffset = new AtomicLong(currentUuidTime());
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
index fc2213db5..3040ebcaf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
@@ -14,7 +14,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 abstract class DLoadBaseContext {
 
-  protected final ReentrantLock lock = new ReentrantLock(false);
+  protected final ReentrantLock lock = new ReentrantLock();
 
   protected final DLoadContext parent;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index f33d597e8..6c796501f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -120,7 +120,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
    */
   static class LoadBuffer implements BeanLoader, LoadBeanBuffer {
 
-    private final ReentrantLock bufferLock = new ReentrantLock(false);
+    private final ReentrantLock bufferLock = new ReentrantLock();
     private final DLoadBeanContext context;
     private final int batchSize;
     private final List<EntityBeanIntercept> list;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index 1f1685485..ac846e359 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -130,7 +130,7 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
    */
   static class LoadBuffer implements BeanCollectionLoader, LoadManyBuffer {
 
-    private final ReentrantLock lock = new ReentrantLock(false);
+    private final ReentrantLock lock = new ReentrantLock();
     private final PersistenceContext persistenceContext;
     private final DLoadManyContext context;
     private final int batchSize;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index d1d1e1640..f92960419 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -59,7 +59,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
   private static final CQueryCollectionAddNoop NOOP_ADD = new CQueryCollectionAddNoop();
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * The resultSet rows read.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index c4e7ab5bc..713169640 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -11,7 +11,7 @@ class CQueryBindCapture implements SpiQueryBindCapture {
 
   private static final double multiplier = 1.3d;
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
   private final CQueryPlanManager manager;
   private final SpiQueryPlan queryPlan;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
index 6aa3ac38b..a6f506ef6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
@@ -16,7 +16,7 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private final transient SpiEbeanServer server;
 
-  private final transient ReentrantLock lock = new ReentrantLock(false);
+  private final transient ReentrantLock lock = new ReentrantLock();
 
   private final SpiQuery<T> query;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 0bb1b3e45..39d7b350d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -89,7 +89,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final Class<T> beanType;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
index 85733cd5b..df92246fa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
@@ -32,7 +32,7 @@ public final class DefaultPersistenceContext implements PersistenceContext {
    */
   private final HashMap<Class<?>, ClassContext> typeCache = new HashMap<>();
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private int putCount;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
index 6d6dbb42e..38f5446d2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
@@ -66,7 +66,7 @@ public class DefaultProfileHandler implements SpiProfileHandler, Plugin {
 
   private final ExecutorService executor;
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final File dir;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index 3f540b3e3..736cd94eb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -36,7 +36,7 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
 
   static class Factory implements PlatformArrayTypeFactory {
 
-    private final ReentrantLock lock = new ReentrantLock(false);
+    private final ReentrantLock lock = new ReentrantLock();
     private final Map<String, ScalarTypeArrayList> cache = new HashMap<>();
 
     /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
index ebad83024..f8b30a7a0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
@@ -27,7 +27,7 @@ class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
 
   static class Factory implements PlatformArrayTypeFactory {
 
-    private final ReentrantLock lock = new ReentrantLock(false);
+    private final ReentrantLock lock = new ReentrantLock();
     private final Map<String, ScalarTypeArrayListH2> cache = new HashMap<>();
 
     /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index d07f2f795..fd0b7dd41 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -36,7 +36,7 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
 
   static class Factory implements PlatformArrayTypeFactory {
 
-    private final ReentrantLock lock = new ReentrantLock(false);
+    private final ReentrantLock lock = new ReentrantLock();
     private final Map<String, ScalarTypeArraySet> cache = new HashMap<>();
 
     /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
index e67b5e434..cd7f7cf98 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
@@ -27,7 +27,7 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
 
   static class Factory implements PlatformArrayTypeFactory {
 
-    private final ReentrantLock lock = new ReentrantLock(false);
+    private final ReentrantLock lock = new ReentrantLock();
     private final Map<String, ScalarTypeArraySetH2> cache = new HashMap<>();
 
     /**
diff --git a/ebean-test/src/main/java/io/ebean/test/config/RunOnceMarker.java b/ebean-test/src/main/java/io/ebean/test/config/RunOnceMarker.java
index 31f534c24..a812139f4 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/RunOnceMarker.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/RunOnceMarker.java
@@ -6,7 +6,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 class RunOnceMarker {
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
   private static boolean hasRun;
 
   static boolean isRun() {

From c3cdecaa60e3600bb33ebaedb7d81065242cfbe2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 10:06:15 +1300
Subject: [PATCH 014/447] Fix test TestSqlUpdateBatch with correct bind type
 for Postgres

---
 .../src/test/java/org/tests/update/TestSqlUpdateBatch.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java
index ff440ea96..1cc735fa0 100644
--- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java
+++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java
@@ -34,7 +34,7 @@ public class TestSqlUpdateBatch extends BaseTestCase {
           .setParameter(1, String.valueOf(i))
           .addBatch();
         delete
-          .setParameter(1, String.valueOf(i))
+          .setParameter(1, i)
           .addBatch();
       }
 

From 1a4377da2917fce5431a40b0d11f56754bf91961 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 13:29:47 +1300
Subject: [PATCH 015/447] Improve tests TestQueryForUpdate and
 TestSoftDeleteBasic

---
 .../org/tests/basic/TestQueryForUpdate.java   | 12 +++++---
 .../tests/softdelete/TestSoftDeleteBasic.java | 28 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java
index ef8469f35..ee224ccd5 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -27,11 +27,15 @@ public class TestQueryForUpdate extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = DB.find(Customer.class)
-      .forUpdate()
-      .order().desc("id");
+    Query<Customer> query;
+    try (final Transaction transaction = DB.beginTransaction()) {
+      query = DB.find(Customer.class)
+        .forUpdate()
+        .order().desc("id");
+
+      query.findList();
+    }
 
-    query.findList();
     if (isSqlServer()) {
       assertThat(sqlOf(query)).contains("with (updlock)");
     } else if (isPostgres()) {
diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 738366b6f..590585404 100644
--- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -12,6 +12,7 @@ import org.tests.model.softdelete.EBasicNoSDChild;
 import org.tests.model.softdelete.EBasicSDChild;
 import org.tests.model.softdelete.EBasicSoftDelete;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static java.util.Collections.singletonList;
@@ -173,13 +174,17 @@ public class TestSoftDeleteBasic extends BaseTestCase {
                                          .query();
 
     List<EBasicSoftDelete> list = query.findList();
-    assertSql(query).contains("t0.deleted = false");
-    // Make sure that query includes that the child mustn't've been deleted
-    assertSql(query).contains("u1.deleted = false");
+    if (isMySql() || isMariaDB()) {
+      assertSql(query).contains("t0.deleted = 0");
+      assertSql(query).contains("u1.deleted = 0");
+    } else {
+      assertSql(query).contains("t0.deleted = false");
+      // Make sure that query includes that the child mustn't've been deleted
+      assertSql(query).contains("u1.deleted = false");
+    }
     assertThat(list).hasSize(0);
 
     // Cleanup created entity
-    query.delete();
     DB.deleteAllPermanent(singletonList(child));
     DB.deleteAllPermanent(singletonList(bean));
   }
@@ -205,13 +210,17 @@ public class TestSoftDeleteBasic extends BaseTestCase {
 
     List<EBasicNoSDChild> list = query.findList();
     // Make sure that query includes that the child mustn't've been deleted
-    assertSql(query).contains("u1.deleted = false");
-    assertSql(query).contains("u2.deleted = false");
+    if (isMySql() || isMariaDB()) {
+      assertSql(query).contains("u1.deleted = 0");
+      assertSql(query).contains("u2.deleted = 0");
+    } else {
+      assertSql(query).contains("u1.deleted = false");
+      assertSql(query).contains("u2.deleted = false");
+    }
     assertThat(list).hasSize(0);
 
     // Cleanup created entity
-    query.delete();
-    DB.deleteAllPermanent(singletonList(child));
+    DB.deleteAllPermanent(Arrays.asList(child, secondChild));
     DB.deleteAllPermanent(singletonList(bean));
   }
 
@@ -242,8 +251,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
     assertThat(list).hasSize(1);
 
     // Cleanup created entity
-    query.delete();
-    DB.deleteAllPermanent(singletonList(child));
+    DB.deleteAllPermanent(Arrays.asList(child, secondChild));
     DB.deleteAllPermanent(singletonList(bean));
   }
 

From dbe273bb5674a882f10d60d28905ec7a89926964 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 17:14:03 +1300
Subject: [PATCH 016/447] #2123 - Modify BackgroundExecutor API - add
 scheduleWithFixedDelay() and mark executePeriodically() as deprecated

---
 .../java/io/ebean/BackgroundExecutor.java     | 41 ++++++++++++++++++-
 .../service/DefaultAutoTuneService.java       |  2 +-
 .../server/cache/DefaultServerCache.java      |  2 +-
 .../server/deploy/BeanDescriptorManager.java  |  2 +-
 .../executor/DefaultBackgroundExecutor.java   | 12 +++++-
 5 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java b/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java
index 94900c249..537fb7f36 100644
--- a/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java
+++ b/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java
@@ -37,6 +37,7 @@ public interface BackgroundExecutor {
   void execute(Runnable task);
 
   /**
+   * Deprecated - migrate to scheduleWithFixedDelay().
    * Execute a task periodically with a fixed delay between each execution.
    * <p>
    * For example, execute a runnable every minute.
@@ -45,18 +46,56 @@ public interface BackgroundExecutor {
    * That is, this method has the same behaviour characteristics as
    * {@link ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, TimeUnit)}
    */
+  @Deprecated
   void executePeriodically(Runnable task, long delay, TimeUnit unit);
 
   /**
+   * Deprecated - migrate to scheduleWithFixedDelay().
    * Execute a task periodically additionally with an initial delay different from delay.
    */
+  @Deprecated
   void executePeriodically(Runnable task, long initialDelay, long delay, TimeUnit unit);
 
+  /**
+   * Execute a task periodically with a given delay.
+   *
+   * @param task         the task to execute
+   * @param initialDelay the time to delay first execution
+   * @param delay        the delay between the termination of one
+   *                     execution and the commencement of the next
+   * @param unit         the time unit of the initialDelay and delay parameters
+   * @return a ScheduledFuture representing pending completion of
+   * the series of repeated tasks.  The future's {@link
+   * Future#get() get()} method will never return normally,
+   * and will throw an exception upon task cancellation or
+   * abnormal termination of a task execution.
+   */
+  ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long initialDelay, long delay, TimeUnit unit);
+
+  /**
+   * Execute a task periodically with a given period.
+   *
+   * <p>If any execution of this task takes longer than its period, then
+   * subsequent executions may start late, but will not concurrently
+   * execute.
+   *
+   * @param task         the task to execute
+   * @param initialDelay the time to delay first execution
+   * @param period       the period between successive executions
+   * @param unit         the time unit of the initialDelay and period parameters
+   * @return a ScheduledFuture representing pending completion of
+   * the series of repeated tasks.  The future's {@link
+   * Future#get() get()} method will never return normally,
+   * and will throw an exception upon task cancellation or
+   * abnormal termination of a task execution.
+   */
+  ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long initialDelay, long period, 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
+   * whose get() method will return null upon completion
    */
   ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit);
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
index 9856e59da..be2033695 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
@@ -77,7 +77,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
       loadTuningFile();
       if (isRuntimeTuningUpdates()) {
         // periodically gather and update query tuning
-        server.getBackgroundExecutor().executePeriodically(new ProfilingUpdate(), profilingUpdateFrequency, TimeUnit.SECONDS);
+        server.getBackgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index d0c44de1e..41ec3e2c9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -86,7 +86,7 @@ public class DefaultServerCache implements ServerCache {
 
     // default to trimming the cache every 60 seconds
     long trimFreqSecs = (trimFrequency == 0) ? 60 : trimFrequency;
-    executor.executePeriodically(trim, trimFreqSecs, TimeUnit.SECONDS);
+    executor.scheduleWithFixedDelay(trim, trimFreqSecs, trimFreqSecs, TimeUnit.SECONDS);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 77b3c6c04..0cb5deeaa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -203,7 +203,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Run periodic trim of query plans.
    */
   public void scheduleBackgroundTrim() {
-    backgroundExecutor.executePeriodically(this::trimQueryPlans, 117L, 60L, TimeUnit.SECONDS);
+    backgroundExecutor.scheduleWithFixedDelay(this::trimQueryPlans, 117L, 60L, TimeUnit.SECONDS);
   }
 
   private void trimQueryPlans() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
index c93cbfac7..28bb50765 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
@@ -82,7 +82,7 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
   @Override
   public void executePeriodically(Runnable task, long delay, TimeUnit unit) {
-    executePeriodically(task, delay, delay, unit);
+    executor.scheduleWithFixedDelay(wrapMDC(task), delay, delay, unit);
   }
 
   @Override
@@ -90,6 +90,16 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
     executor.scheduleWithFixedDelay(wrapMDC(task), initialDelay, delay, unit);
   }
 
+  @Override
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long initialDelay, long delay, TimeUnit unit) {
+    return executor.scheduleWithFixedDelay(wrapMDC(task), initialDelay, delay, unit);
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long initialDelay, long delay, TimeUnit unit) {
+    return executor.scheduleAtFixedRate(wrapMDC(task), initialDelay, delay, unit);
+  }
+
   @Override
   public ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit) {
     return executor.schedule(wrapMDC(task), delay, unit);

From d68f477e8eed5f6d9986dc9b9805f446ae6f4377 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 21:53:03 +1300
Subject: [PATCH 017/447] #2120 - DbEnumValue without database constraint

---
 ebean-api/pom.xml                             |  2 +-
 .../server/type/DefaultTypeManager.java       | 76 ++-----------------
 .../type/ScalarTypeEnumWithMapping.java       | 15 +++-
 .../server/type/DefaultTypeManagerTest.java   | 43 +++++++----
 .../org/tests/model/array/VarcharEnum.java    |  2 +-
 5 files changed, 49 insertions(+), 89 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 472d240f9..22e0fd394 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.13</version>
+      <version>6.14-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index c41d1121d..7a2d82baa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -256,7 +256,6 @@ public final class DefaultTypeManager implements TypeManager {
    * Load custom scalar types registered via ExtraTypeFactory and ServiceLoader.
    */
   private void loadTypesFromProviders(DatabaseConfig config, Object objectMapper) {
-
     ServiceLoader<ExtraTypeFactory> factories = ServiceLoader.load(ExtraTypeFactory.class);
     Iterator<ExtraTypeFactory> iterator = factories.iterator();
     if (iterator.hasNext()) {
@@ -291,7 +290,6 @@ public final class DefaultTypeManager implements TypeManager {
   @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
   public void addEnumType(ScalarType<?> scalarType, Class<? extends Enum> enumClass) {
-
     Set<Class<?>> mappedClasses = new HashSet<>();
     mappedClasses.add(enumClass);
     for (Object value : EnumSet.allOf(enumClass).toArray()) {
@@ -360,20 +358,16 @@ public final class DefaultTypeManager implements TypeManager {
 
   @Override
   public ScalarType<?> getArrayScalarType(Class<?> type, DbArray dbArray, Type genericType, boolean nullable) {
-
     Type valueType = getValueType(genericType);
     if (type.equals(List.class)) {
       return getArrayScalarTypeList(valueType, nullable);
-
     } else if (type.equals(Set.class)) {
       return getArrayScalarTypeSet(valueType, nullable);
-
     } else {
       throw new IllegalStateException("Type [" + type + "] not supported for @DbArray");
     }
   }
 
-  @SuppressWarnings("rawtypes")
   private ScalarType<?> getArrayScalarTypeSet(Type valueType, boolean nullable) {
     if (arrayTypeSetFactory != null) {
       if (isEnumType(valueType)) {
@@ -385,7 +379,6 @@ public final class DefaultTypeManager implements TypeManager {
     return new ScalarTypeJsonSet.Varchar(getDocType(valueType), nullable);
   }
 
-  @SuppressWarnings("rawtypes")
   private ScalarType<?> getArrayScalarTypeList(Type valueType, boolean nullable) {
     if (arrayTypeListFactory != null) {
       if (isEnumType(valueType)) {
@@ -407,10 +400,8 @@ public final class DefaultTypeManager implements TypeManager {
 
   @Override
   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)) {
@@ -421,7 +412,6 @@ public final class DefaultTypeManager implements TypeManager {
         return createJsonObjectMapperType(prop, dbType, docType);
       }
     }
-
     if (type.equals(Set.class)) {
       DocPropertyType docType = getDocType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
@@ -430,7 +420,6 @@ public final class DefaultTypeManager implements TypeManager {
         return createJsonObjectMapperType(prop, dbType, docType);
       }
     }
-
     if (type.equals(Map.class)) {
       if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) {
         return ScalarTypeJsonMap.typeFor(postgres, dbType);
@@ -438,7 +427,6 @@ public final class DefaultTypeManager implements TypeManager {
         return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
       }
     }
-
     if (objectMapperPresent) {
       if (type.equals(JsonNode.class)) {
         switch (dbType) {
@@ -455,7 +443,6 @@ public final class DefaultTypeManager implements TypeManager {
         }
       }
     }
-
     return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
   }
 
@@ -510,11 +497,9 @@ public final class DefaultTypeManager implements TypeManager {
    * <p>
    * Used for java.util.Date and java.util.Calendar which can be mapped to
    * different jdbcTypes in a single system.
-   * </p>
    */
   @Override
   public ScalarType<?> getScalarType(Class<?> type, int jdbcType) {
-
     // File is a special Lob so check for that first
     if (File.class.equals(type)) {
       return fileType;
@@ -554,10 +539,8 @@ public final class DefaultTypeManager implements TypeManager {
    * Kind of special case because these map multiple jdbc types to single Java
    * types - like String - Varchar, LongVarchar, Clob. For this reason I check
    * for the specific Lob types first before looking for a matching type.
-   * </p>
    */
   private ScalarType<?> getLobTypes(int jdbcType) {
-
     return getScalarType(jdbcType);
   }
 
@@ -601,14 +584,10 @@ public final class DefaultTypeManager implements TypeManager {
    * Create the Mapping of Enum fields to DB values using EnumValue annotations.
    * <p>
    * Return null if the EnumValue annotations are not present/used.
-   * </p>
    */
   private ScalarTypeEnum<?> createEnumScalarType2(Class<?> enumType) {
-
     boolean integerType = true;
-
     Map<String, String> nameValueMap = new LinkedHashMap<>();
-
     Field[] fields = enumType.getDeclaredFields();
     for (Field field : fields) {
       EnumValue enumValue = AnnotationUtil.get(field, EnumValue.class);
@@ -624,8 +603,7 @@ public final class DefaultTypeManager implements TypeManager {
       // Not using EnumValue here
       return null;
     }
-
-    return createEnumScalarType(enumType, nameValueMap, integerType, 0);
+    return createEnumScalarType(enumType, nameValueMap, integerType, 0, true);
   }
 
   /**
@@ -635,17 +613,14 @@ public final class DefaultTypeManager implements TypeManager {
    * such as A,I,N rather than the ACTIVE, INACTIVE, NEW. So there really needs
    * to be a mapping from the nicely named enumeration values to the typically
    * much shorter codes used in the DB.
-   * </p>
    */
   @Override
   public ScalarType<?> createEnumScalarType(Class<? extends Enum<?>> enumType, EnumType type) {
-
     ScalarType<?> scalarType = getScalarType(enumType);
     if (scalarType instanceof ScalarTypeWrapper) {
       // no override or further mapping required
       return scalarType;
     }
-
     ScalarTypeEnum<?> scalarEnum = (ScalarTypeEnum<?>)scalarType;
     if (scalarEnum != null && !scalarEnum.isOverrideBy(type)) {
       if (type != null && !scalarEnum.isCompatible(type)) {
@@ -653,7 +628,6 @@ public final class DefaultTypeManager implements TypeManager {
       }
       return scalarEnum;
     }
-
     scalarEnum = createEnumScalarTypePerExtentions(enumType);
     if (scalarEnum == null) {
       // use JPA normal Enum type (without mapping)
@@ -665,33 +639,27 @@ public final class DefaultTypeManager implements TypeManager {
 
   private ScalarTypeEnum<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type) {
     if (type == null) {
-
-      if(defaultEnumType == EnumType.ORDINAL) {
+      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);
-
     } else {
       return new ScalarTypeEnumStandard.StringEnum(enumType);
     }
   }
 
   private ScalarTypeEnum<?> createEnumScalarTypePerExtentions(Class<? extends Enum<?>> enumType) {
-
     Method[] methods = enumType.getMethods();
     for (Method method : methods) {
       DbEnumValue dbValue = AnnotationUtil.get(method, DbEnumValue.class);
       if (dbValue != null) {
         boolean integerValues = DbEnumType.INTEGER == dbValue.storage();
-        return createEnumScalarTypeDbValue(enumType, method, integerValues, dbValue.length());
+        return createEnumScalarTypeDbValue(enumType, method, integerValues, dbValue.length(), dbValue.withConstraint());
       }
     }
-
     // look for EnumValue annotations instead
     return createEnumScalarType2(enumType);
   }
@@ -702,10 +670,8 @@ 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, int length) {
-
+  private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType, int length, boolean withConstraint) {
     Map<String, String> nameValueMap = new LinkedHashMap<>();
-
     Enum<?>[] enumConstants = enumType.getEnumConstants();
     for (Enum<?> enumConstant : enumConstants) {
       try {
@@ -719,8 +685,7 @@ public final class DefaultTypeManager implements TypeManager {
       // Not using EnumValue here
       return null;
     }
-
-    return createEnumScalarType(enumType, nameValueMap, integerType, length);
+    return createEnumScalarType(enumType, nameValueMap, integerType, length, withConstraint);
   }
 
   /**
@@ -728,27 +693,20 @@ public final class DefaultTypeManager implements TypeManager {
    * length create the ScalarType for the Enum.
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
-  private ScalarTypeEnum<?> createEnumScalarType(Class enumType, Map<String, String> nameValueMap, boolean integerType, int dbColumnLength) {
-
+  private ScalarTypeEnum<?> createEnumScalarType(Class enumType, Map<String, String> nameValueMap, boolean integerType, int dbColumnLength, boolean withConstraint) {
     EnumToDbValueMap<?> beanDbMap = EnumToDbValueMap.create(integerType);
-
     int maxValueLen = 0;
-
     for (Map.Entry<String, String> entry : nameValueMap.entrySet()) {
       String name = entry.getKey();
       String value = entry.getValue();
-
       maxValueLen = Math.max(maxValueLen, value.length());
-
       Object enumValue = Enum.valueOf(enumType, name.trim());
       beanDbMap.add(enumValue, value, name.trim());
     }
-
     if (dbColumnLength == 0 && !integerType) {
       dbColumnLength = maxValueLen;
     }
-
-    return new ScalarTypeEnumWithMapping(beanDbMap, enumType, dbColumnLength);
+    return new ScalarTypeEnumWithMapping(beanDbMap, enumType, dbColumnLength, withConstraint);
   }
 
   /**
@@ -760,10 +718,8 @@ public final class DefaultTypeManager implements TypeManager {
    * </p>
    */
   private void initialiseCustomScalarTypes(BootupClasses bootupClasses) {
-
     for (Class<? extends ScalarType<?>> cls : bootupClasses.getScalarTypes()) {
       try {
-
         ScalarType<?> scalarType;
         if (objectMapper == null) {
           scalarType = cls.newInstance();
@@ -776,9 +732,7 @@ public final class DefaultTypeManager implements TypeManager {
             scalarType = cls.newInstance();
           }
         }
-
         addCustomType(scalarType);
-
       } catch (Exception e) {
         String msg = "Error loading ScalarType [" + cls.getName() + "]";
         logger.error(msg, e);
@@ -801,30 +755,23 @@ public final class DefaultTypeManager implements TypeManager {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   private void initialiseScalarConverters(BootupClasses bootupClasses) {
-
     List<Class<? extends ScalarTypeConverter<?, ?>>> foundTypes = bootupClasses.getScalarConverters();
-
     for (Class<? extends ScalarTypeConverter<?, ?>> foundType : foundTypes) {
       try {
-
         Class<?>[] paramTypes = TypeReflectHelper.getParams(foundType, ScalarTypeConverter.class);
         if (paramTypes.length != 2) {
           throw new IllegalStateException("Expected 2 generics paramtypes but got: " + Arrays.toString(paramTypes));
         }
-
         Class<?> logicalType = paramTypes[0];
         Class<?> persistType = paramTypes[1];
-
         ScalarType<?> wrappedType = getScalarType(persistType);
         if (wrappedType == null) {
           throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
         }
-
         ScalarTypeConverter converter = foundType.newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, converter);
         logger.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType);
         add(stw);
-
       } catch (Exception e) {
         logger.error("Error registering ScalarTypeConverter [" + foundType.getName() + "]", e);
       }
@@ -833,30 +780,23 @@ public final class DefaultTypeManager implements TypeManager {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   private void initialiseAttributeConverters(BootupClasses bootupClasses) {
-
     List<Class<? extends AttributeConverter<?, ?>>> foundTypes = bootupClasses.getAttributeConverters();
-
     for (Class<? extends AttributeConverter<?, ?>> foundType : foundTypes) {
       try {
-
         Class<?>[] paramTypes = TypeReflectHelper.getParams(foundType, AttributeConverter.class);
         if (paramTypes.length != 2) {
           throw new IllegalStateException("Expected 2 generics paramtypes but got: " + Arrays.toString(paramTypes));
         }
-
         Class<?> logicalType = paramTypes[0];
         Class<?> persistType = paramTypes[1];
-
         ScalarType<?> wrappedType = getScalarType(persistType);
         if (wrappedType == null) {
           throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
         }
-
         AttributeConverter converter = foundType.newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, new AttributeConverterAdapter(converter));
         logger.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType);
         add(stw);
-
       } catch (Exception e) {
         logger.error("Error registering AttributeConverter [" + foundType.getName() + "]", e);
       }
@@ -875,12 +815,10 @@ public final class DefaultTypeManager implements TypeManager {
       jsonNodeVarchar = new ScalarTypeJsonNode.Varchar(mapper);
       jsonNodeJson = jsonNodeClob;  // Default for non-Postgres databases
       jsonNodeJsonb = jsonNodeClob; // Default for non-Postgres databases
-
       if (isPostgres(config.getDatabasePlatform())) {
         jsonNodeJson = new ScalarTypeJsonNodePostgres.JSON(mapper);
         jsonNodeJsonb = new ScalarTypeJsonNodePostgres.JSONB(mapper);
       }
-
       // add as default mapping for JsonNode (when not annotated with @DbJson etc)
       typeMap.put(JsonNode.class, jsonNodeJson);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
index d8ab07e72..598889f49 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
@@ -20,13 +20,20 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i
 
   private final int length;
 
+  private final boolean withConstraint;
+
   /**
    * Create with an explicit mapping of bean to database values.
    */
-  public ScalarTypeEnumWithMapping(EnumToDbValueMap<?> beanDbMap, Class<?> enumType, int length) {
+  public ScalarTypeEnumWithMapping(EnumToDbValueMap<?> beanDbMap, Class<?> enumType, int length, boolean withConstraint) {
     super(enumType, false, beanDbMap.getDbType());
     this.beanDbMap = beanDbMap;
     this.length = length;
+    this.withConstraint = withConstraint;
+  }
+
+  public ScalarTypeEnumWithMapping(EnumToDbValueMap<?> beanDbMap, Class<?> enumType, int length) {
+    this(beanDbMap, enumType, length, true);
   }
 
   @Override
@@ -49,6 +56,9 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i
    */
   @Override
   public Set<String> getDbCheckConstraintValues() {
+    if (!withConstraint) {
+      return null;
+    }
     LinkedHashSet values = new LinkedHashSet();
     Iterator<?> it = beanDbMap.dbValues();
     while (it.hasNext()) {
@@ -64,9 +74,6 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i
 
   /**
    * Return the DB column length for storing the enum value.
-   * <p>
-   * This is for enum's mapped to strings.
-   * </p>
    */
   @Override
   public int getLength() {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
index e64bc2b7a..950a805fd 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
@@ -1,10 +1,13 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import org.junit.Test;
+import org.tests.model.array.IntEnum;
+import org.tests.model.array.VarcharEnum;
+import org.tests.model.basic.Car;
 
 import javax.persistence.EnumType;
 import java.time.DayOfWeek;
@@ -17,7 +20,7 @@ import static org.junit.Assert.assertTrue;
 public class DefaultTypeManagerTest {
 
   private DefaultTypeManager create() {
-    ServerConfig serverConfig = new ServerConfig();
+    DatabaseConfig serverConfig = new DatabaseConfig();
     serverConfig.setDatabasePlatform(new PostgresPlatform());
     BootupClasses bootupClasses = new BootupClasses();
     return new DefaultTypeManager(serverConfig, bootupClasses);
@@ -25,7 +28,6 @@ public class DefaultTypeManagerTest {
 
   @Test
   public void isIntegerType() {
-
     DefaultTypeManager typeManager = create();
 
     assertTrue(typeManager.isIntegerType("1"));
@@ -42,7 +44,6 @@ public class DefaultTypeManagerTest {
 
   @Test
   public void enumDayMonth_builtIn_overrideAsString() {
-
     DefaultTypeManager typeManager = create();
 
     ScalarType<?> type = typeManager.createEnumScalarType(Month.class, null);
@@ -51,7 +52,6 @@ public class DefaultTypeManagerTest {
     // 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");
@@ -63,17 +63,14 @@ public class DefaultTypeManagerTest {
 
   @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");
     }
@@ -81,7 +78,6 @@ public class DefaultTypeManagerTest {
 
   @Test
   public void enumDayOfWeek_builtIn_overrideAsString() {
-
     DefaultTypeManager typeManager = create();
 
     ScalarType<?> type = typeManager.createEnumScalarType(DayOfWeek.class, null);
@@ -90,11 +86,9 @@ public class DefaultTypeManagerTest {
     // 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");
     }
@@ -102,19 +96,40 @@ public class DefaultTypeManagerTest {
 
   @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");
     }
   }
+
+  @Test
+  public void createEnumScalarTypePerExtentions() {
+    DefaultTypeManager typeManager = create();
+
+    ScalarType<?> type = typeManager.createEnumScalarType(VarcharEnum.class, EnumType.ORDINAL);
+    assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class);
+    // withConstraint false
+    assertThat(((ScalarTypeEnumWithMapping) type).getDbCheckConstraintValues()).isNull();
+
+    type = typeManager.createEnumScalarType(IntEnum.class, EnumType.ORDINAL);
+    assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class);
+    ScalarTypeEnumWithMapping enumWithMapping = (ScalarTypeEnumWithMapping) type;
+    // withConstraint true
+    assertThat(enumWithMapping.getDbCheckConstraintValues()).hasSize(3);
+    assertThat(enumWithMapping.getDbCheckConstraintValues()).contains("100", "101", "102");
+
+    type = typeManager.createEnumScalarType(Car.Size.class, EnumType.ORDINAL);
+    assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class);
+    enumWithMapping = (ScalarTypeEnumWithMapping) type;
+    // withConstraint true
+    assertThat(enumWithMapping.getDbCheckConstraintValues()).hasSize(2);
+    assertThat(enumWithMapping.getDbCheckConstraintValues()).contains("'L'", "'S'");
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java b/ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java
index 2bbc64daf..f5698d009 100644
--- a/ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java
+++ b/ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java
@@ -6,7 +6,7 @@ import io.ebean.annotation.DbEnumValue;
 public enum VarcharEnum {
   ZERO, ONE, TWO;
 
-  @DbEnumValue(storage = DbEnumType.VARCHAR)
+  @DbEnumValue(storage = DbEnumType.VARCHAR, withConstraint = false)
   public String dbValue() {
     return "xXx" + name();
   }

From 7389a8b344db290fe3108ea52918cd517db85d9a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 22:46:04 +1300
Subject: [PATCH 018/447] #2124 - ENH: Add name() attribute to @DbArray,
 @DbJson, @DbJsonB, @DbMap

---
 ebean-api/pom.xml                                    |  2 +-
 .../server/deploy/parse/AnnotationFields.java        |  4 ++++
 .../server/deploy/parse/AnnotationParser.java        | 12 +++++++-----
 .../java/org/tests/json/TestDbJson_Jackson3.java     |  2 +-
 .../test/java/org/tests/json/TestDbJson_List.java    |  2 +-
 .../java/org/tests/model/json/EBasicJsonList.java    |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 22e0fd394..945d263f0 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.14-SNAPSHOT</version>
+      <version>6.15</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 0a1bc1ff4..aafbfa182 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -311,19 +311,23 @@ public class AnnotationFields extends AnnotationParser {
     DbMap dbMap = get(prop, DbMap.class);
     if (dbMap != null) {
       util.setDbMap(prop, dbMap);
+      setColumnName(prop, dbMap.name());
     }
     DbJson dbJson = get(prop, DbJson.class);
     if (dbJson != null) {
       util.setDbJsonType(prop, dbJson);
+      setColumnName(prop, dbJson.name());
     } else {
       DbJsonB dbJsonB = get(prop, DbJsonB.class);
       if (dbJsonB != null) {
         util.setDbJsonBType(prop, dbJsonB);
+        setColumnName(prop, dbJsonB.name());
       }
     }
     DbArray dbArray = get(prop, DbArray.class);
     if (dbArray != null) {
       util.setDbArray(prop, dbArray);
+      setColumnName(prop, dbArray.name());
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index 8646aa62b..64851135d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -99,11 +99,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   }
 
   void readColumn(Column columnAnn, DeployBeanProperty prop) {
-
-    if (!isEmpty(columnAnn.name())) {
-      prop.setDbColumn(databasePlatform.convertQuotedIdentifiers(columnAnn.name()));
-    }
-
+    setColumnName(prop, columnAnn.name());
     prop.setDbInsertable(columnAnn.insertable());
     prop.setDbUpdateable(columnAnn.updatable());
     prop.setNullable(columnAnn.nullable());
@@ -125,6 +121,12 @@ public abstract class AnnotationParser extends AnnotationBase {
     }
   }
 
+  protected void setColumnName(DeployBeanProperty prop, String name) {
+    if (!isEmpty(name)) {
+      prop.setDbColumn(databasePlatform.convertQuotedIdentifiers(name));
+    }
+  }
+
   /**
    * Return true if the validation groups are {@link Default} (respectively empty)
    * can be applied to DDL generation.
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 336946ab2..74f004bca 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -71,6 +71,6 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_set=?, bean_list=?, plain_bean=?, version=? where id=?");
+    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, beans=?, bean_list=?, plain_bean=?, version=? where id=?");
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index 3686e8f16..0582818db 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -154,7 +154,7 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set bean_set=?, bean_list=?, bean_map=?, plain_bean=?, version=? where id=? and version=?");
+    assertSql(sql.get(0)).contains("update ebasic_json_list set beans=?, bean_list=?, bean_map=?, plain_bean=?, version=? where id=? and version=?");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
index cf34d5826..22b32e3e1 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
@@ -22,7 +22,7 @@ public class EBasicJsonList {
 
   String name;
 
-  @DbJson(length = 700)
+  @DbJson(length = 700, name = "beans")
   Set<PlainBean> beanSet;
 
   @DbJsonB

From b623e19daebf57677fed3aa1ce7d1059af2f48aa Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 22:47:43 +1300
Subject: [PATCH 019/447] update git ignore

---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b88dd830..861a33064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 *.autofetch
-*create-all.sql
-*drop-all.sql
 *.orig
 .classpath
 .project
@@ -12,7 +10,6 @@ ebean-autotune.xml
 ebean-profiling*.xml
 /db
 /mydb.db
-!src/test/ddl-review/*.sql
 profiling/
 
 # Intellij project files
@@ -20,4 +17,4 @@ profiling/
 *.ipr
 *.iws
 .idea/
-*uuid.state
\ No newline at end of file
+*uuid.state

From 0b24d635adf65c7295ee9c9a0c20582f40ae8fcd Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 22:48:32 +1300
Subject: [PATCH 020/447] Tests only - update ddl review

---
 .../src/test/ddl-review/h2-create-all.sql     | 5188 ++++++++++++++++
 .../src/test/ddl-review/h2-drop-all.sql       | 1959 ++++++
 .../test/ddl-review/mariadb-create-all.sql    | 4909 +++++++++++++++
 .../src/test/ddl-review/mariadb-drop-all.sql  | 1868 ++++++
 .../src/test/ddl-review/mysql-create-all.sql  | 5008 ++++++++++++++++
 .../src/test/ddl-review/mysql-drop-all.sql    | 1867 ++++++
 .../src/test/ddl-review/oracle-create-all.sql | 4826 +++++++++++++++
 .../src/test/ddl-review/oracle-drop-all.sql   | 1821 ++++++
 .../src/test/ddl-review/pg-create-all.sql     | 5236 ++++++++++++++++
 .../src/test/ddl-review/pg-drop-all.sql       | 1957 ++++++
 .../test/ddl-review/sqlserver-create-all.sql  | 5308 +++++++++++++++++
 .../test/ddl-review/sqlserver-drop-all.sql    | 2234 +++++++
 12 files changed, 42181 insertions(+)
 create mode 100644 ebean-core/src/test/ddl-review/h2-create-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/h2-drop-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/mariadb-create-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/mariadb-drop-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/mysql-create-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/mysql-drop-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/oracle-create-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/oracle-drop-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/pg-create-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/pg-drop-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/sqlserver-create-all.sql
 create mode 100644 ebean-core/src/test/ddl-review/sqlserver-drop-all.sql

diff --git a/ebean-core/src/test/ddl-review/h2-create-all.sql b/ebean-core/src/test/ddl-review/h2-create-all.sql
new file mode 100644
index 000000000..dc5f4879f
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/h2-create-all.sql
@@ -0,0 +1,5188 @@
+-- Generated by ebean unknown at 2020-12-07T09:40:50.461215Z
+create table asimple_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_asimple_bean primary key (id)
+);
+
+create table bar (
+  bar_type                      varchar(31) not null,
+  bar_id                        integer generated by default as identity not null,
+  foo_id                        integer not null,
+  version                       integer not null,
+  constraint pk_bar primary key (bar_id)
+);
+
+create table block (
+  case_type                     integer(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  notes                         varchar(255),
+  constraint pk_block primary key (id)
+);
+
+create table oto_account (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_oto_account primary key (id)
+);
+
+create table acl (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_acl primary key (id)
+);
+
+create table acl_container_relation (
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  street                        varchar(255),
+  version                       integer not null,
+  constraint pk_address primary key (oid)
+);
+
+create table o_address (
+  id                            integer generated by default as identity 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 album (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  cover_id                      bigint,
+  deleted                       boolean default false 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 table animal (
+  species                       varchar(255) not null,
+  id                            bigint generated by default as identity not null,
+  shelter_id                    bigint,
+  version                       bigint not null,
+  name                          varchar(255),
+  registration_number           varchar(255),
+  date_of_birth                 date,
+  dog_size                      varchar(255),
+  constraint pk_animal primary key (id)
+);
+
+create table animal_shelter (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_animal_shelter primary key (id)
+);
+
+create table article (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  author                        varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_article primary key (id)
+);
+
+create table attribute (
+  option_type                   integer(31) not null,
+  id                            integer generated by default as identity not null,
+  attribute_holder_id           integer,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_attribute primary key (id)
+);
+
+create table attribute_holder (
+  id                            integer generated by default as identity not null,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_attribute_holder primary key (id)
+);
+
+create table audit_log (
+  id                            bigint generated by default as identity (start with 1000 cache 100) not null,
+  description                   varchar(255),
+  modified_description          varchar(255),
+  constraint pk_audit_log primary key (id)
+);
+
+create table bbookmark (
+  id                            integer generated by default as identity not null,
+  bookmark_reference            varchar(255),
+  user_id                       integer,
+  constraint pk_bbookmark primary key (id)
+);
+
+create table bbookmark_org (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_bbookmark_org primary key (id)
+);
+
+create table bbookmark_user (
+  id                            integer generated by default as identity 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)
+);
+
+create table bsimple_with_gen (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  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_a (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  access_level                  integer,
+  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 (
+  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 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),
+  constraint pk_buser primary key (id)
+);
+
+create table bwith_qident (
+  id                            integer generated by default as identity not null,
+  "Name"                        varchar(191),
+  "CODE"                        varchar(255),
+  last_updated                  timestamp not null,
+  constraint uq_bwith_qident_name unique ("Name"),
+  constraint pk_bwith_qident primary key (id)
+);
+
+create table basic_draftable_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_basic_draftable_bean primary key (id)
+);
+
+create table basic_draftable_bean_draft (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_basic_draftable_bean_draft primary key (id)
+);
+
+create table basic_joda_entity (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  period                        varchar(50),
+  local_date                    date,
+  created                       timestamp not null,
+  updated                       timestamp not null,
+  version                       timestamp not null,
+  constraint pk_basic_joda_entity primary key (id)
+);
+
+create table bean_with_time_zone (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  timezone                      varchar(20),
+  constraint pk_bean_with_time_zone primary key (id)
+);
+
+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 increment by 1;
+
+create table bw_bean (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepcategory primary key (id)
+);
+
+create table cepproduct (
+  id                            bigint generated by default as identity 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 ciaddress (
+  id                            bigint generated by default as identity not null,
+  street_id                     bigint,
+  constraint pk_ciaddress primary key (id)
+);
+
+create table cicustomer_parent (
+  dtype                         integer(31) not null,
+  id                            bigint generated by default as identity not null,
+  address_id                    bigint,
+  notes                         varchar(255),
+  constraint pk_cicustomer_parent primary key (id)
+);
+
+create table cistreet_parent (
+  dtype                         integer(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  num                           varchar(255),
+  constraint pk_cistreet_parent primary key (id)
+);
+
+create table cinh_ref (
+  id                            integer generated by default as identity not null,
+  ref_id                        integer,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_cinh_ref primary key (id)
+);
+
+create table cinh_root (
+  dtype                         varchar(3) not null,
+  id                            integer generated by default as identity not null,
+  license_number                varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp 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 generated by default as identity not null,
+  assoc_one                     varchar(255),
+  constraint pk_ckey_assoc primary key (id)
+);
+
+create table ckey_detail (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  one_key                       integer,
+  two_key                       varchar(127),
+  constraint pk_ckey_detail primary key (id)
+);
+
+create table ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  assoc_id                      integer,
+  version                       integer not null,
+  constraint pk_ckey_parent primary key (one_key,two_key)
+);
+
+create table coone (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_coone primary key (id)
+);
+
+create table coone_many (
+  id                            bigint generated by default as identity not null,
+  coone_id                      bigint not null,
+  name                          varchar(255),
+  deleted                       boolean default false not null,
+  constraint pk_coone_many primary key (id)
+);
+
+create table coroot (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint uq_coroot_one_id unique (one_id),
+  constraint pk_coroot primary key (id)
+);
+
+create table calculation_result (
+  id                            integer generated by default as identity not null,
+  charge                        double not null,
+  product_configuration_id      integer,
+  group_configuration_id        integer,
+  constraint pk_calculation_result primary key (id)
+);
+
+create table cao_bean (
+  x_cust_id                     integer not null,
+  x_type_id                     integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_cao_bean primary key (x_cust_id,x_type_id)
+);
+
+create table sp_car_car (
+  id                            bigint not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_car primary key (id)
+);
+create sequence sp_car_car_seq increment by 1;
+
+create table sp_car_car_wheels (
+  car                           bigint not null,
+  wheel                         bigint not null,
+  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,
+  brand                         varchar(255),
+  sold                          integer not null,
+  version                       integer not null,
+  constraint pk_sa_car primary key (id)
+);
+create sequence sa_car_seq increment by 1;
+
+create table car_accessory (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  fuse_id                       bigint not null,
+  car_id                        integer,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_car_accessory primary key (id)
+);
+
+create table car_fuse (
+  id                            bigint generated by default as identity not null,
+  location_code                 varchar(255),
+  constraint pk_car_fuse primary key (id)
+);
+
+create table category (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  surveyobjectid                bigint,
+  sequence_number               integer not null,
+  constraint pk_category primary key (id)
+);
+
+create table e_save_test_d (
+  id                            bigint generated by default as identity 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                    integer generated by default as identity 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 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 generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  configurations_id             integer,
+  group_name                    varchar(255),
+  product_name                  varchar(255),
+  constraint pk_configuration primary key (id)
+);
+
+create table configurations (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_configurations primary key (id)
+);
+
+create table contact (
+  id                            integer generated by default as identity not null,
+  first_name                    varchar(127),
+  last_name                     varchar(127),
+  phone                         varchar(255),
+  mobile                        varchar(255),
+  email                         varchar(255),
+  is_member                     boolean default false not null,
+  customer_id                   integer not null,
+  group_id                      integer,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  constraint pk_contact primary key (id)
+);
+
+create table contact_group (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_contact_group primary key (id)
+);
+
+create table contact_note (
+  id                            integer generated by default as identity not null,
+  contact_id                    integer,
+  title                         varchar(255),
+  note                          clob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_contact_note primary key (id)
+);
+
+create table contract (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_contract primary key (id)
+);
+
+create table contract_costs (
+  id                            bigint generated by default as identity not null,
+  status                        varchar(255),
+  position_id                   bigint not null,
+  constraint pk_contract_costs primary key (id)
+);
+
+create table c_conversation (
+  id                            bigint generated by default as identity not null,
+  title                         varchar(255),
+  isopen                        boolean default false not null,
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_c_conversation primary key (id)
+);
+
+create table o_country (
+  code                          varchar(2) not null,
+  name                          varchar(60),
+  constraint pk_o_country primary key (code)
+);
+
+create table cover (
+  id                            bigint generated by default as identity not null,
+  s3_url                        varchar(255),
+  deleted                       boolean default false not null,
+  constraint pk_cover primary key (id)
+);
+
+create table o_customer (
+  id                            integer generated by default as identity not null,
+  status                        varchar(1),
+  name                          varchar(40) not null,
+  smallnote                     varchar(100),
+  anniversary                   date,
+  billing_address_id            integer,
+  shipping_address_id           integer,
+  cretime                       timestamp not null,
+  updtime                       timestamp 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 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                            bigint generated by default as identity 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 generated by default as identity not null,
+  exhange                       varchar(255),
+  an_enum_type                  varchar(255),
+  last_updated                  timestamp not null,
+  constraint pk_dexh_entity primary key (oid)
+);
+
+create table dint_parent (
+  type                          integer(31) not null,
+  id                            bigint generated by default as identity not null,
+  val                           integer,
+  more                          varchar(255),
+  constraint pk_dint_parent primary key (id)
+);
+
+create table dmachine (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  machine_id                    bigint not null,
+  name                          varchar(255),
+  edate                         date,
+  use_secs                      bigint not null,
+  fuel                          decimal(16,3),
+  version                       bigint not null,
+  constraint pk_d_machine_aux_use primary key (id)
+);
+
+create table d_machine_stats (
+  id                            bigint generated by default as identity not null,
+  machine_id                    bigint not null,
+  edate                         date,
+  total_kms                     bigint not null,
+  hours                         bigint not null,
+  rate                          decimal(16,3),
+  cost                          decimal(16,3),
+  version                       bigint not null,
+  constraint pk_d_machine_stats primary key (id)
+);
+
+create table d_machine_use (
+  id                            bigint generated by default as identity not null,
+  machine_id                    bigint not null,
+  edate                         date,
+  distance_kms                  bigint not null,
+  time_secs                     bigint not null,
+  fuel                          decimal(9,3),
+  version                       bigint not null,
+  constraint pk_d_machine_use primary key (id)
+);
+
+create table dorg (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dorg primary key (id)
+);
+
+create table dperson (
+  id                            bigint generated by default as identity not null,
+  first_name                    varchar(255),
+  last_name                     varchar(255),
+  salary                        decimal(16,3),
+  constraint pk_dperson primary key (id)
+);
+
+create table drol (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_drol primary key (id)
+);
+
+create table drot (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  val                           integer,
+  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                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_master primary key (id)
+);
+
+create table defaults_model (
+  id                            integer generated by default as identity not null,
+  constraint pk_defaults_model primary key (id)
+);
+
+create table defaults_model_draft (
+  id                            integer generated by default as identity not null,
+  constraint pk_defaults_model_draft primary key (id)
+);
+
+create table dfk_cascade (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_cascade primary key (id)
+);
+
+create table dfk_cascade_one (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+
+create table dfk_none (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none primary key (id)
+);
+
+create table dfk_none_via_join (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none_via_join primary key (id)
+);
+
+create table dfk_none_via_mto_m (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_dfk_one primary key (id)
+);
+
+create table dfk_set_null (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_set_null primary key (id)
+);
+
+create table doc (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_doc_draft primary key (id)
+);
+
+create table document (
+  id                            bigint generated by default as identity not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  organisation_id               bigint,
+  version                       bigint 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 table document_draft (
+  id                            bigint generated by default as identity not null,
+  title                         varchar(127),
+  body                          varchar(255),
+  when_publish                  timestamp,
+  organisation_id               bigint,
+  version                       bigint 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 table document_media (
+  id                            bigint generated by default as identity not null,
+  document_id                   bigint,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_document_media primary key (id)
+);
+
+create table document_media_draft (
+  id                            bigint generated by default as identity not null,
+  document_id                   bigint,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  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 increment by 1;
+
+create table earray_bean (
+  id                            bigint generated by default as identity not null,
+  foo                           integer,
+  name                          varchar(255),
+  phone_numbers                 array,
+  uids                          array not null,
+  other_ids                     array,
+  doubs                         array,
+  statuses                      array,
+  vc_enums                      array,
+  int_enums                     array,
+  status2                       array,
+  version                       bigint not null,
+  constraint ck_earray_bean_foo check ( foo in (100,101,102)),
+  constraint pk_earray_bean primary key (id)
+);
+
+create table earray_set_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  phone_numbers                 array,
+  uids                          array,
+  other_ids                     array,
+  doubs                         array,
+  version                       bigint not null,
+  constraint pk_earray_set_bean primary key (id)
+);
+
+create table e_basic (
+  id                            integer generated by default as identity not null,
+  status                        varchar(1),
+  name                          varchar(127),
+  description                   varchar(255),
+  some_date                     timestamp,
+  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 generated by default as identity 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                  timestamp not null,
+  when_modified                 timestamp not null,
+  version                       bigint not null,
+  constraint pk_ebasic_change_log primary key (id)
+);
+
+create table ebasic_clob (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  description                   clob,
+  last_update                   timestamp not null,
+  constraint pk_ebasic_clob primary key (id)
+);
+
+create table ebasic_clob_fetch_eager (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  description                   clob,
+  last_update                   timestamp not null,
+  constraint pk_ebasic_clob_fetch_eager primary key (id)
+);
+
+create table ebasic_clob_no_ver (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  description                   clob,
+  constraint pk_ebasic_clob_no_ver primary key (id)
+);
+
+create table e_basicenc (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varbinary(80),
+  dob                           varbinary(20),
+  status                        varbinary(20),
+  last_update                   timestamp,
+  constraint pk_e_basicenc primary key (id)
+);
+
+create table e_basicenc_bin (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  data                          blob,
+  some_time                     varbinary(255),
+  last_update                   timestamp not null,
+  constraint pk_e_basicenc_bin primary key (id)
+);
+
+create table e_basicenc_client (
+  id                            bigint generated by default as identity 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_basicenc_relate (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  other_id                      integer,
+  constraint pk_e_basicenc_relate 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)
+);
+
+create table e_basic_eni (
+  id                            integer generated by default as identity not null,
+  status                        integer,
+  name                          varchar(255),
+  description                   varchar(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 table ebasic_hstore (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  map                           varchar(800),
+  version                       bigint not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+
+create table ebasic_json_jackson (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  value_set                     varchar(700),
+  value_list                    clob,
+  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 generated by default as identity not null,
+  name                          varchar(255),
+  value_set                     varchar(700),
+  value_list                    clob,
+  value_map                     varchar(700),
+  plain_value                   varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson2 primary key (id)
+);
+
+create table ebasic_json_jackson3 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  plain_value                   varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson3 primary key (id)
+);
+
+create table ebasic_json_list (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  beans                         varchar(700),
+  bean_list                     clob,
+  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 generated by default as identity not null,
+  name                          varchar(255),
+  content                       clob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map primary key (id)
+);
+
+create table ebasic_json_map_blob (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       blob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_blob primary key (id)
+);
+
+create table ebasic_json_map_clob (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       clob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_clob primary key (id)
+);
+
+create table ebasic_json_map_detail (
+  id                            bigint generated by default as identity not null,
+  owner_id                      bigint,
+  name                          varchar(255),
+  content                       clob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_detail primary key (id)
+);
+
+create table ebasic_json_map_json_b (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       clob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_json_b primary key (id)
+);
+
+create table ebasic_json_map_varchar (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       varchar(3000),
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_varchar primary key (id)
+);
+
+create table ebasic_json_node (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       clob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node primary key (id)
+);
+
+create table ebasic_json_node_blob (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       blob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_blob primary key (id)
+);
+
+create table ebasic_json_node_json_b (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       clob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_json_b primary key (id)
+);
+
+create table ebasic_json_node_varchar (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       varchar(1000),
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_varchar primary key (id)
+);
+
+create table ebasic_json_unmapped (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
+
+create table e_basic_ndc (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_e_basic_ndc primary key (id)
+);
+
+create table ebasic_no_sdchild (
+  id                            bigint generated by default as identity 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 generated by default as identity 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                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  other                         varchar(255),
+  last_update                   timestamp not null,
+  constraint pk_e_basicver primary key (id)
+);
+
+create table e_basic_withlife (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  other                         varchar(255),
+  deleted                       boolean default false not null,
+  version                       bigint not null,
+  constraint pk_e_basic_withlife primary key (id)
+);
+
+create table e_basic_with_ex (
+  id                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(127),
+  other                         varchar(127),
+  other_one                     varchar(127),
+  description                   varchar(255),
+  last_update                   timestamp 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 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                            bigint generated by default as identity 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 edefault_prop (
+  id                            integer generated by default as identity 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 generated by default as identity not null,
+  nome_inner                    varchar(255),
+  outer_id                      integer,
+  update_count                  integer not null,
+  constraint pk_eemb_inner primary key (id)
+);
+
+create table eemb_outer (
+  id                            integer generated by default as identity not null,
+  nome_outer                    varchar(255),
+  date1                         timestamp,
+  date2                         timestamp,
+  update_count                  integer not null,
+  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 generated by default as identity 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,
+  instant_created               timestamp not null,
+  instant_updated               timestamp not null,
+  long_created                  bigint not null,
+  long_updated                  bigint not null,
+  constraint pk_egen_props primary key (id)
+);
+
+create table eid_uid_bean (
+  id                            bigint generated by default as identity not null,
+  uuid                          uuid not null,
+  name                          varchar(255),
+  constraint uq_eid_uid_bean_uuid unique (uuid),
+  constraint pk_eid_uid_bean primary key (id)
+);
+
+create table einvoice (
+  id                            bigint generated by default as identity not null,
+  invoice_date                  timestamp,
+  state                         integer,
+  person_id                     bigint,
+  ship_street                   varchar(255) not null,
+  ship_suburb                   varchar(255),
+  ship_city                     varchar(255),
+  ship_status                   varchar(3),
+  bill_street                   varchar(255) not null,
+  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_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 table e_main (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_e_main primary key (id)
+);
+
+create table enull_collection (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_enull_collection primary key (id)
+);
+
+create table enull_collection_detail (
+  id                            integer generated by default as identity not null,
+  enull_collection_id           integer not null,
+  something                     varchar(255),
+  constraint pk_enull_collection_detail primary key (id)
+);
+
+create table eopt_one_a (
+  id                            integer generated by default as identity not null,
+  name_for_a                    varchar(255),
+  b_id                          integer,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_a primary key (id)
+);
+
+create table eopt_one_b (
+  id                            integer generated by default as identity not null,
+  name_for_b                    varchar(255),
+  c_id                          integer not null,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_b primary key (id)
+);
+
+create table eopt_one_c (
+  id                            integer generated by default as identity not null,
+  name_for_c                    varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_c primary key (id)
+);
+
+create table eper_addr (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  notes                         varchar(255),
+  street                        varchar(255) not null,
+  suburb                        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 eperson2 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  notes                         varchar(255),
+  street                        varchar(10),
+  suburb                        varchar(100),
+  city                          varchar(255) not null,
+  status                        varchar(3) not null,
+  version                       bigint not null,
+  constraint ck_eperson2_status check ( status in ('ONE','TWO')),
+  constraint pk_eperson2 primary key (id)
+);
+
+create table eperson3 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  street                        varchar(255),
+  suburb                        varchar(255),
+  city                          varchar(255),
+  status                        varchar(3),
+  version                       bigint not null,
+  constraint ck_eperson3_status check ( status in ('ONE','TWO')),
+  constraint pk_eperson3 primary key (id)
+);
+
+create table e_person_online (
+  id                            bigint generated by default as identity not null,
+  email                         varchar(127),
+  online_status                 boolean default false not null,
+  when_updated                  timestamp not null,
+  constraint uq_e_person_online_email unique (email),
+  constraint pk_e_person_online primary key (id)
+);
+
+create table esimple (
+  usertypeid                    integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_esimple primary key (usertypeid)
+);
+
+create table esoft_del_book (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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 generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  money                         decimal(16,3),
+  constraint pk_esome_convert_type primary key (id)
+);
+
+create table esome_type (
+  id                            integer generated by default as identity not null,
+  currency                      varchar(3),
+  locale                        varchar(20),
+  time_zone                     varchar(20),
+  constraint pk_esome_type primary key (id)
+);
+
+create table etrans_many (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_etrans_many primary key (id)
+);
+
+create table rawinherit_uncle (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint not null,
+  version                       bigint not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
+
+create table euser_no_fk (
+  user_id                       integer generated by default as identity 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 generated by default as identity not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk_soft_del primary key (user_id)
+);
+
+create table evanilla_collection (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_evanilla_collection primary key (id)
+);
+
+create table evanilla_collection_detail (
+  id                            integer generated by default as identity not null,
+  evanilla_collection_id        integer not null,
+  something                     varchar(255),
+  constraint pk_evanilla_collection_detail primary key (id)
+);
+
+create table ewho_props (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  who_created                   varchar(255) not null,
+  who_modified                  varchar(255) not null,
+  constraint pk_ewho_props primary key (id)
+);
+
+create table e_withinet (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  inet_address                  varchar(50),
+  inet2                         varchar(255),
+  cidr                          varchar(50),
+  version                       bigint not null,
+  constraint pk_e_withinet primary key (id)
+);
+
+create table ec_enum_person (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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 ec_top (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  person_id                     bigint,
+  version                       bigint not null,
+  constraint pk_ec_top primary key (id)
+);
+
+create table ec_top_ecs_person (
+  ec_top_id                     bigint not null,
+  ecs_person_id                 bigint not null,
+  constraint pk_ec_top_ecs_person primary key (ec_top_id,ecs_person_id)
+);
+
+create table ecbl_person (
+  id                            bigint generated by default as identity 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),
+  phnum                         varchar(20)
+);
+
+create table ecbm_person (
+  id                            bigint generated by default as identity 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),
+  phnum                         varchar(20)
+);
+
+create table ecm_person (
+  id                            bigint generated by default as identity 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,
+  phnum                         varchar(10) not null
+);
+
+create table ecmc_person (
+  id                            bigint generated by default as identity 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                         clob not null
+);
+
+create table ecs_person (
+  id                            bigint generated by default as identity 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 ecsm_child (
+  one_id                        uuid not null,
+  ecsm_parent_id                bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_child primary key (one_id)
+);
+
+create table ecsm_values (
+  host_id                       uuid not null,
+  value                         varchar(255) not null
+);
+
+create table ecsm_one (
+  one_id                        uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_one primary key (one_id)
+);
+
+create table ecsm_parent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_parent primary key (id)
+);
+
+create table ecsm_two (
+  id                            uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_two primary key (id)
+);
+
+create table td_child (
+  child_id                      integer generated by default as identity not null,
+  child_name                    varchar(255),
+  parent_id                     integer not null,
+  constraint pk_td_child primary key (child_id)
+);
+
+create table td_parent (
+  parent_type                   varchar(31) not null,
+  parent_id                     integer generated by default as identity not null,
+  parent_name                   varchar(255),
+  extended_name                 varchar(255),
+  constraint pk_td_parent primary key (parent_id)
+);
+
+create table element_bean (
+  id                            bigint generated by default as identity not null,
+  complex_bean_id               uuid not null,
+  value                         varchar(255) not null,
+  constraint pk_element_bean primary key (id)
+);
+
+create table empl (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  age                           integer,
+  default_address_id            bigint,
+  constraint pk_empl primary key (id)
+);
+
+create table esd_detail (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  constraint pk_feature_desc primary key (id)
+);
+
+create table f_first (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_f_first primary key (id)
+);
+
+create table foo (
+  foo_id                        integer generated by default as identity not null,
+  important_text                varchar(255),
+  version                       integer not null,
+  constraint pk_foo primary key (foo_id)
+);
+
+create table gen_key_identity (
+  id                            bigint generated by default as identity not null,
+  description                   varchar(255),
+  constraint pk_gen_key_identity primary key (id)
+);
+
+create table gen_key_sequence (
+  id                            bigint not null,
+  description                   varchar(255),
+  constraint pk_gen_key_sequence primary key (id)
+);
+create sequence SEQ_NAME increment by 1;
+
+create table grand_parent_person (
+  identifier                    integer generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  inactive                      boolean default false not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_c_group primary key (id)
+);
+
+create table hembi_bean (
+  part                          bigint not null,
+  brand                         varchar(20) not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_hembi_bean primary key (part,brand)
+);
+
+create table he_doc (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_he_doc primary key (id)
+);
+
+create table hx_link (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  deleted                       boolean default false 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_doc primary key (id)
+);
+
+create table hi_link (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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 hi_tone (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  comments                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_tone primary key (id)
+);
+
+create table hi_tthree (
+  id                            bigint generated by default as identity not null,
+  hi_ttwo_id                    bigint not null,
+  three                         varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_tthree primary key (id)
+);
+
+create table hi_ttwo (
+  id                            bigint generated by default as identity not null,
+  hi_tone_id                    bigint not null,
+  two                           varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_ttwo primary key (id)
+);
+
+create table hsd_setting (
+  id                            bigint generated by default as identity not null,
+  code                          varchar(255),
+  content                       varchar(255),
+  user_id                       bigint,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_iaf_segment_status primary key (id)
+);
+
+create table imrelated (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  owner_id                      bigint not null,
+  constraint pk_imrelated primary key (id)
+);
+
+create table imroot (
+  dtype                         varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  when_title                    timestamp,
+  constraint pk_imroot primary key (id)
+);
+
+create table ixresource (
+  dtype                         varchar(255),
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_ixresource primary key (id)
+);
+
+create table info_company (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_info_company primary key (id)
+);
+
+create table info_contact (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  company_id                    bigint not null,
+  version                       bigint not null,
+  constraint pk_info_contact primary key (id)
+);
+
+create table info_customer (
+  id                            bigint generated by default as identity 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 table inner_report (
+  id                            bigint generated by default as identity 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 table drel_invoice (
+  id                            bigint not null,
+  booking                       bigint,
+  version                       integer not null,
+  constraint pk_drel_invoice primary key (id)
+);
+create sequence drel_invoice_seq increment by 1;
+
+create table item (
+  customer                      integer not null,
+  itemnumber                    varchar(127) not null,
+  description                   varchar(255),
+  units                         varchar(255),
+  type                          integer not null,
+  region                        integer not null,
+  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)
+);
+
+create table monkey (
+  mid                           bigint generated by default as identity not null,
+  name                          varchar(255),
+  food_preference               varchar(255),
+  version                       bigint not null,
+  constraint pk_monkey primary key (mid)
+);
+
+create table mkeygroup (
+  pid                           bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+
+create table l2_cldf_reset_bean_child (
+  id                            bigint generated by default as identity not null,
+  parent_id                     bigint,
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+
+create table level1 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level1 primary key (id)
+);
+
+create table level1_level4 (
+  level1_id                     bigint not null,
+  level4_id                     bigint not null,
+  constraint pk_level1_level4 primary key (level1_id,level4_id)
+);
+
+create table level1_level2 (
+  level1_id                     bigint not null,
+  level2_id                     bigint not null,
+  constraint pk_level1_level2 primary key (level1_id,level2_id)
+);
+
+create table level2 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level2 primary key (id)
+);
+
+create table level2_level3 (
+  level2_id                     bigint not null,
+  level3_id                     bigint not null,
+  constraint pk_level2_level3 primary key (level2_id,level3_id)
+);
+
+create table level3 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level3 primary key (id)
+);
+
+create table level4 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level4 primary key (id)
+);
+
+create table link (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  timestamp,
+  link_comment                  varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  deleted                       boolean default false not null,
+  constraint pk_link primary key (id)
+);
+
+create table link_draft (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  timestamp,
+  link_comment                  varchar(255),
+  dirty                         boolean default false not null,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  deleted                       boolean default false not null,
+  constraint pk_link_draft primary key (id)
+);
+
+create table la_attr_value (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_la_attr_value primary key (id)
+);
+
+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 looney (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mgroup primary key (id)
+);
+
+create table mmachine (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  url                           varchar(255),
+  note                          varchar(255),
+  constraint pk_mmedia primary key (id)
+);
+
+create table non_updateprop (
+  id                            integer generated by default as identity 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 pk_non_updateprop primary key (id)
+);
+
+create table mprinter (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  flags                         bigint not null,
+  current_state_id              bigint,
+  last_swap_cyan_id             bigint,
+  last_swap_magenta_id          bigint,
+  last_swap_yellow_id           bigint,
+  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_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 table mprinter_state (
+  id                            bigint generated by default as identity not null,
+  flags                         bigint not null,
+  printer_id                    bigint,
+  version                       bigint not null,
+  constraint pk_mprinter_state primary key (id)
+);
+
+create table mprofile (
+  id                            bigint generated by default as identity not null,
+  picture_id                    bigint,
+  name                          varchar(255),
+  constraint pk_mprofile primary key (id)
+);
+
+create table mprotected_construct_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mprotected_construct_bean primary key (id)
+);
+
+create table mrole (
+  roleid                        integer generated by default as identity not null,
+  role_name                     varchar(255),
+  constraint pk_mrole primary key (roleid)
+);
+
+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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_msome_other primary key (id)
+);
+
+create table muser (
+  userid                        integer generated by default as identity not null,
+  user_name                     varchar(255),
+  user_type_id                  integer,
+  constraint pk_muser primary key (userid)
+);
+
+create table muser_type (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_muser_type primary key (id)
+);
+
+create table mail_box (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_box primary key (id)
+);
+
+create table mail_user (
+  id                            bigint generated by default as identity 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 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  when_created                  timestamp not null,
+  when_updated                  timestamp not null,
+  constraint pk_map_super_actual primary key (id)
+);
+
+create table c_message (
+  id                            bigint generated by default as identity 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,
+  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                       integer generated by default as identity not null,
+  role_name                     varchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_role primary key (role_id)
+);
+
+create table mnoc_user (
+  user_id                       integer generated by default as identity not null,
+  user_name                     varchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_user primary key (user_id)
+);
+
+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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_mny_a primary key (id)
+);
+
+create table mny_b (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  a_id                          bigint,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_mny_c primary key (id)
+);
+
+create table mny_topic (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  mp_user_id                    bigint not null,
+  code                          varchar(255),
+  organization_id               bigint,
+  constraint pk_mp_role primary key (id)
+);
+
+create table mp_user (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mp_user primary key (id)
+);
+
+create table ms_many_a (
+  aid                           bigint generated by default as identity 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                           bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  my_count                      integer not null,
+  my_lob                        clob,
+  constraint pk_my_lob_size primary key (id)
+);
+
+create table my_lob_size_join_many (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  other                         varchar(255),
+  parent_id                     integer,
+  constraint pk_my_lob_size_join_many primary key (id)
+);
+
+create table noidbean (
+  name                          varchar(255),
+  subject                       varchar(255),
+  when_created                  timestamp not null
+);
+
+create table o_bean_child (
+  id                            bigint generated by default as identity not null,
+  cached_bean_id                bigint,
+  constraint pk_o_bean_child primary key (id)
+);
+
+create table ocached_app (
+  id                            bigint generated by default as identity not null,
+  app_name                      varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_app_name unique (app_name),
+  constraint pk_ocached_app primary key (id)
+);
+
+create table ocached_app_detail (
+  id                            bigint generated by default as identity not null,
+  app_id                        bigint not null,
+  detail                        varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_detail_app_id_detail unique (app_id,detail),
+  constraint pk_ocached_app_detail primary key (id)
+);
+
+create table o_cached_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_o_cached_bean primary key (id)
+);
+
+create table o_cached_bean_country (
+  o_cached_bean_id              bigint not null,
+  o_country_code                varchar(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                            bigint generated by default as identity not null,
+  cached_bean_id                bigint,
+  constraint pk_o_cached_bean_child primary key (id)
+);
+
+create table o_cached_inherit (
+  dtype                         varchar(31) not null,
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity 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 ocached_nkey_uid (
+  id                            bigint generated by default as identity not null,
+  cid                           uuid,
+  other                         varchar(255),
+  version                       bigint not null,
+  constraint pk_ocached_nkey_uid primary key (id)
+);
+
+create table ocar (
+  id                            integer generated by default as identity not null,
+  vin                           varchar(255),
+  name                          varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_ocar primary key (id)
+);
+
+create table ocompany (
+  id                            integer generated by default as identity not null,
+  corp_id                       varchar(50),
+  cretime                       timestamp not null,
+  updtime                       timestamp 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                     uuid not null,
+  short_desc                    varchar(255),
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_oengine_car_id unique (car_id),
+  constraint pk_oengine primary key (engine_id)
+);
+
+create table ogear_box (
+  id                            uuid not null,
+  box_desc                      varchar(255),
+  box_size                      integer,
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_ogear_box_car_id unique (car_id),
+  constraint pk_ogear_box primary key (id)
+);
+
+create table omvertex (
+  id                            uuid not null,
+  constraint pk_omvertex primary key (id)
+);
+
+create table omvertex_other (
+  id                            uuid not null,
+  omvertex_id                   uuid not null,
+  name                          varchar(255),
+  constraint pk_omvertex_other primary key (id)
+);
+
+create table oroad_show_msg (
+  id                            integer generated by default as identity not null,
+  company_id                    integer not null,
+  cretime                       timestamp not null,
+  updtime                       timestamp 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_account_child_dbo (
+  id                            bigint generated by default as identity not null,
+  description                   varchar(255),
+  banana_rama_id                bigint,
+  constraint pk_om_account_child_dbo primary key (id)
+);
+
+create table om_account_dbo (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_om_account_dbo primary key (id)
+);
+
+create table om_basic_child (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_om_basic_child primary key (id)
+);
+
+create table om_basic_parent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_basic_parent primary key (id)
+);
+
+create table om_ordered_detail (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+
+create table oml_bar (
+  id                            bigint generated by default as identity not null,
+  constraint pk_oml_bar primary key (id)
+);
+
+create table oml_baz (
+  id                            bigint generated by default as identity not null,
+  foo_id                        bigint not null,
+  constraint pk_oml_baz primary key (id)
+);
+
+create table oml_foo (
+  id                            bigint generated by default as identity not null,
+  bar_id                        bigint not null,
+  constraint pk_oml_foo primary key (id)
+);
+
+create table only_id_entity (
+  id                            bigint generated by default as identity not null,
+  constraint pk_only_id_entity primary key (id)
+);
+
+create table o_order (
+  id                            integer generated by default as identity 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)),
+  constraint pk_o_order primary key (id)
+);
+
+create table o_order_detail (
+  id                            integer generated by default as identity 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,
+  constraint pk_o_order_detail primary key (id)
+);
+
+create table s_orders (
+  uuid                          varchar(40) not null,
+  constraint pk_s_orders primary key (uuid)
+);
+
+create table s_order_items (
+  uuid                          varchar(40) not null,
+  product_variant_uuid          varchar(255),
+  order_uuid                    varchar(40),
+  quantity                      integer not null,
+  amount                        decimal(16,3),
+  constraint pk_s_order_items primary key (uuid)
+);
+
+create table order_master (
+  id                            bigint generated by default as identity not null,
+  constraint pk_order_master primary key (id)
+);
+
+create table order_master_inheritance (
+  id                            integer generated by default as identity not null,
+  constraint pk_order_master_inheritance primary key (id)
+);
+
+create table order_referenced_parent (
+  type                          varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  child_name                    varchar(255),
+  master_id                     bigint,
+  sort_order                    integer,
+  constraint pk_order_referenced_parent primary key (id)
+);
+
+create table or_order_ship (
+  id                            integer generated by default as identity not null,
+  order_id                      integer,
+  ship_time                     timestamp,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_or_order_ship primary key (id)
+);
+
+create table order_toy (
+  id                            integer generated by default as identity not null,
+  title                         varchar(255),
+  child_id                      bigint,
+  sort_order                    integer,
+  constraint pk_order_toy primary key (id)
+);
+
+create table ordered_parent (
+  dtype                         varchar(31) not null,
+  id                            integer generated by default as identity not null,
+  order_master_inheritance_id   integer not null,
+  common_name                   varchar(255),
+  sort_order                    integer,
+  ordered_aname                 varchar(255),
+  ordered_bname                 varchar(255),
+  constraint pk_ordered_parent primary key (id)
+);
+
+create table organisation (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_organisation primary key (id)
+);
+
+create table organization_node (
+  kind                          varchar(31) not null,
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  child                         varchar(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+
+create table oto_bmaster (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_oto_bmaster primary key (id)
+);
+
+create table oto_child (
+  id                            integer generated by default as identity 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 table oto_cust (
+  cid                           bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_cust primary key (cid)
+);
+
+create table oto_cust_address (
+  aid                           bigint generated by default as identity 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_level_a (
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_oto_level_c primary key (id)
+);
+
+create table oto_master (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_oto_master primary key (id)
+);
+
+create table oto_prime (
+  pid                           bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime primary key (pid)
+);
+
+create table oto_prime_extra (
+  eid                           bigint generated by default as identity not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_sd_child (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_sd_master primary key (id)
+);
+
+create table oto_th_many (
+  id                            bigint generated by default as identity not null,
+  oto_th_top_id                 bigint not null,
+  many                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_oto_th_many primary key (id)
+);
+
+create table oto_th_one (
+  id                            bigint generated by default as identity not null,
+  one                           boolean default false not null,
+  many_id                       bigint,
+  version                       bigint 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 table oto_th_top (
+  id                            bigint generated by default as identity not null,
+  topp                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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 oto_user_model (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  user_optional_id              bigint,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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 generated by default as identity not null,
+  optional                      varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_oto_user_model_optional primary key (id)
+);
+
+create table pfile (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  file_content_id               integer,
+  file_content2_id              integer,
+  cretime                       timestamp not null,
+  updtime                       timestamp 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 table pfile_content (
+  id                            integer generated by default as identity not null,
+  content                       blob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_pfile_content primary key (id)
+);
+
+create table paggview (
+  pview_id                      uuid,
+  amount                        integer not null,
+  constraint uq_paggview_pview_id unique (pview_id)
+);
+
+create table pallet_location (
+  type                          varchar(31) not null,
+  id                            integer generated by default as identity not null,
+  zone_sid                      integer not null,
+  attribute                     varchar(255),
+  constraint pk_pallet_location primary key (id)
+);
+
+create table parcel (
+  parcelid                      bigint generated by default as identity not null,
+  description                   varchar(255),
+  constraint pk_parcel primary key (parcelid)
+);
+
+create table parcel_location (
+  parcellocid                   bigint generated by default as identity not null,
+  location                      varchar(255),
+  parcelid                      bigint,
+  constraint uq_parcel_location_parcelid unique (parcelid),
+  constraint pk_parcel_location primary key (parcellocid)
+);
+
+create table rawinherit_parent (
+  type                          varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  val                           integer,
+  more                          varchar(255),
+  constraint pk_rawinherit_parent primary key (id)
+);
+
+create table rawinherit_parent_rawinherit_data (
+  rawinherit_parent_id          bigint not null,
+  rawinherit_data_id            bigint not null,
+  constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
+);
+
+create table e_save_test_c (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_c primary key (id)
+);
+
+create table parent_person (
+  identifier                    integer generated by default as identity 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 generated by default as identity 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)),
+  constraint pk_c_participation primary key (id)
+);
+
+create table password_store_model (
+  id                            bigint generated by default as identity not null,
+  enc1                          varchar(30),
+  enc2                          varchar(40),
+  enc3                          clob,
+  enc4                          varbinary(30),
+  enc5                          varbinary(40),
+  enc6                          blob,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_password_store_model primary key (id)
+);
+
+create table pcf_calendar (
+  id                            bigint generated by default as identity not null,
+  pcf_person_id                 bigint not null,
+  version                       bigint not null,
+  constraint pk_pcf_calendar primary key (id)
+);
+
+create table pcf_city (
+  id                            bigint generated by default as identity not null,
+  pcf_country_id                bigint not null,
+  name                          varchar(255),
+  mayor_id                      bigint not null,
+  vice_mayor_id                 bigint not null,
+  version                       bigint not null,
+  constraint uq_pcf_city_mayor_id unique (mayor_id),
+  constraint uq_pcf_city_vice_mayor_id unique (vice_mayor_id),
+  constraint pk_pcf_city primary key (id)
+);
+
+create table pcf_country (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_pcf_country primary key (id)
+);
+
+create table pcf_event (
+  id                            bigint generated by default as identity not null,
+  pcf_calendar_id               bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_event primary key (id)
+);
+
+create table pcf_person (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_person primary key (id)
+);
+
+create table mt_permission (
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_mt_permission primary key (id)
+);
+
+create table persistent_file (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_persistent_file primary key (id)
+);
+
+create table persistent_file_content (
+  id                            integer generated by default as identity not null,
+  persistent_file_id            integer,
+  content                       blob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint uq_persistent_file_content_persistent_file_id unique (persistent_file_id),
+  constraint pk_persistent_file_content primary key (id)
+);
+
+create table person (
+  oid                           bigint generated by default as identity not null,
+  default_address_oid           bigint,
+  version                       integer not null,
+  constraint pk_person primary key (oid)
+);
+
+create table persons (
+  id                            bigint generated by default as identity (start with 1000 increment by 40) not null,
+  surname                       varchar(64) not null,
+  name                          varchar(64) not null,
+  constraint pk_persons primary key (id)
+);
+
+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 (
+  id                            bigint generated by default as identity 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 table e_position (
+  id                            bigint generated by default as identity 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,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_primary_revision primary key (id,revision)
+);
+
+create table o_product (
+  id                            integer generated by default as identity not null,
+  sku                           varchar(20),
+  name                          varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  constraint pk_o_product primary key (id)
+);
+
+create table pp (
+  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                         uuid not null,
+  ww_id                         uuid not null,
+  constraint pk_pp_to_ww primary key (pp_id,ww_id)
+);
+
+create table question (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  groupobjectid                 bigint,
+  sequence_number               integer not null,
+  constraint pk_question primary key (id)
+);
+
+create table rcustomer (
+  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(127) not null,
+  order_number                  integer not null,
+  customername                  varchar(127),
+  item                          varchar(255),
+  constraint pk_r_orders primary key (company,order_number)
+);
+
+create table referenced_defaults_model (
+  id                            integer generated by default as identity not null,
+  defaults_model_id             integer not null,
+  name                          varchar(255),
+  constraint pk_referenced_defaults_model primary key (id)
+);
+
+create table referenced_defaults_model_draft (
+  id                            integer generated by default as identity not null,
+  defaults_model_id             integer not null,
+  name                          varchar(255),
+  constraint pk_referenced_defaults_model_draft primary key (id)
+);
+
+create table referencing_bean (
+  id                            uuid not null,
+  constraint pk_referencing_bean primary key (id)
+);
+
+create table region (
+  customer                      integer not null,
+  type                          integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_region primary key (customer,type)
+);
+
+create table rel_detail (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_rel_detail primary key (id)
+);
+
+create table rel_master (
+  id                            bigint generated by default as identity 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),
+  name                          varchar(128) not null,
+  constraint pk_resourcefile 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 em_role (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
+create table root_bean (
+  dtype                         varchar(31) not null,
+  id                            uuid not null,
+  referencing_bean_id           uuid not null,
+  value                         varchar(255),
+  constraint pk_root_bean primary key (id)
+);
+
+create table f_second (
+  id                            bigint generated by default as identity 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 table section (
+  id                            integer generated by default as identity not null,
+  article_id                    integer,
+  type                          integer,
+  content                       clob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint ck_section_type check ( type in (0,1)),
+  constraint pk_section primary key (id)
+);
+
+create table self_parent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_self_parent primary key (id)
+);
+
+create table self_ref_customer (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  referred_by_id                bigint,
+  constraint pk_self_ref_customer primary key (id)
+);
+
+create table self_ref_example (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255) not null,
+  parent_id                     bigint,
+  constraint pk_self_ref_example primary key (id)
+);
+
+create table e_save_test_a (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_a primary key (id)
+);
+
+create table e_save_test_b (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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)
+);
+
+create table some_file_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       blob,
+  version                       bigint not null,
+  constraint pk_some_file_bean primary key (id)
+);
+
+create table some_new_types_bean (
+  id                            bigint generated by default as identity not null,
+  dow                           integer(1),
+  mth                           integer(1),
+  yr                            integer,
+  yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
+  sql_time                      time,
+  local_date                    date,
+  local_date_time               timestamp,
+  offset_date_time              timestamp,
+  zoned_date_time               timestamp,
+  local_time                    time,
+  instant                       timestamp,
+  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)
+);
+
+create table some_period_bean (
+  id                            bigint generated by default as identity not null,
+  anniversary                   date,
+  version                       bigint not null,
+  constraint pk_some_period_bean primary key (id)
+);
+
+create table source_base (
+  dtype                         varchar(31) not null,
+  id                            uuid not null,
+  name                          varchar(255),
+  pos                           integer not null,
+  target_id                     uuid,
+  constraint pk_source_base primary key (id)
+);
+
+create table stockforecast (
+  type                          varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  inner_report_id               bigint,
+  constraint pk_stockforecast primary key (id)
+);
+
+create table sub_section (
+  id                            integer generated by default as identity not null,
+  section_id                    integer,
+  title                         varchar(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_sub_section primary key (id)
+);
+
+create table sub_type (
+  sub_type_id                   integer generated by default as identity not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_sub_type primary key (sub_type_id)
+);
+
+create table survey (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_survey primary key (id)
+);
+
+create table tbytes_only (
+  id                            integer generated by default as identity not null,
+  content                       blob,
+  constraint pk_tbytes_only primary key (id)
+);
+
+create table tcar (
+  type                          varchar(31) not null,
+  plate_no                      varchar(32) not null,
+  deleted                       boolean default false not null,
+  truckload                     bigint,
+  constraint pk_tcar primary key (plate_no)
+);
+
+create table tevent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_tevent primary key (id)
+);
+
+create table tevent_many (
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  child_property                varchar(255),
+  constraint pk_tint_root primary key (id)
+);
+
+create table tjoda_entity (
+  id                            integer generated by default as identity not null,
+  local_time                    time,
+  constraint pk_tjoda_entity primary key (id)
+);
+
+create table t_mapsuper1 (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_t_mapsuper1 primary key (id)
+);
+
+create table t_oneb (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        boolean default false not null,
+  constraint pk_t_oneb primary key (id)
+);
+
+create table t_detail_with_other_namexxxyy (
+  id                            integer not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  some_unique_value             varchar(127),
+  active                        boolean default false 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)
+);
+create sequence t_atable_detail_seq increment by 1;
+
+create table t_atable_thatisrelatively (
+  id                            integer not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        boolean default false not null,
+  constraint pk_t_atable_thatisrelatively primary key (id)
+);
+create sequence t_atable_master_seq increment by 1;
+
+create table ttruck_holder (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  truck_plate_no                varchar(32) not null,
+  basic_id                      integer,
+  version                       bigint not null,
+  constraint pk_ttruck_holder primary key (id)
+);
+
+create table ttruck_holder_item (
+  id                            bigint generated by default as identity not null,
+  some_uid                      uuid,
+  foo                           varchar(255),
+  owner_id                      bigint not null,
+  constraint pk_ttruck_holder_item primary key (id)
+);
+
+create table tuuid_entity (
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_tuuid_entity primary key (id)
+);
+
+create table twheel (
+  id                            bigint generated by default as identity not null,
+  owner_plate_no                varchar(32) not null,
+  constraint pk_twheel primary key (id)
+);
+
+create table twith_pre_insert (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255) not null,
+  title                         varchar(255),
+  constraint pk_twith_pre_insert primary key (id)
+);
+
+create table target_base (
+  dtype                         varchar(31) not null,
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_target_base primary key (id)
+);
+
+create table mt_tenant (
+  id                            uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mt_tenant 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 (
+  id                            bigint not null,
+  wheel                         bigint,
+  version                       integer not null,
+  constraint uq_tire_wheel unique (wheel),
+  constraint pk_tire primary key (id)
+);
+create sequence tire_seq increment by 1;
+
+create table sa_tire (
+  id                            bigint not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
+create sequence sa_tire_seq increment by 1;
+
+create table tree_entity (
+  id                            integer generated by default as identity not null,
+  text                          varchar(255),
+  parent_id                     integer,
+  constraint pk_tree_entity primary key (id)
+);
+
+create table trip (
+  id                            integer generated by default as identity not null,
+  vehicle_driver_id             integer,
+  destination                   varchar(255),
+  address_id                    integer,
+  star_date                     timestamp,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_trip primary key (id)
+);
+
+create table truck_ref (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  constraint pk_truck_ref primary key (id)
+);
+
+create table tune (
+  id                            bigint generated by default as identity 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),
+  sub_type_id                   integer,
+  version                       bigint not null,
+  constraint pk_type primary key (customer,type)
+);
+
+create table tz_bean (
+  id                            bigint generated by default as identity not null,
+  moda                          varchar(255),
+  ts                            timestamp,
+  tstz                          timestamp,
+  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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  deleted                       boolean default false not null,
+  constraint pk_usib_parent primary key (id)
+);
+
+create table ut_detail (
+  id                            integer generated by default as identity not null,
+  utmaster_id                   integer not null,
+  name                          varchar(255),
+  qty                           integer,
+  amount                        double,
+  version                       integer not null,
+  constraint pk_ut_detail primary key (id)
+);
+
+create table ut_master (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  event_date                    date,
+  version                       integer not null,
+  constraint pk_ut_master primary key (id)
+);
+
+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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  account_id                    bigint not null,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint uq_oto_user_account_id unique (account_id),
+  constraint pk_oto_user primary key (id)
+);
+
+create table c_user (
+  id                            bigint generated by default as identity not null,
+  inactive                      boolean default false not null,
+  name                          varchar(255),
+  email                         varchar(255),
+  password_hash                 varchar(255),
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_c_user primary key (id)
+);
+
+create table tx_user (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_tx_user primary key (id)
+);
+
+create table g_user (
+  id                            bigint generated by default as identity not null,
+  username                      varchar(255),
+  version                       bigint not null,
+  constraint pk_g_user primary key (id)
+);
+
+create table em_user (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_em_user primary key (id)
+);
+
+create table user_interest_live (
+  user_id                       bigint not null,
+  live_id                       bigint not null,
+  created_at                    timestamp not null,
+  constraint pk_user_interest_live primary key (user_id,live_id)
+);
+
+create table em_user_role (
+  user_id                       bigint not null,
+  role_id                       bigint not null,
+  constraint pk_em_user_role primary key (user_id,role_id)
+);
+
+create table vehicle (
+  dtype                         varchar(3) not null,
+  id                            integer generated by default as identity not null,
+  license_number                varchar(255),
+  registration_date             timestamp,
+  lease_id                      bigint,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  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)
+);
+
+create table vehicle_driver (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  vehicle_id                    integer,
+  address_id                    integer,
+  license_issued_on             timestamp,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       bigint not null,
+  constraint pk_vehicle_driver primary key (id)
+);
+
+create table vehicle_lease (
+  dtype                         varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  active_start                  date,
+  active_end                    date,
+  version                       bigint not null,
+  bond                          decimal(16,3),
+  min_duration                  integer not null,
+  day_rate                      decimal(16,3),
+  max_days                      integer,
+  constraint pk_vehicle_lease primary key (id)
+);
+
+create table version_child (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_child primary key (id)
+);
+
+create table version_parent (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_version_parent primary key (id)
+);
+
+create table version_toy (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  child_id                      integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_toy primary key (id)
+);
+
+create table warehouses (
+  id                            integer generated by default as identity not null,
+  officezoneid                  integer,
+  constraint pk_warehouses primary key (id)
+);
+
+create table warehousesshippingzones (
+  warehouseid                   integer not null,
+  shippingzoneid                integer not null,
+  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 increment by 1;
+
+create table sa_wheel (
+  id                            bigint not null,
+  tire                          bigint,
+  car                           bigint,
+  version                       integer not null,
+  constraint pk_sa_wheel primary key (id)
+);
+create sequence sa_wheel_seq increment by 1;
+
+create table sp_car_wheel (
+  id                            bigint not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+create sequence sp_car_wheel_seq increment by 1;
+
+create table g_who_props_otm (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp 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 generated by default as identity 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 table parent (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_parent primary key (id)
+);
+
+create table wview (
+  id                            uuid 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 generated by default as identity not null,
+  attribute                     varchar(255),
+  constraint pk_zones primary key (id)
+);
+
+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_ecsm_values_host_id on ecsm_values (host_id);
+create index ix_order_referenced_parent_type on order_referenced_parent (type);
+create index ix_organization_node_kind on organization_node (kind);
+create index ano_3 on test_annotation_base_entity (direct);
+create index ano_1 on test_annotation_base_entity (direct);
+create index ano_2 on test_annotation_base_entity (direct);
+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;
+
+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 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;
+
+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;
+
+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_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_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;
+
+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;
+
+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_ciaddress_street_id on ciaddress (street_id);
+alter table ciaddress add constraint fk_ciaddress_street_id foreign key (street_id) references cistreet_parent (id) on delete restrict on update restrict;
+
+create index ix_cicustomer_parent_address_id on cicustomer_parent (address_id);
+alter table cicustomer_parent add constraint fk_cicustomer_parent_address_id foreign key (address_id) references ciaddress (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;
+
+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;
+
+create index ix_coone_many_coone_id on coone_many (coone_id);
+alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_id) references coone (id) on delete restrict on update restrict;
+
+alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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;
+
+alter table defaults_model add constraint fk_defaults_model_id foreign key (id) references defaults_model_draft (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_e_basicenc_relate_other_id on e_basicenc_relate (other_id);
+alter table e_basicenc_relate add constraint fk_e_basicenc_relate_other_id foreign key (other_id) references e_basicenc (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_ec_top_person_id on ec_top (person_id);
+alter table ec_top add constraint fk_ec_top_person_id foreign key (person_id) references ecs_person (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person (ec_top_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ec_top foreign key (ec_top_id) references ec_top (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ecs_person on ec_top_ecs_person (ecs_person_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ecs_person foreign key (ecs_person_id) references ecs_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_ecsm_child_ecsm_parent_id on ecsm_child (ecsm_parent_id);
+alter table ecsm_child add constraint fk_ecsm_child_ecsm_parent_id foreign key (ecsm_parent_id) references ecsm_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_element_bean_complex_bean_id on element_bean (complex_bean_id);
+alter table element_bean add constraint fk_element_bean_complex_bean_id foreign key (complex_bean_id) references root_bean (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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_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_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_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_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;
+
+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_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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_bean_child_cached_bean_id on o_bean_child (cached_bean_id);
+alter table o_bean_child add constraint fk_o_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
+
+create index ix_ocached_app_detail_app_id on ocached_app_detail (app_id);
+alter table ocached_app_detail add constraint fk_ocached_app_detail_app_id foreign key (app_id) references ocached_app (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;
+
+create index ix_omvertex_other_omvertex_id on omvertex_other (omvertex_id);
+alter table omvertex_other add constraint fk_omvertex_other_omvertex_id foreign key (omvertex_id) references omvertex (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_account_child_dbo_banana_rama_id on om_account_child_dbo (banana_rama_id);
+alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_rama_id foreign key (banana_rama_id) references om_account_dbo (id) on delete restrict on update restrict;
+
+create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
+alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (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_oml_baz_foo_id on oml_baz (foo_id);
+alter table oml_baz add constraint fk_oml_baz_foo_id foreign key (foo_id) references oml_foo (id) on delete restrict on update restrict;
+
+create index ix_oml_foo_bar_id on oml_foo (bar_id);
+alter table oml_foo add constraint fk_oml_foo_bar_id foreign key (bar_id) references oml_bar (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;
+
+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;
+
+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;
+
+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;
+
+create index ix_order_referenced_parent_master_id on order_referenced_parent (master_id);
+alter table order_referenced_parent add constraint fk_order_referenced_parent_master_id foreign key (master_id) references order_master (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;
+
+create index ix_order_toy_child_id on order_toy (child_id);
+alter table order_toy add constraint fk_order_toy_child_id foreign key (child_id) references order_referenced_parent (id) on delete restrict on update restrict;
+
+create index ix_ordered_parent_order_master_inheritance_id on ordered_parent (order_master_inheritance_id);
+alter table ordered_parent add constraint fk_ordered_parent_order_master_inheritance_id foreign key (order_master_inheritance_id) references order_master_inheritance (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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+create index ix_pcf_calendar_pcf_person_id on pcf_calendar (pcf_person_id);
+alter table pcf_calendar add constraint fk_pcf_calendar_pcf_person_id foreign key (pcf_person_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_city_pcf_country_id on pcf_city (pcf_country_id);
+alter table pcf_city add constraint fk_pcf_city_pcf_country_id foreign key (pcf_country_id) references pcf_country (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_mayor_id foreign key (mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_vice_mayor_id foreign key (vice_mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_event_pcf_calendar_id on pcf_event (pcf_calendar_id);
+alter table pcf_event add constraint fk_pcf_event_pcf_calendar_id foreign key (pcf_calendar_id) references pcf_calendar (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;
+
+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;
+
+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_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 referenced_defaults_model add constraint fk_referenced_defaults_model_id foreign key (id) references referenced_defaults_model_draft (id) on delete restrict on update restrict;
+
+create index ix_referenced_defaults_model_defaults_model_id on referenced_defaults_model (defaults_model_id);
+alter table referenced_defaults_model add constraint fk_referenced_defaults_model_defaults_model_id foreign key (defaults_model_id) references defaults_model (id) on delete restrict on update restrict;
+
+create index ix_referenced_defaults_model_draft_defaults_model_id on referenced_defaults_model_draft (defaults_model_id);
+alter table referenced_defaults_model_draft add constraint fk_referenced_defaults_model_draft_defaults_model_id foreign key (defaults_model_id) references defaults_model_draft (id) 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;
+
+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_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_root_bean_referencing_bean_id on root_bean (referencing_bean_id);
+alter table root_bean add constraint fk_root_bean_referencing_bean_id foreign key (referencing_bean_id) references referencing_bean (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;
+
+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;
+
+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;
+
+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;
+
+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_source_base_target_id on source_base (target_id);
+alter table source_base add constraint fk_source_base_target_id foreign key (target_id) references target_base (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;
+
+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;
+
+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;
+
+create index ix_ttruck_holder_truck_plate_no on ttruck_holder (truck_plate_no);
+alter table ttruck_holder add constraint fk_ttruck_holder_truck_plate_no foreign key (truck_plate_no) references tcar (plate_no) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_basic_id on ttruck_holder (basic_id);
+alter table ttruck_holder add constraint fk_ttruck_holder_basic_id foreign key (basic_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_item_owner_id on ttruck_holder_item (owner_id);
+alter table ttruck_holder_item add constraint fk_ttruck_holder_item_owner_id foreign key (owner_id) references ttruck_holder (id) 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;
+
+create index ix_tree_entity_parent_id on tree_entity (parent_id);
+alter table tree_entity add constraint fk_tree_entity_parent_id foreign key (parent_id) references tree_entity (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+create index ix_version_child_parent_id on version_child (parent_id);
+alter table version_child add constraint fk_version_child_parent_id foreign key (parent_id) references version_parent (id) on delete restrict on update restrict;
+
+create index ix_version_toy_child_id on version_toy (child_id);
+alter table version_toy add constraint fk_version_toy_child_id foreign key (child_id) references version_child (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_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_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;
+
+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;
+
+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 hembi_bean add column sys_period_start timestamp default now();
+alter table hembi_bean add column sys_period_end timestamp;
+create table hembi_bean_history(
+  part                          bigint,
+  brand                         varchar(20),
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+create view hembi_bean_with_history as select * from hembi_bean union all select * from hembi_bean_history;
+
+alter table hx_link add column sys_period_start timestamp default now();
+alter table hx_link add column sys_period_end timestamp;
+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                  timestamp,
+  when_modified                 timestamp,
+  deleted                       boolean,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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_start timestamp default now();
+alter table hi_link add column sys_period_end timestamp;
+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                  timestamp,
+  when_modified                 timestamp,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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_start timestamp default now();
+alter table hi_link_doc add column sys_period_end timestamp;
+create table hi_link_doc_history(
+  hi_link_id                    bigint,
+  hi_doc_id                     bigint,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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_start timestamp default now();
+alter table hi_tone add column sys_period_end timestamp;
+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                  timestamp,
+  when_modified                 timestamp,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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 timestamp default now();
+alter table hi_tthree add column sys_period_end timestamp;
+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                  timestamp,
+  when_modified                 timestamp,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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 timestamp default now();
+alter table hi_ttwo add column sys_period_end timestamp;
+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                  timestamp,
+  when_modified                 timestamp,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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 timestamp default now();
+alter table hsd_setting add column sys_period_end timestamp;
+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                  timestamp,
+  when_modified                 timestamp,
+  deleted                       boolean,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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 timestamp default now();
+alter table hsd_user add column sys_period_end timestamp;
+update hsd_user set sys_period_start = when_created;
+create table hsd_user_history(
+  id                            bigint,
+  name                          varchar(255),
+  version                       bigint,
+  when_created                  timestamp,
+  when_modified                 timestamp,
+  deleted                       boolean,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+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 timestamp default now();
+alter table link add column sys_period_end timestamp;
+update link set sys_period_start = when_created;
+create table link_history(
+  id                            bigint,
+  name                          varchar(255),
+  location                      varchar(255),
+  when_publish                  timestamp,
+  link_comment                  varchar(255),
+  version                       bigint,
+  when_created                  timestamp,
+  when_modified                 timestamp,
+  deleted                       boolean,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+create view link_with_history as select * from link union all select * from link_history;
+
+alter table c_user add column sys_period_start timestamp default now();
+alter table c_user add column sys_period_end timestamp;
+update c_user set sys_period_start = when_created;
+create table c_user_history(
+  id                            bigint,
+  inactive                      boolean,
+  name                          varchar(255),
+  email                         varchar(255),
+  password_hash                 varchar(255),
+  group_id                      bigint,
+  version                       bigint,
+  when_created                  timestamp,
+  when_modified                 timestamp,
+  sys_period_start              timestamp,
+  sys_period_end                timestamp
+);
+create view c_user_with_history as select * from c_user union all select * from c_user_history;
+
+create trigger hembi_bean_history_upd before update,delete on hembi_bean for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hx_link_history_upd before update,delete on hx_link for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hi_link_history_upd before update,delete on hi_link for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hi_link_doc_history_upd before update,delete on hi_link_doc for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hi_tone_history_upd before update,delete on hi_tone for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hi_tthree_history_upd before update,delete on hi_tthree for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hi_ttwo_history_upd before update,delete on hi_ttwo for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hsd_setting_history_upd before update,delete on hsd_setting for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger hsd_user_history_upd before update,delete on hsd_user for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger link_history_upd before update,delete on link for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
+create trigger c_user_history_upd before update,delete on c_user for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
diff --git a/ebean-core/src/test/ddl-review/h2-drop-all.sql b/ebean-core/src/test/ddl-review/h2-drop-all.sql
new file mode 100644
index 000000000..16a4f3c7a
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/h2-drop-all.sql
@@ -0,0 +1,1959 @@
+-- Generated by ebean unknown at 2020-12-07T09:40:50.461215Z
+alter table bar drop constraint if exists fk_bar_foo_id;
+drop index if exists ix_bar_foo_id;
+
+alter table 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 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 addr drop constraint if exists fk_addr_employee_id;
+drop index if exists ix_addr_employee_id;
+
+alter table o_address drop constraint if exists fk_o_address_country_code;
+drop index if exists ix_o_address_country_code;
+
+alter table album drop constraint if exists fk_album_cover_id;
+
+alter table animal drop constraint if exists fk_animal_shelter_id;
+drop index if exists ix_animal_shelter_id;
+
+alter table attribute drop constraint if exists fk_attribute_attribute_holder_id;
+drop index if exists ix_attribute_attribute_holder_id;
+
+alter table bbookmark drop constraint if exists fk_bbookmark_user_id;
+drop index if exists ix_bbookmark_user_id;
+
+alter table bbookmark_user drop constraint if exists fk_bbookmark_user_org_id;
+drop index if exists ix_bbookmark_user_org_id;
+
+alter table 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 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 bsite_user_b drop constraint if exists fk_bsite_user_b_site;
+drop index if exists ix_bsite_user_b_site;
+
+alter table bsite_user_b drop constraint if exists fk_bsite_user_b_usr;
+drop index if exists ix_bsite_user_b_usr;
+
+alter table 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 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 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 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 basic_draftable_bean drop constraint if exists fk_basic_draftable_bean_id;
+
+alter table drel_booking drop constraint if exists fk_drel_booking_agent_invoice;
+
+alter table drel_booking drop constraint if exists fk_drel_booking_client_invoice;
+
+alter table cepproduct_category drop constraint if exists fk_cepproduct_category_category_id;
+drop index if exists ix_cepproduct_category_category_id;
+
+alter table cepproduct_category drop constraint if exists fk_cepproduct_category_product_id;
+drop index if exists ix_cepproduct_category_product_id;
+
+alter table ciaddress drop constraint if exists fk_ciaddress_street_id;
+drop index if exists ix_ciaddress_street_id;
+
+alter table cicustomer_parent drop constraint if exists fk_cicustomer_parent_address_id;
+drop index if exists ix_cicustomer_parent_address_id;
+
+alter table cinh_ref drop constraint if exists fk_cinh_ref_ref_id;
+drop index if exists ix_cinh_ref_ref_id;
+
+alter table ckey_detail drop constraint if exists fk_ckey_detail_parent;
+drop index if exists ix_ckey_detail_parent;
+
+alter table ckey_parent drop constraint if exists fk_ckey_parent_assoc_id;
+drop index if exists ix_ckey_parent_assoc_id;
+
+alter table coone_many drop constraint if exists fk_coone_many_coone_id;
+drop index if exists ix_coone_many_coone_id;
+
+alter table coroot drop constraint if exists fk_coroot_one_id;
+
+alter table calculation_result drop constraint if exists fk_calculation_result_product_configuration_id;
+drop index if exists ix_calculation_result_product_configuration_id;
+
+alter table calculation_result drop constraint if exists fk_calculation_result_group_configuration_id;
+drop index if exists ix_calculation_result_group_configuration_id;
+
+alter table 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 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 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 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 car_accessory drop constraint if exists fk_car_accessory_fuse_id;
+drop index if exists ix_car_accessory_fuse_id;
+
+alter table car_accessory drop constraint if exists fk_car_accessory_car_id;
+drop index if exists ix_car_accessory_car_id;
+
+alter table category drop constraint if exists fk_category_surveyobjectid;
+drop index if exists ix_category_surveyobjectid;
+
+alter table e_save_test_d drop constraint if exists fk_e_save_test_d_parent_id;
+
+alter table child_person drop constraint if exists fk_child_person_some_bean_id;
+drop index if exists ix_child_person_some_bean_id;
+
+alter table child_person drop constraint if exists fk_child_person_parent_identifier;
+drop index if exists ix_child_person_parent_identifier;
+
+alter table cke_client drop constraint if exists fk_cke_client_user;
+drop index if exists ix_cke_client_user;
+
+alter table class_super_monkey drop constraint if exists fk_class_super_monkey_class_super;
+
+alter table class_super_monkey drop constraint if exists fk_class_super_monkey_monkey;
+
+alter table configuration drop constraint if exists fk_configuration_configurations_id;
+drop index if exists ix_configuration_configurations_id;
+
+alter table contact drop constraint if exists fk_contact_customer_id;
+drop index if exists ix_contact_customer_id;
+
+alter table contact drop constraint if exists fk_contact_group_id;
+drop index if exists ix_contact_group_id;
+
+alter table contact_note drop constraint if exists fk_contact_note_contact_id;
+drop index if exists ix_contact_note_contact_id;
+
+alter table contract_costs drop constraint if exists fk_contract_costs_position_id;
+drop index if exists ix_contract_costs_position_id;
+
+alter table c_conversation drop constraint if exists fk_c_conversation_group_id;
+drop index if exists ix_c_conversation_group_id;
+
+alter table o_customer drop constraint if exists fk_o_customer_billing_address_id;
+drop index if exists ix_o_customer_billing_address_id;
+
+alter table o_customer drop constraint if exists fk_o_customer_shipping_address_id;
+drop index if exists ix_o_customer_shipping_address_id;
+
+alter table dcredit_drol drop constraint if exists fk_dcredit_drol_dcredit;
+drop index if exists ix_dcredit_drol_dcredit;
+
+alter table dcredit_drol drop constraint if exists fk_dcredit_drol_drol;
+drop index if exists ix_dcredit_drol_drol;
+
+alter table dmachine drop constraint if exists fk_dmachine_organisation_id;
+drop index if exists ix_dmachine_organisation_id;
+
+alter table 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 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 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 drot_drol drop constraint if exists fk_drot_drol_drot;
+drop index if exists ix_drot_drol_drot;
+
+alter table drot_drol drop constraint if exists fk_drot_drol_drol;
+drop index if exists ix_drot_drol_drol;
+
+alter table dc_detail drop constraint if exists fk_dc_detail_master_id;
+drop index if exists ix_dc_detail_master_id;
+
+alter table defaults_model drop constraint if exists fk_defaults_model_id;
+
+alter table dfk_cascade drop constraint if exists fk_dfk_cascade_one_id;
+drop index if exists ix_dfk_cascade_one_id;
+
+alter table 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 doc drop constraint if exists fk_doc_id;
+
+alter table doc_link drop constraint if exists fk_doc_link_doc;
+drop index if exists ix_doc_link_doc;
+
+alter table doc_link drop constraint if exists fk_doc_link_link;
+drop index if exists ix_doc_link_link;
+
+alter table document drop constraint if exists fk_document_id;
+
+alter table document drop constraint if exists fk_document_organisation_id;
+drop index if exists ix_document_organisation_id;
+
+alter table document_draft drop constraint if exists fk_document_draft_organisation_id;
+drop index if exists ix_document_draft_organisation_id;
+
+alter table document_media drop constraint if exists fk_document_media_document_id;
+drop index if exists ix_document_media_document_id;
+
+alter table 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 e_basicenc_relate drop constraint if exists fk_e_basicenc_relate_other_id;
+drop index if exists ix_e_basicenc_relate_other_id;
+
+alter table 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 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 ebasic_sdchild drop constraint if exists fk_ebasic_sdchild_owner_id;
+drop index if exists ix_ebasic_sdchild_owner_id;
+
+alter table ecache_child drop constraint if exists fk_ecache_child_root_id;
+drop index if exists ix_ecache_child_root_id;
+
+alter table edefault_prop drop constraint if exists fk_edefault_prop_e_simple_usertypeid;
+
+alter table eemb_inner drop constraint if exists fk_eemb_inner_outer_id;
+drop index if exists ix_eemb_inner_outer_id;
+
+alter table einvoice drop constraint if exists fk_einvoice_person_id;
+drop index if exists ix_einvoice_person_id;
+
+alter table 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 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 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 eper_addr drop constraint if exists fk_eper_addr_ma_country_code;
+drop index if exists ix_eper_addr_ma_country_code;
+
+alter table 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 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 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 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 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 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 esoft_del_one_a drop constraint if exists fk_esoft_del_one_a_oneb_id;
+
+alter table 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 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 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 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 rawinherit_uncle drop constraint if exists fk_rawinherit_uncle_parent_id;
+drop index if exists ix_rawinherit_uncle_parent_id;
+
+alter table 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 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 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 ec_top drop constraint if exists fk_ec_top_person_id;
+drop index if exists ix_ec_top_person_id;
+
+alter table ec_top_ecs_person drop constraint if exists fk_ec_top_ecs_person_ec_top;
+drop index if exists ix_ec_top_ecs_person_ec_top;
+
+alter table ec_top_ecs_person drop constraint if exists fk_ec_top_ecs_person_ecs_person;
+drop index if exists ix_ec_top_ecs_person_ecs_person;
+
+alter table 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 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 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 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 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 ecsm_child drop constraint if exists fk_ecsm_child_ecsm_parent_id;
+drop index if exists ix_ecsm_child_ecsm_parent_id;
+
+alter table td_child drop constraint if exists fk_td_child_parent_id;
+drop index if exists ix_td_child_parent_id;
+
+alter table element_bean drop constraint if exists fk_element_bean_complex_bean_id;
+drop index if exists ix_element_bean_complex_bean_id;
+
+alter table empl drop constraint if exists fk_empl_default_address_id;
+drop index if exists ix_empl_default_address_id;
+
+alter table esd_detail drop constraint if exists fk_esd_detail_master_id;
+drop index if exists ix_esd_detail_master_id;
+
+alter table 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 survey_group drop constraint if exists fk_survey_group_categoryobjectid;
+drop index if exists ix_survey_group_categoryobjectid;
+
+alter table 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 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 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 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 hi_tthree drop constraint if exists fk_hi_tthree_hi_ttwo_id;
+drop index if exists ix_hi_tthree_hi_ttwo_id;
+
+alter table hi_ttwo drop constraint if exists fk_hi_ttwo_hi_tone_id;
+drop index if exists ix_hi_ttwo_hi_tone_id;
+
+alter table hsd_setting drop constraint if exists fk_hsd_setting_user_id;
+
+alter table iaf_segment drop constraint if exists fk_iaf_segment_status_id;
+drop index if exists ix_iaf_segment_status_id;
+
+alter table imrelated drop constraint if exists fk_imrelated_owner_id;
+drop index if exists ix_imrelated_owner_id;
+
+alter table info_contact drop constraint if exists fk_info_contact_company_id;
+drop index if exists ix_info_contact_company_id;
+
+alter table info_customer drop constraint if exists fk_info_customer_company_id;
+
+alter table inner_report drop constraint if exists fk_inner_report_forecast_id;
+
+alter table drel_invoice drop constraint if exists fk_drel_invoice_booking;
+drop index if exists ix_drel_invoice_booking;
+
+alter table item drop constraint if exists fk_item_etype;
+drop index if exists ix_item_etype;
+
+alter table item drop constraint if exists fk_item_eregion;
+drop index if exists ix_item_eregion;
+
+alter table mkeygroup_monkey drop constraint if exists fk_mkeygroup_monkey_mkeygroup;
+
+alter table mkeygroup_monkey drop constraint if exists fk_mkeygroup_monkey_monkey;
+
+alter table trainer_monkey drop constraint if exists fk_trainer_monkey_trainer;
+
+alter table trainer_monkey drop constraint if exists fk_trainer_monkey_monkey;
+
+alter table troop_monkey drop constraint if exists fk_troop_monkey_troop;
+
+alter table troop_monkey drop constraint if exists fk_troop_monkey_monkey;
+
+alter table 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 level1_level4 drop constraint if exists fk_level1_level4_level1;
+drop index if exists ix_level1_level4_level1;
+
+alter table level1_level4 drop constraint if exists fk_level1_level4_level4;
+drop index if exists ix_level1_level4_level4;
+
+alter table level1_level2 drop constraint if exists fk_level1_level2_level1;
+drop index if exists ix_level1_level2_level1;
+
+alter table level1_level2 drop constraint if exists fk_level1_level2_level2;
+drop index if exists ix_level1_level2_level2;
+
+alter table level2_level3 drop constraint if exists fk_level2_level3_level2;
+drop index if exists ix_level2_level3_level2;
+
+alter table level2_level3 drop constraint if exists fk_level2_level3_level3;
+drop index if exists ix_level2_level3_level3;
+
+alter table link drop constraint if exists fk_link_id;
+
+alter table 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 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 looney drop constraint if exists fk_looney_tune_id;
+drop index if exists ix_looney_tune_id;
+
+alter table mcontact drop constraint if exists fk_mcontact_customer_id;
+drop index if exists ix_mcontact_customer_id;
+
+alter table mcontact_message drop constraint if exists fk_mcontact_message_contact_id;
+drop index if exists ix_mcontact_message_contact_id;
+
+alter table mcustomer drop constraint if exists fk_mcustomer_shipping_address_id;
+drop index if exists ix_mcustomer_shipping_address_id;
+
+alter table mcustomer drop constraint if exists fk_mcustomer_billing_address_id;
+drop index if exists ix_mcustomer_billing_address_id;
+
+alter table mmachine_mgroup drop constraint if exists fk_mmachine_mgroup_mmachine;
+drop index if exists ix_mmachine_mgroup_mmachine;
+
+alter table mmachine_mgroup drop constraint if exists fk_mmachine_mgroup_mgroup;
+drop index if exists ix_mmachine_mgroup_mgroup;
+
+alter table mprinter drop constraint if exists fk_mprinter_current_state_id;
+drop index if exists ix_mprinter_current_state_id;
+
+alter table mprinter drop constraint if exists fk_mprinter_last_swap_cyan_id;
+
+alter table mprinter drop constraint if exists fk_mprinter_last_swap_magenta_id;
+
+alter table mprinter drop constraint if exists fk_mprinter_last_swap_yellow_id;
+
+alter table mprinter drop constraint if exists fk_mprinter_last_swap_black_id;
+
+alter table mprinter_state drop constraint if exists fk_mprinter_state_printer_id;
+drop index if exists ix_mprinter_state_printer_id;
+
+alter table mprofile drop constraint if exists fk_mprofile_picture_id;
+drop index if exists ix_mprofile_picture_id;
+
+alter table mrole_muser drop constraint if exists fk_mrole_muser_mrole;
+drop index if exists ix_mrole_muser_mrole;
+
+alter table mrole_muser drop constraint if exists fk_mrole_muser_muser;
+drop index if exists ix_mrole_muser_muser;
+
+alter table muser drop constraint if exists fk_muser_user_type_id;
+drop index if exists ix_muser_user_type_id;
+
+alter table 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 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 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 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 c_message drop constraint if exists fk_c_message_conversation_id;
+drop index if exists ix_c_message_conversation_id;
+
+alter table c_message drop constraint if exists fk_c_message_user_id;
+drop index if exists ix_c_message_user_id;
+
+alter table meter_contract_data drop constraint if exists fk_meter_contract_data_special_needs_client_id;
+
+alter table meter_special_needs_client drop constraint if exists fk_meter_special_needs_client_primary_id;
+
+alter table meter_version drop constraint if exists fk_meter_version_address_data_id;
+
+alter table meter_version drop constraint if exists fk_meter_version_contract_data_id;
+
+alter table 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 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 mny_b drop constraint if exists fk_mny_b_a_id;
+drop index if exists ix_mny_b_a_id;
+
+alter table 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 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 subtopics drop constraint if exists fk_subtopics_mny_topic_1;
+drop index if exists ix_subtopics_mny_topic_1;
+
+alter table subtopics drop constraint if exists fk_subtopics_mny_topic_2;
+drop index if exists ix_subtopics_mny_topic_2;
+
+alter table mp_role drop constraint if exists fk_mp_role_mp_user_id;
+drop index if exists ix_mp_role_mp_user_id;
+
+alter table 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 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 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 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 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 o_bean_child drop constraint if exists fk_o_bean_child_cached_bean_id;
+drop index if exists ix_o_bean_child_cached_bean_id;
+
+alter table ocached_app_detail drop constraint if exists fk_ocached_app_detail_app_id;
+drop index if exists ix_ocached_app_detail_app_id;
+
+alter table 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 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 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 oengine drop constraint if exists fk_oengine_car_id;
+
+alter table ogear_box drop constraint if exists fk_ogear_box_car_id;
+
+alter table omvertex_other drop constraint if exists fk_omvertex_other_omvertex_id;
+drop index if exists ix_omvertex_other_omvertex_id;
+
+alter table oroad_show_msg drop constraint if exists fk_oroad_show_msg_company_id;
+
+alter table om_account_child_dbo drop constraint if exists fk_om_account_child_dbo_banana_rama_id;
+drop index if exists ix_om_account_child_dbo_banana_rama_id;
+
+alter table om_basic_child drop constraint if exists fk_om_basic_child_parent_id;
+drop index if exists ix_om_basic_child_parent_id;
+
+alter table 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 oml_baz drop constraint if exists fk_oml_baz_foo_id;
+drop index if exists ix_oml_baz_foo_id;
+
+alter table oml_foo drop constraint if exists fk_oml_foo_bar_id;
+drop index if exists ix_oml_foo_bar_id;
+
+alter table o_order drop constraint if exists fk_o_order_kcustomer_id;
+drop index if exists ix_o_order_kcustomer_id;
+
+alter table 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 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 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 order_referenced_parent drop constraint if exists fk_order_referenced_parent_master_id;
+drop index if exists ix_order_referenced_parent_master_id;
+
+alter table 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 order_toy drop constraint if exists fk_order_toy_child_id;
+drop index if exists ix_order_toy_child_id;
+
+alter table ordered_parent drop constraint if exists fk_ordered_parent_order_master_inheritance_id;
+drop index if exists ix_ordered_parent_order_master_inheritance_id;
+
+alter table organization_node drop constraint if exists fk_organization_node_parent_tree_node_id;
+
+alter table orp_detail drop constraint if exists fk_orp_detail_master_id;
+drop index if exists ix_orp_detail_master_id;
+
+alter table orp_detail2 drop constraint if exists fk_orp_detail2_orp_master2_id;
+drop index if exists ix_orp_detail2_orp_master2_id;
+
+alter table oto_atwo drop constraint if exists fk_oto_atwo_aone_id;
+
+alter table oto_bchild drop constraint if exists fk_oto_bchild_master_id;
+
+alter table oto_child drop constraint if exists fk_oto_child_master_id;
+
+alter table oto_cust_address drop constraint if exists fk_oto_cust_address_customer_cid;
+
+alter table oto_level_a drop constraint if exists fk_oto_level_a_b_id;
+
+alter table oto_level_b drop constraint if exists fk_oto_level_b_c_id;
+
+alter table oto_prime_extra drop constraint if exists fk_oto_prime_extra_eid;
+
+alter table oto_sd_child drop constraint if exists fk_oto_sd_child_master_id;
+
+alter table 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 oto_th_one drop constraint if exists fk_oto_th_one_many_id;
+
+alter table oto_ubprime_extra drop constraint if exists fk_oto_ubprime_extra_eid;
+
+alter table oto_user_model drop constraint if exists fk_oto_user_model_user_optional_id;
+
+alter table pfile drop constraint if exists fk_pfile_file_content_id;
+
+alter table pfile drop constraint if exists fk_pfile_file_content2_id;
+
+alter table paggview drop constraint if exists fk_paggview_pview_id;
+
+alter table pallet_location drop constraint if exists fk_pallet_location_zone_sid;
+drop index if exists ix_pallet_location_zone_sid;
+
+alter table parcel_location drop constraint if exists fk_parcel_location_parcelid;
+
+alter table 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 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 parent_person drop constraint if exists fk_parent_person_some_bean_id;
+drop index if exists ix_parent_person_some_bean_id;
+
+alter table parent_person drop constraint if exists fk_parent_person_parent_identifier;
+drop index if exists ix_parent_person_parent_identifier;
+
+alter table c_participation drop constraint if exists fk_c_participation_conversation_id;
+drop index if exists ix_c_participation_conversation_id;
+
+alter table c_participation drop constraint if exists fk_c_participation_user_id;
+drop index if exists ix_c_participation_user_id;
+
+alter table pcf_calendar drop constraint if exists fk_pcf_calendar_pcf_person_id;
+drop index if exists ix_pcf_calendar_pcf_person_id;
+
+alter table pcf_city drop constraint if exists fk_pcf_city_pcf_country_id;
+drop index if exists ix_pcf_city_pcf_country_id;
+
+alter table pcf_city drop constraint if exists fk_pcf_city_mayor_id;
+
+alter table pcf_city drop constraint if exists fk_pcf_city_vice_mayor_id;
+
+alter table pcf_event drop constraint if exists fk_pcf_event_pcf_calendar_id;
+drop index if exists ix_pcf_event_pcf_calendar_id;
+
+alter table persistent_file_content drop constraint if exists fk_persistent_file_content_persistent_file_id;
+
+alter table person drop constraint if exists fk_person_default_address_oid;
+drop index if exists ix_person_default_address_oid;
+
+alter table 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 phones drop constraint if exists fk_phones_person_id;
+drop index if exists ix_phones_person_id;
+
+alter table e_position drop constraint if exists fk_e_position_contract_id;
+drop index if exists ix_e_position_contract_id;
+
+alter table pp_to_ww drop constraint if exists fk_pp_to_ww_pp;
+drop index if exists ix_pp_to_ww_pp;
+
+alter table pp_to_ww drop constraint if exists fk_pp_to_ww_wview;
+drop index if exists ix_pp_to_ww_wview;
+
+alter table question drop constraint if exists fk_question_groupobjectid;
+drop index if exists ix_question_groupobjectid;
+
+alter table r_orders drop constraint if exists fk_r_orders_customer;
+drop index if exists ix_r_orders_customer;
+
+alter table referenced_defaults_model drop constraint if exists fk_referenced_defaults_model_id;
+
+alter table referenced_defaults_model drop constraint if exists fk_referenced_defaults_model_defaults_model_id;
+drop index if exists ix_referenced_defaults_model_defaults_model_id;
+
+alter table referenced_defaults_model_draft drop constraint if exists fk_referenced_defaults_model_draft_defaults_model_id;
+drop index if exists ix_referenced_defaults_model_draft_defaults_model_id;
+
+alter table rel_master drop constraint if exists fk_rel_master_detail_id;
+drop index if exists ix_rel_master_detail_id;
+
+alter table resourcefile drop constraint if exists fk_resourcefile_parentresourcefileid;
+drop index if exists ix_resourcefile_parentresourcefileid;
+
+alter table mt_role drop constraint if exists fk_mt_role_tenant_id;
+drop index if exists ix_mt_role_tenant_id;
+
+alter table 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 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 root_bean drop constraint if exists fk_root_bean_referencing_bean_id;
+drop index if exists ix_root_bean_referencing_bean_id;
+
+alter table f_second drop constraint if exists fk_f_second_first;
+
+alter table section drop constraint if exists fk_section_article_id;
+drop index if exists ix_section_article_id;
+
+alter table self_parent drop constraint if exists fk_self_parent_parent_id;
+drop index if exists ix_self_parent_parent_id;
+
+alter table 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 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 e_save_test_b drop constraint if exists fk_e_save_test_b_sibling_a_id;
+
+alter table site drop constraint if exists fk_site_parent_id;
+drop index if exists ix_site_parent_id;
+
+alter table site drop constraint if exists fk_site_data_container_id;
+
+alter table site drop constraint if exists fk_site_site_address_id;
+
+alter table source_base drop constraint if exists fk_source_base_target_id;
+drop index if exists ix_source_base_target_id;
+
+alter table stockforecast drop constraint if exists fk_stockforecast_inner_report_id;
+drop index if exists ix_stockforecast_inner_report_id;
+
+alter table sub_section drop constraint if exists fk_sub_section_section_id;
+drop index if exists ix_sub_section_section_id;
+
+alter table tevent_many drop constraint if exists fk_tevent_many_event_id;
+drop index if exists ix_tevent_many_event_id;
+
+alter table tevent_one drop constraint if exists fk_tevent_one_event_id;
+
+alter table 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 ttruck_holder drop constraint if exists fk_ttruck_holder_truck_plate_no;
+drop index if exists ix_ttruck_holder_truck_plate_no;
+
+alter table ttruck_holder drop constraint if exists fk_ttruck_holder_basic_id;
+drop index if exists ix_ttruck_holder_basic_id;
+
+alter table ttruck_holder_item drop constraint if exists fk_ttruck_holder_item_owner_id;
+drop index if exists ix_ttruck_holder_item_owner_id;
+
+alter table twheel drop constraint if exists fk_twheel_owner_plate_no;
+drop index if exists ix_twheel_owner_plate_no;
+
+alter table tire drop constraint if exists fk_tire_wheel;
+
+alter table tree_entity drop constraint if exists fk_tree_entity_parent_id;
+drop index if exists ix_tree_entity_parent_id;
+
+alter table trip drop constraint if exists fk_trip_vehicle_driver_id;
+drop index if exists ix_trip_vehicle_driver_id;
+
+alter table trip drop constraint if exists fk_trip_address_id;
+drop index if exists ix_trip_address_id;
+
+alter table "type" drop constraint if exists fk_type_sub_type_id;
+drop index if exists ix_type_sub_type_id;
+
+alter table usib_child drop constraint if exists fk_usib_child_parent_id;
+drop index if exists ix_usib_child_parent_id;
+
+alter table usib_child_sibling drop constraint if exists fk_usib_child_sibling_child_id;
+
+alter table ut_detail drop constraint if exists fk_ut_detail_utmaster_id;
+drop index if exists ix_ut_detail_utmaster_id;
+
+alter table uutwo drop constraint if exists fk_uutwo_master_id;
+drop index if exists ix_uutwo_master_id;
+
+alter table oto_user drop constraint if exists fk_oto_user_account_id;
+
+alter table c_user drop constraint if exists fk_c_user_group_id;
+drop index if exists ix_c_user_group_id;
+
+alter table 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 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 vehicle drop constraint if exists fk_vehicle_lease_id;
+drop index if exists ix_vehicle_lease_id;
+
+alter table vehicle drop constraint if exists fk_vehicle_car_ref_id;
+drop index if exists ix_vehicle_car_ref_id;
+
+alter table vehicle drop constraint if exists fk_vehicle_truck_ref_id;
+drop index if exists ix_vehicle_truck_ref_id;
+
+alter table vehicle_driver drop constraint if exists fk_vehicle_driver_vehicle_id;
+drop index if exists ix_vehicle_driver_vehicle_id;
+
+alter table vehicle_driver drop constraint if exists fk_vehicle_driver_address_id;
+drop index if exists ix_vehicle_driver_address_id;
+
+alter table version_child drop constraint if exists fk_version_child_parent_id;
+drop index if exists ix_version_child_parent_id;
+
+alter table version_toy drop constraint if exists fk_version_toy_child_id;
+drop index if exists ix_version_toy_child_id;
+
+alter table warehouses drop constraint if exists fk_warehouses_officezoneid;
+drop index if exists ix_warehouses_officezoneid;
+
+alter table warehousesshippingzones drop constraint if exists fk_warehousesshippingzones_warehouses;
+drop index if exists ix_warehousesshippingzones_warehouses;
+
+alter table warehousesshippingzones drop constraint if exists fk_warehousesshippingzones_zones;
+drop index if exists ix_warehousesshippingzones_zones;
+
+alter table sa_wheel drop constraint if exists fk_sa_wheel_tire;
+drop index if exists ix_sa_wheel_tire;
+
+alter table sa_wheel drop constraint if exists fk_sa_wheel_car;
+drop index if exists ix_sa_wheel_car;
+
+alter table 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 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 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;
+
+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;
+
+drop table if exists o_address;
+
+drop table if exists album;
+
+drop table if exists animal;
+
+drop table if exists animal_shelter;
+
+drop table if exists article;
+
+drop table if exists attribute;
+
+drop table if exists attribute_holder;
+
+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_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 sequence if exists drel_booking_seq;
+
+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 ciaddress;
+
+drop table if exists cicustomer_parent;
+
+drop table if exists cistreet_parent;
+
+drop table if exists cinh_ref;
+
+drop table if exists cinh_root;
+
+drop table if exists ckey_assoc;
+
+drop table if exists ckey_detail;
+
+drop table if exists ckey_parent;
+
+drop table if exists coone;
+
+drop table if exists coone_many;
+
+drop table if exists coroot;
+
+drop table if exists calculation_result;
+
+drop table if exists cao_bean;
+
+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 sp_car_car_doors;
+
+drop table if exists sa_car;
+drop sequence if exists sa_car_seq;
+
+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;
+
+drop table if exists contact;
+
+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;
+
+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 dint_parent;
+
+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;
+
+drop table if exists drot;
+
+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 defaults_model;
+
+drop table if exists defaults_model_draft;
+
+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_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;
+
+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 sp_car_door;
+drop sequence if exists sp_car_door_seq;
+
+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;
+
+drop table if exists ebasic_clob_no_ver;
+
+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_basicenc_relate;
+
+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_jackson3;
+
+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;
+
+drop table if exists ebasic_json_node;
+
+drop table if exists ebasic_json_node_blob;
+
+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_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 eid_uid_bean;
+
+drop table if exists einvoice;
+
+drop table if exists e_main;
+
+drop table if exists enull_collection;
+
+drop table if exists enull_collection_detail;
+
+drop table if exists eopt_one_a;
+
+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 eperson2;
+
+drop table if exists eperson3;
+
+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 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;
+
+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 ec_top;
+
+drop table if exists ec_top_ecs_person;
+
+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 ecsm_child;
+
+drop table if exists ecsm_values;
+
+drop table if exists ecsm_one;
+
+drop table if exists ecsm_parent;
+
+drop table if exists ecsm_two;
+
+drop table if exists td_child;
+
+drop table if exists td_parent;
+
+drop table if exists element_bean;
+
+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;
+
+drop table if exists foo;
+
+drop table if exists gen_key_identity;
+
+drop table if exists gen_key_sequence;
+drop sequence if exists SEQ_NAME;
+
+drop table if exists grand_parent_person;
+
+drop table if exists survey_group;
+
+drop table if exists c_group;
+
+drop trigger hembi_bean_history_upd;
+drop view hembi_bean_with_history;
+alter table hembi_bean drop column sys_period_start;
+alter table hembi_bean drop column sys_period_end;
+drop table hembi_bean_history;
+
+drop table if exists hembi_bean;
+
+drop table if exists he_doc;
+
+drop trigger hx_link_history_upd;
+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 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 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 trigger hi_tone_history_upd;
+drop view hi_tone_with_history;
+alter table hi_tone drop column sys_period_start;
+alter table hi_tone drop column sys_period_end;
+drop table hi_tone_history;
+
+drop table if exists hi_tone;
+
+drop trigger hi_tthree_history_upd;
+drop view hi_tthree_with_history;
+alter table hi_tthree drop column sys_period_start;
+alter table hi_tthree drop column sys_period_end;
+drop table hi_tthree_history;
+
+drop table if exists hi_tthree;
+
+drop trigger hi_ttwo_history_upd;
+drop view hi_ttwo_with_history;
+alter table hi_ttwo drop column sys_period_start;
+alter table hi_ttwo drop column sys_period_end;
+drop table hi_ttwo_history;
+
+drop table if exists hi_ttwo;
+
+drop trigger hsd_setting_history_upd;
+drop view hsd_setting_with_history;
+alter table hsd_setting drop column sys_period_start;
+alter table hsd_setting drop column sys_period_end;
+drop table hsd_setting_history;
+
+drop table if exists hsd_setting;
+
+drop trigger hsd_user_history_upd;
+drop view hsd_user_with_history;
+alter table hsd_user drop column sys_period_start;
+alter table hsd_user drop column 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;
+
+drop table if exists ixresource;
+
+drop table if exists info_company;
+
+drop table if exists info_contact;
+
+drop table if exists info_customer;
+
+drop table if exists inner_report;
+
+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 mkeygroup;
+
+drop table if exists mkeygroup_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;
+
+drop table if exists level1_level2;
+
+drop table if exists level2;
+
+drop table if exists level2_level3;
+
+drop table if exists level3;
+
+drop table if exists level4;
+
+drop trigger link_history_upd;
+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;
+
+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;
+
+drop table if exists mprinter;
+
+drop table if exists mprinter_state;
+
+drop table if exists mprofile;
+
+drop table if exists mprotected_construct_bean;
+
+drop table if exists mrole;
+
+drop table if exists mrole_muser;
+
+drop table if exists msome_other;
+
+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 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;
+
+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;
+
+drop table if exists noidbean;
+
+drop table if exists o_bean_child;
+
+drop table if exists ocached_app;
+
+drop table if exists ocached_app_detail;
+
+drop table if exists o_cached_bean;
+
+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;
+
+drop table if exists ocached_nkey_uid;
+
+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 omvertex;
+
+drop table if exists omvertex_other;
+
+drop table if exists oroad_show_msg;
+
+drop table if exists om_account_child_dbo;
+
+drop table if exists om_account_dbo;
+
+drop table if exists om_basic_child;
+
+drop table if exists om_basic_parent;
+
+drop table if exists om_ordered_detail;
+
+drop table if exists om_ordered_master;
+
+drop table if exists oml_bar;
+
+drop table if exists oml_baz;
+
+drop table if exists oml_foo;
+
+drop table if exists only_id_entity;
+
+drop table if exists o_order;
+
+drop table if exists o_order_detail;
+
+drop table if exists s_orders;
+
+drop table if exists s_order_items;
+
+drop table if exists order_master;
+
+drop table if exists order_master_inheritance;
+
+drop table if exists order_referenced_parent;
+
+drop table if exists or_order_ship;
+
+drop table if exists order_toy;
+
+drop table if exists ordered_parent;
+
+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;
+
+drop table if exists oto_child;
+
+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;
+
+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 oto_user_model;
+
+drop table if exists oto_user_model_optional;
+
+drop table if exists pfile;
+
+drop table if exists pfile_content;
+
+drop table if exists paggview;
+
+drop table if exists pallet_location;
+
+drop table if exists parcel;
+
+drop table if exists parcel_location;
+
+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 pcf_calendar;
+
+drop table if exists pcf_city;
+
+drop table if exists pcf_country;
+
+drop table if exists pcf_event;
+
+drop table if exists pcf_person;
+
+drop table if exists mt_permission;
+
+drop table if exists persistent_file;
+
+drop table if exists persistent_file_content;
+
+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;
+
+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;
+
+drop table if exists referenced_defaults_model;
+
+drop table if exists referenced_defaults_model_draft;
+
+drop table if exists referencing_bean;
+
+drop table if exists region;
+
+drop table if exists rel_detail;
+
+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 root_bean;
+
+drop table if exists f_second;
+
+drop table if exists section;
+
+drop table if exists self_parent;
+
+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;
+
+drop table if exists some_new_types_bean;
+
+drop table if exists some_period_bean;
+
+drop table if exists source_base;
+
+drop table if exists stockforecast;
+
+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;
+
+drop table if exists t_mapsuper1;
+
+drop table if exists t_oneb;
+
+drop table if exists t_detail_with_other_namexxxyy;
+drop sequence if exists t_atable_detail_seq;
+
+drop table if exists t_atable_thatisrelatively;
+drop sequence if exists t_atable_master_seq;
+
+drop table if exists ttruck_holder;
+
+drop table if exists ttruck_holder_item;
+
+drop table if exists tuuid_entity;
+
+drop table if exists twheel;
+
+drop table if exists twith_pre_insert;
+
+drop table if exists target_base;
+
+drop table if exists mt_tenant;
+
+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 sequence if exists sa_tire_seq;
+
+drop table if exists tree_entity;
+
+drop table if exists trip;
+
+drop table if exists truck_ref;
+
+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;
+
+drop table if exists uuone;
+
+drop table if exists uutwo;
+
+drop table if exists oto_user;
+
+drop trigger c_user_history_upd;
+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 g_user;
+
+drop table if exists em_user;
+
+drop table if exists user_interest_live;
+
+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 version_child;
+
+drop table if exists version_parent;
+
+drop table if exists version_toy;
+
+drop table if exists warehouses;
+
+drop table if exists warehousesshippingzones;
+
+drop table if exists wheel;
+drop sequence if exists wheel_seq;
+
+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 g_who_props_otm;
+
+drop table if exists with_zero;
+
+drop table if exists parent;
+
+drop table if exists wview;
+
+drop table if exists zones;
+
+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_ecsm_values_host_id;
+drop index if exists ix_order_referenced_parent_type;
+drop index if exists ix_organization_node_kind;
+drop index if exists ano_3;
+drop index if exists ano_1;
+drop index if exists ano_2;
diff --git a/ebean-core/src/test/ddl-review/mariadb-create-all.sql b/ebean-core/src/test/ddl-review/mariadb-create-all.sql
new file mode 100644
index 000000000..521bb29c1
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/mariadb-create-all.sql
@@ -0,0 +1,4909 @@
+-- Generated by ebean unknown at 2020-06-29T03:48:37.908711Z
+create table asimple_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_asimple_bean primary key (id)
+);
+
+create table bar (
+  bar_type                      varchar(31) 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 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),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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,
+  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                            integer 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,
+  dog_size                      varchar(255),
+  constraint pk_animal primary key (id)
+);
+
+create table animal_shelter (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_animal_shelter primary key (id)
+);
+
+create table article (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  author                        varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_article primary key (id)
+);
+
+create table attribute (
+  option_type                   integer(31) not null,
+  id                            integer auto_increment not null,
+  attribute_holder_id           integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_attribute primary key (id)
+);
+
+create table attribute_holder (
+  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 table audit_log (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  modified_description          varchar(255),
+  constraint pk_audit_log primary key (id)
+);
+
+create table bbookmark (
+  id                            integer auto_increment not null,
+  bookmark_reference            varchar(255),
+  user_id                       integer,
+  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)
+);
+
+create table bsimple_with_gen (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  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_a (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer,
+  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 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 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),
+  constraint pk_buser primary key (id)
+);
+
+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,
+  constraint pk_basic_joda_entity primary key (id)
+);
+
+create table bean_with_time_zone (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  timezone                      varchar(20),
+  constraint pk_bean_with_time_zone primary key (id)
+);
+
+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 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 ciaddress (
+  id                            bigint auto_increment not null,
+  street_id                     bigint,
+  constraint pk_ciaddress primary key (id)
+);
+
+create table cicustomer_parent (
+  dtype                         integer(31) not null,
+  id                            bigint auto_increment not null,
+  address_id                    bigint,
+  notes                         varchar(255),
+  constraint pk_cicustomer_parent primary key (id)
+);
+
+create table cistreet_parent (
+  dtype                         integer(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  num                           varchar(255),
+  constraint pk_cistreet_parent primary key (id)
+);
+
+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,
+  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),
+  constraint pk_ckey_assoc primary key (id)
+);
+
+create table ckey_detail (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  one_key                       integer,
+  two_key                       varchar(127),
+  constraint pk_ckey_detail primary key (id)
+);
+
+create table ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  assoc_id                      integer,
+  version                       integer not null,
+  constraint pk_ckey_parent primary key (one_key,two_key)
+);
+
+create table coone (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_coone primary key (id)
+);
+
+create table coone_many (
+  id                            bigint auto_increment not null,
+  coone_id                      bigint not null,
+  name                          varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_coone_many primary key (id)
+);
+
+create table coroot (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint uq_coroot_one_id unique (one_id),
+  constraint pk_coroot primary key (id)
+);
+
+create table calculation_result (
+  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 table cao_bean (
+  x_cust_id                     integer not null,
+  x_type_id                     integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_cao_bean primary key (x_cust_id,x_type_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)
+);
+
+create table sp_car_car_wheels (
+  car                           bigint not null,
+  wheel                         bigint not null,
+  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,
+  brand                         varchar(255),
+  sold                          integer 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),
+  fuse_id                       bigint not null,
+  car_id                        integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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 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),
+  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 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,
+  name                          varchar(255),
+  configurations_id             integer,
+  group_name                    varchar(255),
+  product_name                  varchar(255),
+  constraint pk_configuration primary key (id)
+);
+
+create table configurations (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_configurations primary key (id)
+);
+
+create table contact (
+  id                            integer auto_increment not null,
+  first_name                    varchar(127),
+  last_name                     varchar(127),
+  phone                         varchar(255),
+  mobile                        varchar(255),
+  email                         varchar(255),
+  is_member                     tinyint(1) default 0 not null,
+  customer_id                   integer not null,
+  group_id                      integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  constraint pk_contact primary key (id)
+);
+
+create table contact_group (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_contact_group primary key (id)
+);
+
+create table contact_note (
+  id                            integer auto_increment not null,
+  contact_id                    integer,
+  title                         varchar(255),
+  note                          longtext,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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),
+  isopen                        tinyint(1) default 0 not null,
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_c_conversation primary key (id)
+);
+
+create table o_country (
+  code                          varchar(2) not null,
+  name                          varchar(60),
+  constraint pk_o_country primary key (code)
+);
+
+create table cover (
+  id                            bigint auto_increment not null,
+  s3_url                        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) comment 'status of the customer',
+  name                          varchar(40) not null,
+  smallnote                     varchar(100) comment 'Short notes regarding the customer',
+  anniversary                   date comment 'Join date of the customer',
+  billing_address_id            integer,
+  shipping_address_id           integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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                       varchar(255),
+  an_enum_type                  varchar(255),
+  last_updated                  datetime(6) not null,
+  constraint pk_dexh_entity primary key (oid)
+);
+
+create table dint_parent (
+  type                          integer(31) not null,
+  id                            bigint auto_increment not null,
+  val                           integer,
+  more                          varchar(255),
+  constraint pk_dint_parent primary key (id)
+);
+
+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),
+  edate                         date,
+  use_secs                      bigint not null,
+  fuel                          decimal(16,3),
+  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,
+  edate                         date,
+  total_kms                     bigint not null,
+  hours                         bigint not null,
+  rate                          decimal(16,3),
+  cost                          decimal(16,3),
+  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,
+  edate                         date,
+  distance_kms                  bigint not null,
+  time_secs                     bigint not null,
+  fuel                          decimal(9,3),
+  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),
+  last_name                     varchar(255),
+  salary                        decimal(16,3),
+  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 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 defaults_model (
+  id                            integer auto_increment not null,
+  constraint pk_defaults_model primary key (id)
+);
+
+create table defaults_model_draft (
+  id                            integer auto_increment not null,
+  constraint pk_defaults_model_draft 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_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),
+  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 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) not null,
+  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)
+);
+
+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 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),
+  title                         varchar(255),
+  description                   longtext,
+  last_update                   datetime(6) not null,
+  constraint pk_ebasic_clob primary key (id)
+);
+
+create table ebasic_clob_fetch_eager (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  description                   longtext,
+  last_update                   datetime(6) not null,
+  constraint pk_ebasic_clob_fetch_eager primary key (id)
+);
+
+create table ebasic_clob_no_ver (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  description                   longtext,
+  constraint pk_ebasic_clob_no_ver primary key (id)
+);
+
+create table e_basicenc (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varbinary(80),
+  dob                           varbinary(20),
+  status                        varbinary(20),
+  last_update                   datetime(6),
+  constraint pk_e_basicenc primary key (id)
+);
+
+create table e_basicenc_bin (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  data                          longblob,
+  some_time                     varbinary(255),
+  last_update                   datetime(6) not null,
+  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_basicenc_relate (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  other_id                      integer,
+  constraint pk_e_basicenc_relate primary key (id)
+);
+
+create table e_basic_enum_id (
+  status                        varchar(1) not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  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 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_jackson (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  value_set                     json,
+  value_list                    json,
+  value_map                     json,
+  plain_value                   json,
+  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                     json,
+  value_list                    json,
+  value_map                     json,
+  plain_value                   json,
+  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),
+  bean_set                      json,
+  bean_list                     json,
+  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                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map primary key (id)
+);
+
+create table ebasic_json_map_blob (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longblob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_blob primary key (id)
+);
+
+create table ebasic_json_map_clob (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longtext,
+  version                       bigint not null,
+  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                       json,
+  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),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_json_b primary key (id)
+);
+
+create table ebasic_json_map_varchar (
+  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 table ebasic_json_node (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node primary key (id)
+);
+
+create table ebasic_json_node_blob (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longblob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_blob primary key (id)
+);
+
+create table ebasic_json_node_json_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_json_b primary key (id)
+);
+
+create table ebasic_json_node_varchar (
+  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 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),
+  description                   varchar(255),
+  other                         varchar(255),
+  last_update                   datetime(6) not null,
+  constraint pk_e_basicver primary key (id)
+);
+
+create table e_basic_withlife (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  other                         varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  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),
+  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 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),
+  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 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),
+  outer_id                      integer,
+  update_count                  integer not null,
+  constraint pk_eemb_inner primary key (id)
+);
+
+create table eemb_outer (
+  id                            integer auto_increment not null,
+  nome_outer                    varchar(255),
+  date1                         datetime(6),
+  date2                         datetime(6),
+  update_count                  integer not null,
+  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),
+  version                       bigint 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 table eid_uid_bean (
+  id                            bigint auto_increment not null,
+  uuid                          varchar(40) not null,
+  name                          varchar(255),
+  constraint uq_eid_uid_bean_uuid unique (uuid),
+  constraint pk_eid_uid_bean primary key (id)
+);
+
+create table einvoice (
+  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),
+  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 pk_einvoice primary key (id)
+);
+
+create table e_main (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_e_main primary key (id)
+);
+
+create table enull_collection (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_enull_collection primary key (id)
+);
+
+create table enull_collection_detail (
+  id                            integer auto_increment not null,
+  enull_collection_id           integer not null,
+  something                     varchar(255),
+  constraint pk_enull_collection_detail primary key (id)
+);
+
+create table eopt_one_a (
+  id                            integer auto_increment not null,
+  name_for_a                    varchar(255),
+  b_id                          integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_a primary key (id)
+);
+
+create table eopt_one_b (
+  id                            integer auto_increment not null,
+  name_for_b                    varchar(255),
+  c_id                          integer 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 table eopt_one_c (
+  id                            integer auto_increment not null,
+  name_for_c                    varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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),
+  notes                         varchar(255),
+  street                        varchar(255),
+  suburb                        varchar(255),
+  addr_city                     varchar(255),
+  addr_status                   varchar(3),
+  version                       bigint not null,
+  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(16,3),
+  constraint pk_esome_convert_type primary key (id)
+);
+
+create table esome_type (
+  id                            integer auto_increment not null,
+  currency                      varchar(3),
+  locale                        varchar(20),
+  time_zone                     varchar(20),
+  constraint pk_esome_type primary key (id)
+);
+
+create table etrans_many (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  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 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),
+  constraint pk_evanilla_collection primary key (id)
+);
+
+create table evanilla_collection_detail (
+  id                            integer auto_increment not null,
+  evanilla_collection_id        integer not null,
+  something                     varchar(255),
+  constraint pk_evanilla_collection_detail primary key (id)
+);
+
+create table ewho_props (
+  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,
+  constraint pk_ewho_props primary key (id)
+);
+
+create table e_withinet (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  inet_address                  varchar(50),
+  inet2                         varchar(255),
+  cidr                          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 ec_top (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  person_id                     bigint,
+  version                       bigint not null,
+  constraint pk_ec_top primary key (id)
+);
+
+create table ec_top_ecs_person (
+  ec_top_id                     bigint not null,
+  ecs_person_id                 bigint not null,
+  constraint pk_ec_top_ecs_person primary key (ec_top_id,ecs_person_id)
+);
+
+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),
+  phnum                         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),
+  phnum                         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,
+  phnum                         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 ecsm_child (
+  one_id                        varchar(40) not null,
+  ecsm_parent_id                bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_child primary key (one_id)
+);
+
+create table ecsm_values (
+  host_id                       varchar(40) not null,
+  value                         varchar(255) not null
+);
+
+create table ecsm_one (
+  one_id                        varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_one primary key (one_id)
+);
+
+create table ecsm_parent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_parent primary key (id)
+);
+
+create table ecsm_two (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_two primary key (id)
+);
+
+create table td_child (
+  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 table td_parent (
+  parent_type                   varchar(31) 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 table element_bean (
+  id                            bigint auto_increment not null,
+  complex_bean_id               varchar(40) not null,
+  value                         varchar(255) not null,
+  constraint pk_element_bean primary key (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 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),
+  description                   varchar(255),
+  constraint pk_feature_desc primary key (id)
+);
+
+create table f_first (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_f_first primary key (id)
+);
+
+create table foo (
+  foo_id                        integer auto_increment not null,
+  important_text                varchar(255),
+  version                       integer not null,
+  constraint pk_foo primary key (foo_id)
+);
+
+create table gen_key_identity (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  constraint pk_gen_key_identity primary key (id)
+);
+
+create table gen_key_sequence (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  constraint pk_gen_key_sequence 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 not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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,
+  deleted                       tinyint(1) default 0 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 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),
+  owner_id                      bigint not null,
+  constraint pk_imrelated primary key (id)
+);
+
+create table imroot (
+  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 table ixresource (
+  dtype                         varchar(255),
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_ixresource primary key (id)
+);
+
+create table info_company (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_info_company primary key (id)
+);
+
+create table info_contact (
+  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 table info_customer (
+  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 table inner_report (
+  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 table drel_invoice (
+  id                            bigint auto_increment not null,
+  booking                       bigint,
+  version                       integer not null,
+  constraint pk_drel_invoice primary key (id)
+);
+
+create table item (
+  customer                      integer not null,
+  itemnumber                    varchar(127) not null,
+  description                   varchar(255),
+  units                         varchar(255),
+  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 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),
+  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),
+  constraint pk_level1 primary key (id)
+);
+
+create table level1_level4 (
+  level1_id                     bigint not null,
+  level4_id                     bigint not null,
+  constraint pk_level1_level4 primary key (level1_id,level4_id)
+);
+
+create table level1_level2 (
+  level1_id                     bigint not null,
+  level2_id                     bigint not null,
+  constraint pk_level1_level2 primary key (level1_id,level2_id)
+);
+
+create table level2 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_level2 primary key (id)
+);
+
+create table level2_level3 (
+  level2_id                     bigint not null,
+  level3_id                     bigint not null,
+  constraint pk_level2_level3 primary key (level2_id,level3_id)
+);
+
+create table level3 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_level3 primary key (id)
+);
+
+create table level4 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  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),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_la_attr_value primary key (id)
+);
+
+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 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,
+  url                           varchar(255),
+  note                          varchar(255),
+  constraint pk_mmedia primary key (id)
+);
+
+create table non_updateprop (
+  id                            integer auto_increment not null,
+  non_enum                      varchar(5),
+  name                          varchar(255),
+  note                          varchar(255),
+  constraint pk_non_updateprop primary key (id)
+);
+
+create table mprinter (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  flags                         bigint not null,
+  current_state_id              bigint,
+  last_swap_cyan_id             bigint,
+  last_swap_magenta_id          bigint,
+  last_swap_yellow_id           bigint,
+  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_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 table mprinter_state (
+  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 table mprofile (
+  id                            bigint auto_increment not null,
+  picture_id                    bigint,
+  name                          varchar(255),
+  constraint pk_mprofile primary key (id)
+);
+
+create table mprotected_construct_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_mprotected_construct_bean primary key (id)
+);
+
+create table mrole (
+  roleid                        integer auto_increment not null,
+  role_name                     varchar(255),
+  constraint pk_mrole primary key (roleid)
+);
+
+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                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_msome_other primary key (id)
+);
+
+create table muser (
+  userid                        integer auto_increment not null,
+  user_name                     varchar(255),
+  user_type_id                  integer,
+  constraint pk_muser primary key (userid)
+);
+
+create table muser_type (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  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 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),
+  when_created                  datetime(6) not null,
+  when_updated                  datetime(6) not null,
+  constraint pk_map_super_actual primary key (id)
+);
+
+create table c_message (
+  id                            bigint auto_increment not null,
+  title                         varchar(255),
+  body                          varchar(255),
+  conversation_id               bigint,
+  user_id                       bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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),
+  version                       integer not null,
+  constraint pk_mnoc_role primary key (role_id)
+);
+
+create table mnoc_user (
+  user_id                       integer auto_increment not null,
+  user_name                     varchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_user primary key (user_id)
+);
+
+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                            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,
+  code                          varchar(255),
+  organization_id               bigint,
+  constraint pk_mp_role primary key (id)
+);
+
+create table mp_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  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 not null,
+  my_lob                        longtext,
+  constraint pk_my_lob_size primary key (id)
+);
+
+create table my_lob_size_join_many (
+  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 table noidbean (
+  name                          varchar(255),
+  subject                       varchar(255),
+  when_created                  datetime(6) not null
+);
+
+create table o_bean_child (
+  id                            bigint auto_increment not null,
+  cached_bean_id                bigint,
+  constraint pk_o_bean_child primary key (id)
+);
+
+create table ocached_app (
+  id                            bigint auto_increment not null,
+  app_name                      varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_app_name unique (app_name),
+  constraint pk_ocached_app primary key (id)
+);
+
+create table ocached_app_detail (
+  id                            bigint auto_increment not null,
+  app_id                        bigint not null,
+  detail                        varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_detail_app_id_detail unique (app_id,detail),
+  constraint pk_ocached_app_detail primary key (id)
+);
+
+create table o_cached_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_o_cached_bean primary key (id)
+);
+
+create table o_cached_bean_country (
+  o_cached_bean_id              bigint not null,
+  o_country_code                varchar(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                            bigint auto_increment not null,
+  cached_bean_id                bigint,
+  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),
+  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 ocached_nkey_uid (
+  id                            bigint auto_increment not null,
+  cid                           varchar(40),
+  other                         varchar(255),
+  version                       bigint not null,
+  constraint pk_ocached_nkey_uid primary key (id)
+);
+
+create table ocar (
+  id                            integer auto_increment not null,
+  vin                           varchar(255),
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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                     varchar(40) not null,
+  short_desc                    varchar(255),
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_oengine_car_id unique (car_id),
+  constraint pk_oengine primary key (engine_id)
+);
+
+create table ogear_box (
+  id                            varchar(40) not null,
+  box_desc                      varchar(255),
+  box_size                      integer,
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_ogear_box_car_id unique (car_id),
+  constraint pk_ogear_box primary key (id)
+);
+
+create table omvertex (
+  id                            varchar(40) not null,
+  constraint pk_omvertex primary key (id)
+);
+
+create table omvertex_other (
+  id                            varchar(40) not null,
+  omvertex_id                   varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_omvertex_other 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_account_child_dbo (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  banana_rama_id                bigint,
+  constraint pk_om_account_child_dbo primary key (id)
+);
+
+create table om_account_dbo (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_om_account_dbo primary key (id)
+);
+
+create table om_basic_child (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_om_basic_child primary key (id)
+);
+
+create table om_basic_parent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_basic_parent 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 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,
+  order_date                    date,
+  ship_date                     date,
+  kcustomer_id                  integer not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  constraint pk_o_order primary key (id)
+);
+
+create table o_order_detail (
+  id                            integer auto_increment not null,
+  order_id                      integer not null,
+  order_qty                     integer,
+  ship_qty                      integer,
+  unit_price                    double,
+  product_id                    integer,
+  cretime                       datetime(6),
+  updtime                       datetime(6) not null,
+  constraint pk_o_order_detail primary key (id)
+);
+
+create table s_orders (
+  uuid                          varchar(40) not null,
+  constraint pk_s_orders primary key (uuid)
+);
+
+create table s_order_items (
+  uuid                          varchar(40) not null,
+  product_variant_uuid          varchar(255),
+  order_uuid                    varchar(40),
+  quantity                      integer not null,
+  amount                        decimal(16,3),
+  constraint pk_s_order_items primary key (uuid)
+);
+
+create table order_master (
+  id                            bigint auto_increment not null,
+  constraint pk_order_master primary key (id)
+);
+
+create table order_master_inheritance (
+  id                            integer auto_increment not null,
+  constraint pk_order_master_inheritance primary key (id)
+);
+
+create table order_referenced_parent (
+  type                          varchar(31) not null,
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  child_name                    varchar(255),
+  master_id                     bigint,
+  sort_order                    integer,
+  constraint pk_order_referenced_parent primary key (id)
+);
+
+create table or_order_ship (
+  id                            integer auto_increment not null,
+  order_id                      integer,
+  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 table order_toy (
+  id                            integer auto_increment not null,
+  title                         varchar(255),
+  child_id                      bigint,
+  sort_order                    integer,
+  constraint pk_order_toy primary key (id)
+);
+
+create table ordered_parent (
+  dtype                         varchar(31) not null,
+  id                            integer auto_increment not null,
+  order_master_inheritance_id   integer not null,
+  common_name                   varchar(255),
+  sort_order                    integer,
+  ordered_aname                 varchar(255),
+  ordered_bname                 varchar(255),
+  constraint pk_ordered_parent 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 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,
+  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),
+  master_id                     bigint,
+  constraint uq_oto_child_master_id unique (master_id),
+  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_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),
+  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 auto_increment not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  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,
+  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 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),
+  file_content_id               integer,
+  file_content2_id              integer,
+  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 table pfile_content (
+  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 table paggview (
+  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 auto_increment not null,
+  zone_sid                      integer not null,
+  attribute                     varchar(255),
+  constraint pk_pallet_location primary key (id)
+);
+
+create table parcel (
+  parcelid                      bigint auto_increment not null,
+  description                   varchar(255),
+  constraint pk_parcel primary key (parcelid)
+);
+
+create table parcel_location (
+  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 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)
+);
+
+create table rawinherit_parent_rawinherit_data (
+  rawinherit_parent_id          bigint not null,
+  rawinherit_data_id            bigint not null,
+  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),
+  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,
+  type                          integer,
+  conversation_id               bigint not null,
+  user_id                       bigint not null,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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 pcf_calendar (
+  id                            bigint auto_increment not null,
+  pcf_person_id                 bigint not null,
+  version                       bigint not null,
+  constraint pk_pcf_calendar primary key (id)
+);
+
+create table pcf_city (
+  id                            bigint auto_increment not null,
+  pcf_country_id                bigint not null,
+  name                          varchar(255),
+  mayor_id                      bigint not null,
+  vice_mayor_id                 bigint not null,
+  version                       bigint not null,
+  constraint uq_pcf_city_mayor_id unique (mayor_id),
+  constraint uq_pcf_city_vice_mayor_id unique (vice_mayor_id),
+  constraint pk_pcf_city primary key (id)
+);
+
+create table pcf_country (
+  id                            bigint auto_increment not null,
+  version                       bigint not null,
+  constraint pk_pcf_country primary key (id)
+);
+
+create table pcf_event (
+  id                            bigint auto_increment not null,
+  pcf_calendar_id               bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_event primary key (id)
+);
+
+create table pcf_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_person primary key (id)
+);
+
+create table mt_permission (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_mt_permission primary key (id)
+);
+
+create table persistent_file (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_persistent_file primary key (id)
+);
+
+create table persistent_file_content (
+  id                            integer auto_increment not null,
+  persistent_file_id            integer,
+  content                       longblob,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint uq_persistent_file_content_persistent_file_id unique (persistent_file_id),
+  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,
+  name                          varchar(64) not null,
+  constraint pk_persons primary key (id)
+);
+
+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 (
+  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 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,
+  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),
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  constraint pk_o_product primary key (id)
+);
+
+create table pp (
+  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                         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(127) not null,
+  name                          varchar(127) not null,
+  description                   varchar(255),
+  constraint pk_rcustomer primary key (company,name)
+);
+
+create table r_orders (
+  company                       varchar(127) not null,
+  order_number                  integer not null,
+  customername                  varchar(127),
+  item                          varchar(255),
+  constraint pk_r_orders primary key (company,order_number)
+);
+
+create table referenced_defaults_model (
+  id                            integer auto_increment not null,
+  defaults_model_id             integer not null,
+  name                          varchar(255),
+  constraint pk_referenced_defaults_model primary key (id)
+);
+
+create table referenced_defaults_model_draft (
+  id                            integer auto_increment not null,
+  defaults_model_id             integer not null,
+  name                          varchar(255),
+  constraint pk_referenced_defaults_model_draft primary key (id)
+);
+
+create table referencing_bean (
+  id                            varchar(40) not null,
+  constraint pk_referencing_bean primary key (id)
+);
+
+create table region (
+  customer                      integer not null,
+  type                          integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  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),
+  name                          varchar(128) not null,
+  constraint pk_resourcefile 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 em_role (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
+create table root_bean (
+  dtype                         varchar(31) not null,
+  id                            varchar(40) not null,
+  referencing_bean_id           varchar(40) not null,
+  value                         varchar(255),
+  constraint pk_root_bean primary key (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),
+  constraint pk_f_second primary key (id)
+);
+
+create table section (
+  id                            integer auto_increment not null,
+  article_id                    integer,
+  type                          integer,
+  content                       longtext,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_section primary key (id)
+);
+
+create table self_parent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_self_parent primary key (id)
+);
+
+create table self_ref_customer (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  referred_by_id                bigint,
+  constraint pk_self_ref_customer primary key (id)
+);
+
+create table self_ref_example (
+  id                            bigint auto_increment not null,
+  name                          varchar(255) not null,
+  parent_id                     bigint,
+  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 pk_some_enum_bean primary key (id)
+);
+
+create table some_file_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longblob,
+  version                       bigint not null,
+  constraint pk_some_file_bean primary key (id)
+);
+
+create table some_new_types_bean (
+  id                            bigint auto_increment not null,
+  dow                           integer(1),
+  mth                           integer(1),
+  yr                            integer,
+  yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
+  sql_time                      time,
+  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 pk_some_new_types_bean primary key (id)
+);
+
+create table some_period_bean (
+  id                            bigint auto_increment not null,
+  anniversary                   date,
+  version                       bigint not null,
+  constraint pk_some_period_bean primary key (id)
+);
+
+create table source_base (
+  dtype                         varchar(31) not null,
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  pos                           integer not null,
+  target_id                     varchar(40),
+  constraint pk_source_base primary key (id)
+);
+
+create table stockforecast (
+  type                          varchar(31) not null,
+  id                            bigint auto_increment not null,
+  inner_report_id               bigint,
+  constraint pk_stockforecast primary key (id)
+);
+
+create table sub_section (
+  id                            integer auto_increment not null,
+  section_id                    integer,
+  title                         varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_sub_section primary key (id)
+);
+
+create table sub_type (
+  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 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,
+  constraint pk_tbytes_only primary key (id)
+);
+
+create table tcar (
+  type                          varchar(31) 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 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,
+  name                          varchar(255),
+  child_property                varchar(255),
+  constraint pk_tint_root primary key (id)
+);
+
+create table tjoda_entity (
+  id                            integer auto_increment not null,
+  local_time                    time,
+  constraint pk_tjoda_entity primary key (id)
+);
+
+create table t_mapsuper1 (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_t_mapsuper1 primary key (id)
+);
+
+create table t_oneb (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        tinyint(1) default 0 not null,
+  constraint pk_t_oneb primary key (id)
+);
+
+create table t_detail_with_other_namexxxyy (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  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)
+);
+
+create table t_atable_thatisrelatively (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        tinyint(1) default 0 not null,
+  constraint pk_t_atable_thatisrelatively primary key (id)
+);
+
+create table ttruck_holder (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  truck_plate_no                varchar(32) not null,
+  basic_id                      integer,
+  version                       bigint not null,
+  constraint pk_ttruck_holder primary key (id)
+);
+
+create table ttruck_holder_item (
+  id                            bigint auto_increment not null,
+  some_uid                      varchar(40),
+  foo                           varchar(255),
+  owner_id                      bigint not null,
+  constraint pk_ttruck_holder_item primary key (id)
+);
+
+create table tuuid_entity (
+  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(32) not null,
+  constraint pk_twheel primary key (id)
+);
+
+create table twith_pre_insert (
+  id                            integer auto_increment not null,
+  name                          varchar(255) not null,
+  title                         varchar(255),
+  constraint pk_twith_pre_insert primary key (id)
+);
+
+create table target_base (
+  dtype                         varchar(31) not null,
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_target_base primary key (id)
+);
+
+create table mt_tenant (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mt_tenant 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 (
+  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 table sa_tire (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
+
+create table tree_entity (
+  id                            integer auto_increment not null,
+  text                          varchar(255),
+  parent_id                     integer,
+  constraint pk_tree_entity primary key (id)
+);
+
+create table trip (
+  id                            integer auto_increment not null,
+  vehicle_driver_id             integer,
+  destination                   varchar(255),
+  address_id                    integer,
+  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 table truck_ref (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  constraint pk_truck_ref primary key (id)
+);
+
+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),
+  sub_type_id                   integer,
+  version                       bigint not null,
+  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 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,
+  name                          varchar(255),
+  qty                           integer,
+  amount                        double,
+  version                       integer not null,
+  constraint pk_ut_detail primary key (id)
+);
+
+create table ut_master (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  event_date                    date,
+  version                       integer not null,
+  constraint pk_ut_master primary key (id)
+);
+
+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,
+  name                          varchar(255),
+  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 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_tx_user primary key (id)
+);
+
+create table g_user (
+  id                            bigint auto_increment not null,
+  username                      varchar(255),
+  version                       bigint not null,
+  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 user_interest_live (
+  user_id                       bigint not null,
+  live_id                       bigint not null,
+  created_at                    datetime(6) not null,
+  constraint pk_user_interest_live primary key (user_id,live_id)
+);
+
+create table em_user_role (
+  user_id                       bigint not null,
+  role_id                       bigint not null,
+  constraint pk_em_user_role primary key (user_id,role_id)
+);
+
+create table vehicle (
+  dtype                         varchar(3) not null,
+  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(3),
+  driver                        varchar(255),
+  car_ref_id                    integer,
+  notes                         varchar(255),
+  truck_ref_id                  integer,
+  capacity                      double,
+  constraint pk_vehicle primary key (id)
+);
+
+create table vehicle_driver (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  vehicle_id                    integer,
+  address_id                    integer,
+  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 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(16,3),
+  min_duration                  integer not null,
+  day_rate                      decimal(16,3),
+  max_days                      integer,
+  constraint pk_vehicle_lease primary key (id)
+);
+
+create table version_child (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  parent_id                     integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_child primary key (id)
+);
+
+create table version_parent (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_version_parent primary key (id)
+);
+
+create table version_toy (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  child_id                      integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_toy primary key (id)
+);
+
+create table warehouses (
+  id                            integer auto_increment not null,
+  officezoneid                  integer,
+  constraint pk_warehouses primary key (id)
+);
+
+create table warehousesshippingzones (
+  warehouseid                   integer not null,
+  shippingzoneid                integer not null,
+  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,
+  car                           bigint,
+  version                       integer not null,
+  constraint pk_sa_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)
+);
+
+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)
+);
+
+create table parent (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_parent primary key (id)
+);
+
+create table wview (
+  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 auto_increment not null,
+  attribute                     varchar(255),
+  constraint pk_zones primary key (id)
+);
+
+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_ecsm_values_host_id on ecsm_values (host_id);
+create index ix_order_referenced_parent_type on order_referenced_parent (type);
+create index ix_organization_node_kind on organization_node (kind);
+create index ano_3 on test_annotation_base_entity (direct);
+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;
+
+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 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;
+
+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;
+
+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_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_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;
+
+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;
+
+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_ciaddress_street_id on ciaddress (street_id);
+alter table ciaddress add constraint fk_ciaddress_street_id foreign key (street_id) references cistreet_parent (id) on delete restrict on update restrict;
+
+create index ix_cicustomer_parent_address_id on cicustomer_parent (address_id);
+alter table cicustomer_parent add constraint fk_cicustomer_parent_address_id foreign key (address_id) references ciaddress (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;
+
+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;
+
+create index ix_coone_many_coone_id on coone_many (coone_id);
+alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_id) references coone (id) on delete restrict on update restrict;
+
+alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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;
+
+alter table defaults_model add constraint fk_defaults_model_id foreign key (id) references defaults_model_draft (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_e_basicenc_relate_other_id on e_basicenc_relate (other_id);
+alter table e_basicenc_relate add constraint fk_e_basicenc_relate_other_id foreign key (other_id) references e_basicenc (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_ec_top_person_id on ec_top (person_id);
+alter table ec_top add constraint fk_ec_top_person_id foreign key (person_id) references ecs_person (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person (ec_top_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ec_top foreign key (ec_top_id) references ec_top (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ecs_person on ec_top_ecs_person (ecs_person_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ecs_person foreign key (ecs_person_id) references ecs_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_ecsm_child_ecsm_parent_id on ecsm_child (ecsm_parent_id);
+alter table ecsm_child add constraint fk_ecsm_child_ecsm_parent_id foreign key (ecsm_parent_id) references ecsm_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_element_bean_complex_bean_id on element_bean (complex_bean_id);
+alter table element_bean add constraint fk_element_bean_complex_bean_id foreign key (complex_bean_id) references root_bean (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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_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_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_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_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;
+
+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_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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_bean_child_cached_bean_id on o_bean_child (cached_bean_id);
+alter table o_bean_child add constraint fk_o_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
+
+create index ix_ocached_app_detail_app_id on ocached_app_detail (app_id);
+alter table ocached_app_detail add constraint fk_ocached_app_detail_app_id foreign key (app_id) references ocached_app (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;
+
+create index ix_omvertex_other_omvertex_id on omvertex_other (omvertex_id);
+alter table omvertex_other add constraint fk_omvertex_other_omvertex_id foreign key (omvertex_id) references omvertex (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_account_child_dbo_banana_rama_id on om_account_child_dbo (banana_rama_id);
+alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_rama_id foreign key (banana_rama_id) references om_account_dbo (id) on delete restrict on update restrict;
+
+create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
+alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (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;
+
+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;
+
+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;
+
+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;
+
+create index ix_order_referenced_parent_master_id on order_referenced_parent (master_id);
+alter table order_referenced_parent add constraint fk_order_referenced_parent_master_id foreign key (master_id) references order_master (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;
+
+create index ix_order_toy_child_id on order_toy (child_id);
+alter table order_toy add constraint fk_order_toy_child_id foreign key (child_id) references order_referenced_parent (id) on delete restrict on update restrict;
+
+create index ix_ordered_parent_order_master_inheritance_id on ordered_parent (order_master_inheritance_id);
+alter table ordered_parent add constraint fk_ordered_parent_order_master_inheritance_id foreign key (order_master_inheritance_id) references order_master_inheritance (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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+create index ix_pcf_calendar_pcf_person_id on pcf_calendar (pcf_person_id);
+alter table pcf_calendar add constraint fk_pcf_calendar_pcf_person_id foreign key (pcf_person_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_city_pcf_country_id on pcf_city (pcf_country_id);
+alter table pcf_city add constraint fk_pcf_city_pcf_country_id foreign key (pcf_country_id) references pcf_country (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_mayor_id foreign key (mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_vice_mayor_id foreign key (vice_mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_event_pcf_calendar_id on pcf_event (pcf_calendar_id);
+alter table pcf_event add constraint fk_pcf_event_pcf_calendar_id foreign key (pcf_calendar_id) references pcf_calendar (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;
+
+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;
+
+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_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 referenced_defaults_model add constraint fk_referenced_defaults_model_id foreign key (id) references referenced_defaults_model_draft (id) on delete restrict on update restrict;
+
+create index ix_referenced_defaults_model_defaults_model_id on referenced_defaults_model (defaults_model_id);
+alter table referenced_defaults_model add constraint fk_referenced_defaults_model_defaults_model_id foreign key (defaults_model_id) references defaults_model (id) on delete restrict on update restrict;
+
+create index ix_referenced_defaults_model_draft_defaults_model_id on referenced_defaults_model_draft (defaults_model_id);
+alter table referenced_defaults_model_draft add constraint fk_referenced_defaults_model_draft_defaults_model_id foreign key (defaults_model_id) references defaults_model_draft (id) 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;
+
+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_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_root_bean_referencing_bean_id on root_bean (referencing_bean_id);
+alter table root_bean add constraint fk_root_bean_referencing_bean_id foreign key (referencing_bean_id) references referencing_bean (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;
+
+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;
+
+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;
+
+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;
+
+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_source_base_target_id on source_base (target_id);
+alter table source_base add constraint fk_source_base_target_id foreign key (target_id) references target_base (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;
+
+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;
+
+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;
+
+create index ix_ttruck_holder_truck_plate_no on ttruck_holder (truck_plate_no);
+alter table ttruck_holder add constraint fk_ttruck_holder_truck_plate_no foreign key (truck_plate_no) references tcar (plate_no) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_basic_id on ttruck_holder (basic_id);
+alter table ttruck_holder add constraint fk_ttruck_holder_basic_id foreign key (basic_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_item_owner_id on ttruck_holder_item (owner_id);
+alter table ttruck_holder_item add constraint fk_ttruck_holder_item_owner_id foreign key (owner_id) references ttruck_holder (id) 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;
+
+create index ix_tree_entity_parent_id on tree_entity (parent_id);
+alter table tree_entity add constraint fk_tree_entity_parent_id foreign key (parent_id) references tree_entity (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+create index ix_version_child_parent_id on version_child (parent_id);
+alter table version_child add constraint fk_version_child_parent_id foreign key (parent_id) references version_parent (id) on delete restrict on update restrict;
+
+create index ix_version_toy_child_id on version_toy (child_id);
+alter table version_toy add constraint fk_version_toy_child_id foreign key (child_id) references version_child (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_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_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;
+
+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;
+
+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 system versioning;
+alter table hi_link add system versioning;
+alter table hi_link_doc add system versioning;
+alter table hi_tone add system versioning;
+alter table hi_tthree add system versioning;
+alter table hi_ttwo add system versioning;
+alter table hsd_setting add system versioning;
+alter table hsd_user add system versioning;
+alter table link add system versioning;
+alter table c_user add system versioning;
diff --git a/ebean-core/src/test/ddl-review/mariadb-drop-all.sql b/ebean-core/src/test/ddl-review/mariadb-drop-all.sql
new file mode 100644
index 000000000..15f89f02d
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/mariadb-drop-all.sql
@@ -0,0 +1,1868 @@
+-- Generated by ebean unknown at 2020-06-29T03:48:37.908711Z
+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;
+
+alter table o_address drop foreign key fk_o_address_country_code;
+drop index ix_o_address_country_code on o_address;
+
+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;
+
+alter table bbookmark drop foreign key fk_bbookmark_user_id;
+drop index ix_bbookmark_user_id on bbookmark;
+
+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_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;
+
+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 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 ciaddress drop foreign key fk_ciaddress_street_id;
+drop index ix_ciaddress_street_id on ciaddress;
+
+alter table cicustomer_parent drop foreign key fk_cicustomer_parent_address_id;
+drop index ix_cicustomer_parent_address_id on cicustomer_parent;
+
+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;
+
+alter table ckey_parent drop foreign key fk_ckey_parent_assoc_id;
+drop index ix_ckey_parent_assoc_id on ckey_parent;
+
+alter table coone_many drop foreign key fk_coone_many_coone_id;
+drop index ix_coone_many_coone_id on coone_many;
+
+alter table coroot drop foreign key fk_coroot_one_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 calculation_result drop foreign key fk_calculation_result_group_configuration_id;
+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_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;
+
+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 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;
+
+alter table contact drop foreign key fk_contact_customer_id;
+drop index ix_contact_customer_id on contact;
+
+alter table contact drop foreign key fk_contact_group_id;
+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;
+
+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 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 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 defaults_model drop foreign key fk_defaults_model_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 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 e_basicenc_relate drop foreign key fk_e_basicenc_relate_other_id;
+drop index ix_e_basicenc_relate_other_id on e_basicenc_relate;
+
+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 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;
+
+alter table einvoice drop foreign key fk_einvoice_person_id;
+drop index ix_einvoice_person_id on einvoice;
+
+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 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 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;
+
+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 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 ec_top drop foreign key fk_ec_top_person_id;
+drop index ix_ec_top_person_id on ec_top;
+
+alter table ec_top_ecs_person drop foreign key fk_ec_top_ecs_person_ec_top;
+drop index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person;
+
+alter table ec_top_ecs_person drop foreign key fk_ec_top_ecs_person_ecs_person;
+drop index ix_ec_top_ecs_person_ecs_person on ec_top_ecs_person;
+
+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 ecsm_child drop foreign key fk_ecsm_child_ecsm_parent_id;
+drop index ix_ecsm_child_ecsm_parent_id on ecsm_child;
+
+alter table td_child drop foreign key fk_td_child_parent_id;
+drop index ix_td_child_parent_id on td_child;
+
+alter table element_bean drop foreign key fk_element_bean_complex_bean_id;
+drop index ix_element_bean_complex_bean_id on element_bean;
+
+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;
+
+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 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;
+
+alter table info_contact drop foreign key fk_info_contact_company_id;
+drop index ix_info_contact_company_id on info_contact;
+
+alter table info_customer drop foreign key fk_info_customer_company_id;
+
+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_etype;
+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;
+
+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 on level1_level4;
+
+alter table level1_level4 drop foreign key fk_level1_level4_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 on level1_level2;
+
+alter table level1_level2 drop foreign key fk_level1_level2_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 on level2_level3;
+
+alter table level2_level3 drop foreign key fk_level2_level3_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 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;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_cyan_id;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_magenta_id;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_yellow_id;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_black_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 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 on mrole_muser;
+
+alter table mrole_muser drop foreign key fk_mrole_muser_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;
+
+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;
+
+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 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_bean_child drop foreign key fk_o_bean_child_cached_bean_id;
+drop index ix_o_bean_child_cached_bean_id on o_bean_child;
+
+alter table ocached_app_detail drop foreign key fk_ocached_app_detail_app_id;
+drop index ix_ocached_app_detail_app_id on ocached_app_detail;
+
+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 omvertex_other drop foreign key fk_omvertex_other_omvertex_id;
+drop index ix_omvertex_other_omvertex_id on omvertex_other;
+
+alter table oroad_show_msg drop foreign key fk_oroad_show_msg_company_id;
+
+alter table om_account_child_dbo drop foreign key fk_om_account_child_dbo_banana_rama_id;
+drop index ix_om_account_child_dbo_banana_rama_id on om_account_child_dbo;
+
+alter table om_basic_child drop foreign key fk_om_basic_child_parent_id;
+drop index ix_om_basic_child_parent_id on om_basic_child;
+
+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 order_referenced_parent drop foreign key fk_order_referenced_parent_master_id;
+drop index ix_order_referenced_parent_master_id on order_referenced_parent;
+
+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 order_toy drop foreign key fk_order_toy_child_id;
+drop index ix_order_toy_child_id on order_toy;
+
+alter table ordered_parent drop foreign key fk_ordered_parent_order_master_inheritance_id;
+drop index ix_ordered_parent_order_master_inheritance_id on ordered_parent;
+
+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;
+
+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_user_model drop foreign key fk_oto_user_model_user_optional_id;
+
+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 pcf_calendar drop foreign key fk_pcf_calendar_pcf_person_id;
+drop index ix_pcf_calendar_pcf_person_id on pcf_calendar;
+
+alter table pcf_city drop foreign key fk_pcf_city_pcf_country_id;
+drop index ix_pcf_city_pcf_country_id on pcf_city;
+
+alter table pcf_city drop foreign key fk_pcf_city_mayor_id;
+
+alter table pcf_city drop foreign key fk_pcf_city_vice_mayor_id;
+
+alter table pcf_event drop foreign key fk_pcf_event_pcf_calendar_id;
+drop index ix_pcf_event_pcf_calendar_id on pcf_event;
+
+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 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;
+
+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 referenced_defaults_model drop foreign key fk_referenced_defaults_model_id;
+
+alter table referenced_defaults_model drop foreign key fk_referenced_defaults_model_defaults_model_id;
+drop index ix_referenced_defaults_model_defaults_model_id on referenced_defaults_model;
+
+alter table referenced_defaults_model_draft drop foreign key fk_referenced_defaults_model_draft_defaults_model_id;
+drop index ix_referenced_defaults_model_draft_defaults_model_id on referenced_defaults_model_draft;
+
+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;
+
+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 root_bean drop foreign key fk_root_bean_referencing_bean_id;
+drop index ix_root_bean_referencing_bean_id on root_bean;
+
+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 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 source_base drop foreign key fk_source_base_target_id;
+drop index ix_source_base_target_id on source_base;
+
+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 ttruck_holder drop foreign key fk_ttruck_holder_truck_plate_no;
+drop index ix_ttruck_holder_truck_plate_no on ttruck_holder;
+
+alter table ttruck_holder drop foreign key fk_ttruck_holder_basic_id;
+drop index ix_ttruck_holder_basic_id on ttruck_holder;
+
+alter table ttruck_holder_item drop foreign key fk_ttruck_holder_item_owner_id;
+drop index ix_ttruck_holder_item_owner_id on ttruck_holder_item;
+
+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 tree_entity drop foreign key fk_tree_entity_parent_id;
+drop index ix_tree_entity_parent_id on tree_entity;
+
+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 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;
+
+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 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;
+
+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 version_child drop foreign key fk_version_child_parent_id;
+drop index ix_version_child_parent_id on version_child;
+
+alter table version_toy drop foreign key fk_version_toy_child_id;
+drop index ix_version_toy_child_id on version_toy;
+
+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 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;
+
+drop table if exists o_address;
+
+drop table if exists album;
+
+drop table if exists animal;
+
+drop table if exists animal_shelter;
+
+drop table if exists article;
+
+drop table if exists attribute;
+
+drop table if exists attribute_holder;
+
+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_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 ciaddress;
+
+drop table if exists cicustomer_parent;
+
+drop table if exists cistreet_parent;
+
+drop table if exists cinh_ref;
+
+drop table if exists cinh_root;
+
+drop table if exists ckey_assoc;
+
+drop table if exists ckey_detail;
+
+drop table if exists ckey_parent;
+
+drop table if exists coone;
+
+drop table if exists coone_many;
+
+drop table if exists coroot;
+
+drop table if exists calculation_result;
+
+drop table if exists cao_bean;
+
+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;
+
+drop table if exists contact;
+
+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;
+
+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 dint_parent;
+
+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;
+
+drop table if exists drot;
+
+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 defaults_model;
+
+drop table if exists defaults_model_draft;
+
+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_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;
+
+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 sp_car_door;
+
+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;
+
+drop table if exists ebasic_clob_no_ver;
+
+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_basicenc_relate;
+
+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;
+
+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;
+
+drop table if exists ebasic_json_node;
+
+drop table if exists ebasic_json_node_blob;
+
+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_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 eid_uid_bean;
+
+drop table if exists einvoice;
+
+drop table if exists e_main;
+
+drop table if exists enull_collection;
+
+drop table if exists enull_collection_detail;
+
+drop table if exists eopt_one_a;
+
+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;
+
+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 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;
+
+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 ec_top;
+
+drop table if exists ec_top_ecs_person;
+
+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 ecsm_child;
+
+drop table if exists ecsm_values;
+
+drop table if exists ecsm_one;
+
+drop table if exists ecsm_parent;
+
+drop table if exists ecsm_two;
+
+drop table if exists td_child;
+
+drop table if exists td_parent;
+
+drop table if exists element_bean;
+
+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;
+
+drop table if exists foo;
+
+drop table if exists gen_key_identity;
+
+drop table if exists gen_key_sequence;
+
+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;
+
+alter table hx_link drop system versioning;
+drop table if exists hx_link;
+
+drop table if exists hx_link_doc;
+
+drop table if exists hi_doc;
+
+alter table hi_link drop system versioning;
+drop table if exists hi_link;
+
+alter table hi_link_doc drop system versioning;
+drop table if exists hi_link_doc;
+
+alter table hi_tone drop system versioning;
+drop table if exists hi_tone;
+
+alter table hi_tthree drop system versioning;
+drop table if exists hi_tthree;
+
+alter table hi_ttwo drop system versioning;
+drop table if exists hi_ttwo;
+
+alter table hsd_setting drop system versioning;
+drop table if exists hsd_setting;
+
+alter table hsd_user drop system versioning;
+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;
+
+drop table if exists ixresource;
+
+drop table if exists info_company;
+
+drop table if exists info_contact;
+
+drop table if exists info_customer;
+
+drop table if exists inner_report;
+
+drop table if exists drel_invoice;
+
+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;
+
+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;
+
+drop table if exists level1_level2;
+
+drop table if exists level2;
+
+drop table if exists level2_level3;
+
+drop table if exists level3;
+
+drop table if exists level4;
+
+alter table link drop system versioning;
+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;
+
+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;
+
+drop table if exists mprinter;
+
+drop table if exists mprinter_state;
+
+drop table if exists mprofile;
+
+drop table if exists mprotected_construct_bean;
+
+drop table if exists mrole;
+
+drop table if exists mrole_muser;
+
+drop table if exists msome_other;
+
+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 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;
+
+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;
+
+drop table if exists noidbean;
+
+drop table if exists o_bean_child;
+
+drop table if exists ocached_app;
+
+drop table if exists ocached_app_detail;
+
+drop table if exists o_cached_bean;
+
+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;
+
+drop table if exists ocached_nkey_uid;
+
+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 omvertex;
+
+drop table if exists omvertex_other;
+
+drop table if exists oroad_show_msg;
+
+drop table if exists om_account_child_dbo;
+
+drop table if exists om_account_dbo;
+
+drop table if exists om_basic_child;
+
+drop table if exists om_basic_parent;
+
+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;
+
+drop table if exists s_orders;
+
+drop table if exists s_order_items;
+
+drop table if exists order_master;
+
+drop table if exists order_master_inheritance;
+
+drop table if exists order_referenced_parent;
+
+drop table if exists or_order_ship;
+
+drop table if exists order_toy;
+
+drop table if exists ordered_parent;
+
+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;
+
+drop table if exists oto_child;
+
+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;
+
+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 oto_user_model;
+
+drop table if exists oto_user_model_optional;
+
+drop table if exists pfile;
+
+drop table if exists pfile_content;
+
+drop table if exists paggview;
+
+drop table if exists pallet_location;
+
+drop table if exists parcel;
+
+drop table if exists parcel_location;
+
+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 pcf_calendar;
+
+drop table if exists pcf_city;
+
+drop table if exists pcf_country;
+
+drop table if exists pcf_event;
+
+drop table if exists pcf_person;
+
+drop table if exists mt_permission;
+
+drop table if exists persistent_file;
+
+drop table if exists persistent_file_content;
+
+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;
+
+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;
+
+drop table if exists referenced_defaults_model;
+
+drop table if exists referenced_defaults_model_draft;
+
+drop table if exists referencing_bean;
+
+drop table if exists region;
+
+drop table if exists rel_detail;
+
+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 root_bean;
+
+drop table if exists f_second;
+
+drop table if exists section;
+
+drop table if exists self_parent;
+
+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;
+
+drop table if exists some_new_types_bean;
+
+drop table if exists some_period_bean;
+
+drop table if exists source_base;
+
+drop table if exists stockforecast;
+
+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;
+
+drop table if exists t_mapsuper1;
+
+drop table if exists t_oneb;
+
+drop table if exists t_detail_with_other_namexxxyy;
+
+drop table if exists t_atable_thatisrelatively;
+
+drop table if exists ttruck_holder;
+
+drop table if exists ttruck_holder_item;
+
+drop table if exists tuuid_entity;
+
+drop table if exists twheel;
+
+drop table if exists twith_pre_insert;
+
+drop table if exists target_base;
+
+drop table if exists mt_tenant;
+
+drop table if exists test_annotation_base_entity;
+
+drop table if exists tire;
+
+drop table if exists sa_tire;
+
+drop table if exists tree_entity;
+
+drop table if exists trip;
+
+drop table if exists truck_ref;
+
+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;
+
+drop table if exists uuone;
+
+drop table if exists uutwo;
+
+drop table if exists oto_user;
+
+alter table c_user drop system versioning;
+drop table if exists c_user;
+
+drop table if exists tx_user;
+
+drop table if exists g_user;
+
+drop table if exists em_user;
+
+drop table if exists user_interest_live;
+
+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 version_child;
+
+drop table if exists version_parent;
+
+drop table if exists version_toy;
+
+drop table if exists warehouses;
+
+drop table if exists warehousesshippingzones;
+
+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;
+
+drop table if exists with_zero;
+
+drop table if exists parent;
+
+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;
+drop index ix_efile2_no_fk_owner_id on efile2_no_fk;
+drop index ix_ecsm_values_host_id on ecsm_values;
+drop index ix_order_referenced_parent_type on order_referenced_parent;
+drop index ix_organization_node_kind on organization_node;
+drop index ano_3 on test_annotation_base_entity;
diff --git a/ebean-core/src/test/ddl-review/mysql-create-all.sql b/ebean-core/src/test/ddl-review/mysql-create-all.sql
new file mode 100644
index 000000000..b81d42511
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/mysql-create-all.sql
@@ -0,0 +1,5008 @@
+-- Generated by ebean unknown at 2020-02-21T19:45:37.488834Z
+create table asimple_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_asimple_bean primary key (id)
+);
+
+create table bar (
+  bar_type                      varchar(31) 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 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),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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,
+  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                            integer 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,
+  dog_size                      varchar(255),
+  constraint pk_animal primary key (id)
+);
+
+create table animal_shelter (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_animal_shelter primary key (id)
+);
+
+create table article (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  author                        varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_article primary key (id)
+);
+
+create table attribute (
+  option_type                   integer(31) not null,
+  id                            integer auto_increment not null,
+  attribute_holder_id           integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_attribute primary key (id)
+);
+
+create table attribute_holder (
+  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 table audit_log (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  modified_description          varchar(255),
+  constraint pk_audit_log primary key (id)
+);
+
+create table bbookmark (
+  id                            integer auto_increment not null,
+  bookmark_reference            varchar(255),
+  user_id                       integer,
+  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)
+);
+
+create table bsimple_with_gen (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  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_a (
+  site_id                       varchar(40) not null,
+  user_id                       varchar(40) not null,
+  access_level                  integer,
+  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 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 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),
+  constraint pk_buser primary key (id)
+);
+
+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,
+  constraint pk_basic_joda_entity primary key (id)
+);
+
+create table bean_with_time_zone (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  timezone                      varchar(20),
+  constraint pk_bean_with_time_zone primary key (id)
+);
+
+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 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,
+  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),
+  constraint pk_ckey_assoc primary key (id)
+);
+
+create table ckey_detail (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  one_key                       integer,
+  two_key                       varchar(127),
+  constraint pk_ckey_detail primary key (id)
+);
+
+create table ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  assoc_id                      integer,
+  version                       integer not null,
+  constraint pk_ckey_parent primary key (one_key,two_key)
+);
+
+create table coone (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_coone primary key (id)
+);
+
+create table coone_many (
+  id                            bigint auto_increment not null,
+  coone_id                      bigint not null,
+  name                          varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  constraint pk_coone_many primary key (id)
+);
+
+create table coroot (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint uq_coroot_one_id unique (one_id),
+  constraint pk_coroot primary key (id)
+);
+
+create table calculation_result (
+  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 table cao_bean (
+  x_cust_id                     integer not null,
+  x_type_id                     integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_cao_bean primary key (x_cust_id,x_type_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)
+);
+
+create table sp_car_car_wheels (
+  car                           bigint not null,
+  wheel                         bigint not null,
+  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,
+  brand                         varchar(255),
+  sold                          integer 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),
+  fuse_id                       bigint not null,
+  car_id                        integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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 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),
+  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 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,
+  name                          varchar(255),
+  configurations_id             integer,
+  group_name                    varchar(255),
+  product_name                  varchar(255),
+  constraint pk_configuration primary key (id)
+);
+
+create table configurations (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_configurations primary key (id)
+);
+
+create table contact (
+  id                            integer auto_increment not null,
+  first_name                    varchar(127),
+  last_name                     varchar(127),
+  phone                         varchar(255),
+  mobile                        varchar(255),
+  email                         varchar(255),
+  is_member                     tinyint(1) default 0 not null,
+  customer_id                   integer not null,
+  group_id                      integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  constraint pk_contact primary key (id)
+);
+
+create table contact_group (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_contact_group primary key (id)
+);
+
+create table contact_note (
+  id                            integer auto_increment not null,
+  contact_id                    integer,
+  title                         varchar(255),
+  note                          longtext,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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),
+  isopen                        tinyint(1) default 0 not null,
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  constraint pk_c_conversation primary key (id)
+);
+
+create table o_country (
+  code                          varchar(2) not null,
+  name                          varchar(60),
+  constraint pk_o_country primary key (code)
+);
+
+create table cover (
+  id                            bigint auto_increment not null,
+  s3_url                        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) comment 'status of the customer',
+  name                          varchar(40) not null,
+  smallnote                     varchar(100) comment 'Short notes regarding the customer',
+  anniversary                   date comment 'Join date of the customer',
+  billing_address_id            integer,
+  shipping_address_id           integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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                       varchar(255),
+  an_enum_type                  varchar(255),
+  last_updated                  datetime(6) not null,
+  constraint pk_dexh_entity primary key (oid)
+);
+
+create table dint_parent (
+  type                          integer(31) not null,
+  id                            bigint auto_increment not null,
+  val                           integer,
+  more                          varchar(255),
+  constraint pk_dint_parent primary key (id)
+);
+
+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),
+  edate                         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,
+  edate                         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,
+  edate                         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),
+  last_name                     varchar(255),
+  salary                        decimal(38),
+  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 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),
+  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_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),
+  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 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) not null,
+  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)
+);
+
+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 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),
+  title                         varchar(255),
+  description                   longtext,
+  last_update                   datetime(6) not null,
+  constraint pk_ebasic_clob primary key (id)
+);
+
+create table ebasic_clob_fetch_eager (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  description                   longtext,
+  last_update                   datetime(6) not null,
+  constraint pk_ebasic_clob_fetch_eager primary key (id)
+);
+
+create table ebasic_clob_no_ver (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  description                   longtext,
+  constraint pk_ebasic_clob_no_ver primary key (id)
+);
+
+create table e_basicenc (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varbinary(80),
+  dob                           varbinary(20),
+  status                        varbinary(20),
+  last_update                   datetime(6),
+  constraint pk_e_basicenc primary key (id)
+);
+
+create table e_basicenc_bin (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  data                          longblob,
+  some_time                     varbinary(255),
+  last_update                   datetime(6) not null,
+  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_basicenc_relate (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  other_id                      integer,
+  constraint pk_e_basicenc_relate primary key (id)
+);
+
+create table e_basic_enum_id (
+  status                        varchar(1) not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  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 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_jackson (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  value_set                     json,
+  value_list                    json,
+  value_map                     json,
+  plain_value                   json,
+  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                     json,
+  value_list                    json,
+  value_map                     json,
+  plain_value                   json,
+  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),
+  bean_set                      json,
+  bean_list                     json,
+  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                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map primary key (id)
+);
+
+create table ebasic_json_map_blob (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longblob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_blob primary key (id)
+);
+
+create table ebasic_json_map_clob (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longtext,
+  version                       bigint not null,
+  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                       json,
+  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),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_json_b primary key (id)
+);
+
+create table ebasic_json_map_varchar (
+  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 table ebasic_json_node (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node primary key (id)
+);
+
+create table ebasic_json_node_blob (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longblob,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_blob primary key (id)
+);
+
+create table ebasic_json_node_json_b (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_json_b primary key (id)
+);
+
+create table ebasic_json_node_varchar (
+  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 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),
+  description                   varchar(255),
+  other                         varchar(255),
+  last_update                   datetime(6) not null,
+  constraint pk_e_basicver primary key (id)
+);
+
+create table e_basic_withlife (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  other                         varchar(255),
+  deleted                       tinyint(1) default 0 not null,
+  version                       bigint not null,
+  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),
+  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 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),
+  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 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),
+  outer_id                      integer,
+  update_count                  integer not null,
+  constraint pk_eemb_inner primary key (id)
+);
+
+create table eemb_outer (
+  id                            integer auto_increment not null,
+  nome_outer                    varchar(255),
+  date1                         datetime(6),
+  date2                         datetime(6),
+  update_count                  integer not null,
+  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),
+  version                       bigint 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 table eid_uid_bean (
+  id                            bigint auto_increment not null,
+  uuid                          varchar(40) not null,
+  name                          varchar(255),
+  constraint uq_eid_uid_bean_uuid unique (uuid),
+  constraint pk_eid_uid_bean primary key (id)
+);
+
+create table einvoice (
+  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),
+  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 pk_einvoice primary key (id)
+);
+
+create table e_main (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_e_main primary key (id)
+);
+
+create table enull_collection (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_enull_collection primary key (id)
+);
+
+create table enull_collection_detail (
+  id                            integer auto_increment not null,
+  enull_collection_id           integer not null,
+  something                     varchar(255),
+  constraint pk_enull_collection_detail primary key (id)
+);
+
+create table eopt_one_a (
+  id                            integer auto_increment not null,
+  name_for_a                    varchar(255),
+  b_id                          integer,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_a primary key (id)
+);
+
+create table eopt_one_b (
+  id                            integer auto_increment not null,
+  name_for_b                    varchar(255),
+  c_id                          integer 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 table eopt_one_c (
+  id                            integer auto_increment not null,
+  name_for_c                    varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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),
+  notes                         varchar(255),
+  street                        varchar(255),
+  suburb                        varchar(255),
+  addr_city                     varchar(255),
+  addr_status                   varchar(3),
+  version                       bigint not null,
+  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),
+  locale                        varchar(20),
+  time_zone                     varchar(20),
+  constraint pk_esome_type primary key (id)
+);
+
+create table etrans_many (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  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 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),
+  constraint pk_evanilla_collection primary key (id)
+);
+
+create table evanilla_collection_detail (
+  id                            integer auto_increment not null,
+  evanilla_collection_id        integer not null,
+  something                     varchar(255),
+  constraint pk_evanilla_collection_detail primary key (id)
+);
+
+create table ewho_props (
+  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,
+  constraint pk_ewho_props primary key (id)
+);
+
+create table e_withinet (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  inet_address                  varchar(50),
+  inet2                         varchar(255),
+  cidr                          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 ec_top (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  person_id                     bigint,
+  version                       bigint not null,
+  constraint pk_ec_top primary key (id)
+);
+
+create table ec_top_ecs_person (
+  ec_top_id                     bigint not null,
+  ecs_person_id                 bigint not null,
+  constraint pk_ec_top_ecs_person primary key (ec_top_id,ecs_person_id)
+);
+
+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),
+  phnum                         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),
+  phnum                         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,
+  phnum                         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 ecsm_child (
+  one_id                        varchar(40) not null,
+  ecsm_parent_id                bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_child primary key (one_id)
+);
+
+create table ecsm_values (
+  host_id                       varchar(40) not null,
+  value                         varchar(255) not null
+);
+
+create table ecsm_one (
+  one_id                        varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_one primary key (one_id)
+);
+
+create table ecsm_parent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_parent primary key (id)
+);
+
+create table ecsm_two (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_two primary key (id)
+);
+
+create table td_child (
+  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 table td_parent (
+  parent_type                   varchar(31) 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 table element_bean (
+  id                            bigint auto_increment not null,
+  complex_bean_id               varchar(40) not null,
+  value                         varchar(255) not null,
+  constraint pk_element_bean primary key (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 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),
+  description                   varchar(255),
+  constraint pk_feature_desc primary key (id)
+);
+
+create table f_first (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_f_first primary key (id)
+);
+
+create table foo (
+  foo_id                        integer auto_increment not null,
+  important_text                varchar(255),
+  version                       integer not null,
+  constraint pk_foo primary key (foo_id)
+);
+
+create table gen_key_identity (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  constraint pk_gen_key_identity primary key (id)
+);
+
+create table gen_key_sequence (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  constraint pk_gen_key_sequence primary key (id)
+);
+
+create table gen_key_table (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  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 not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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,
+  deleted                       tinyint(1) default 0 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 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),
+  owner_id                      bigint not null,
+  constraint pk_imrelated primary key (id)
+);
+
+create table imroot (
+  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 table ixresource (
+  dtype                         varchar(255),
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_ixresource primary key (id)
+);
+
+create table info_company (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_info_company primary key (id)
+);
+
+create table info_contact (
+  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 table info_customer (
+  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 table inner_report (
+  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 table drel_invoice (
+  id                            bigint auto_increment not null,
+  booking                       bigint,
+  version                       integer not null,
+  constraint pk_drel_invoice primary key (id)
+);
+
+create table item (
+  customer                      integer not null,
+  itemnumber                    varchar(127) not null,
+  description                   varchar(255),
+  units                         varchar(255),
+  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 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),
+  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),
+  constraint pk_level1 primary key (id)
+);
+
+create table level1_level4 (
+  level1_id                     bigint not null,
+  level4_id                     bigint not null,
+  constraint pk_level1_level4 primary key (level1_id,level4_id)
+);
+
+create table level1_level2 (
+  level1_id                     bigint not null,
+  level2_id                     bigint not null,
+  constraint pk_level1_level2 primary key (level1_id,level2_id)
+);
+
+create table level2 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_level2 primary key (id)
+);
+
+create table level2_level3 (
+  level2_id                     bigint not null,
+  level3_id                     bigint not null,
+  constraint pk_level2_level3 primary key (level2_id,level3_id)
+);
+
+create table level3 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_level3 primary key (id)
+);
+
+create table level4 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  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),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_la_attr_value primary key (id)
+);
+
+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 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,
+  url                           varchar(255),
+  note                          varchar(255),
+  constraint pk_mmedia primary key (id)
+);
+
+create table non_updateprop (
+  id                            integer auto_increment not null,
+  non_enum                      varchar(5),
+  name                          varchar(255),
+  note                          varchar(255),
+  constraint pk_non_updateprop primary key (id)
+);
+
+create table mprinter (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  flags                         bigint not null,
+  current_state_id              bigint,
+  last_swap_cyan_id             bigint,
+  last_swap_magenta_id          bigint,
+  last_swap_yellow_id           bigint,
+  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_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 table mprinter_state (
+  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 table mprofile (
+  id                            bigint auto_increment not null,
+  picture_id                    bigint,
+  name                          varchar(255),
+  constraint pk_mprofile primary key (id)
+);
+
+create table mprotected_construct_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_mprotected_construct_bean primary key (id)
+);
+
+create table mrole (
+  roleid                        integer auto_increment not null,
+  role_name                     varchar(255),
+  constraint pk_mrole primary key (roleid)
+);
+
+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                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_msome_other primary key (id)
+);
+
+create table muser (
+  userid                        integer auto_increment not null,
+  user_name                     varchar(255),
+  user_type_id                  integer,
+  constraint pk_muser primary key (userid)
+);
+
+create table muser_type (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  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 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),
+  when_created                  datetime(6) not null,
+  when_updated                  datetime(6) not null,
+  constraint pk_map_super_actual primary key (id)
+);
+
+create table c_message (
+  id                            bigint auto_increment not null,
+  title                         varchar(255),
+  body                          varchar(255),
+  conversation_id               bigint,
+  user_id                       bigint,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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),
+  version                       integer not null,
+  constraint pk_mnoc_role primary key (role_id)
+);
+
+create table mnoc_user (
+  user_id                       integer auto_increment not null,
+  user_name                     varchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_user primary key (user_id)
+);
+
+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                            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,
+  code                          varchar(255),
+  organization_id               bigint,
+  constraint pk_mp_role primary key (id)
+);
+
+create table mp_user (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  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 not null,
+  my_lob                        longtext,
+  constraint pk_my_lob_size primary key (id)
+);
+
+create table my_lob_size_join_many (
+  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 table noidbean (
+  name                          varchar(255),
+  subject                       varchar(255),
+  when_created                  datetime(6) not null
+);
+
+create table o_bean_child (
+  id                            bigint auto_increment not null,
+  cached_bean_id                bigint,
+  constraint pk_o_bean_child primary key (id)
+);
+
+create table ocached_app (
+  id                            bigint auto_increment not null,
+  app_name                      varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_app_name unique (app_name),
+  constraint pk_ocached_app primary key (id)
+);
+
+create table ocached_app_detail (
+  id                            bigint auto_increment not null,
+  app_id                        bigint not null,
+  detail                        varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_detail_app_id_detail unique (app_id,detail),
+  constraint pk_ocached_app_detail primary key (id)
+);
+
+create table o_cached_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_o_cached_bean primary key (id)
+);
+
+create table o_cached_bean_country (
+  o_cached_bean_id              bigint not null,
+  o_country_code                varchar(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                            bigint auto_increment not null,
+  cached_bean_id                bigint,
+  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),
+  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 ocached_nkey_uid (
+  id                            bigint auto_increment not null,
+  cid                           varchar(40),
+  other                         varchar(255),
+  version                       bigint not null,
+  constraint pk_ocached_nkey_uid primary key (id)
+);
+
+create table ocar (
+  id                            integer auto_increment not null,
+  vin                           varchar(255),
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  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                     varchar(40) not null,
+  short_desc                    varchar(255),
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_oengine_car_id unique (car_id),
+  constraint pk_oengine primary key (engine_id)
+);
+
+create table ogear_box (
+  id                            varchar(40) not null,
+  box_desc                      varchar(255),
+  box_size                      integer,
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_ogear_box_car_id unique (car_id),
+  constraint pk_ogear_box primary key (id)
+);
+
+create table omvertex (
+  id                            varchar(40) not null,
+  constraint pk_omvertex primary key (id)
+);
+
+create table omvertex_other (
+  id                            varchar(40) not null,
+  omvertex_id                   varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_omvertex_other 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_account_child_dbo (
+  id                            bigint auto_increment not null,
+  description                   varchar(255),
+  banana_rama_id                bigint,
+  constraint pk_om_account_child_dbo primary key (id)
+);
+
+create table om_account_dbo (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_om_account_dbo primary key (id)
+);
+
+create table om_basic_child (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_om_basic_child primary key (id)
+);
+
+create table om_basic_parent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_basic_parent 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 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,
+  order_date                    date,
+  ship_date                     date,
+  kcustomer_id                  integer not null,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  constraint pk_o_order primary key (id)
+);
+
+create table o_order_detail (
+  id                            integer auto_increment not null,
+  order_id                      integer not null,
+  order_qty                     integer,
+  ship_qty                      integer,
+  unit_price                    double,
+  product_id                    integer,
+  cretime                       datetime(6),
+  updtime                       datetime(6) not null,
+  constraint pk_o_order_detail primary key (id)
+);
+
+create table s_orders (
+  uuid                          varchar(40) not null,
+  constraint pk_s_orders primary key (uuid)
+);
+
+create table s_order_items (
+  uuid                          varchar(40) not null,
+  product_variant_uuid          varchar(255),
+  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 auto_increment not null,
+  order_id                      integer,
+  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 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 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 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),
+  master_id                     bigint,
+  constraint uq_oto_child_master_id unique (master_id),
+  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_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),
+  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_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,
+  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 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),
+  file_content_id               integer,
+  file_content2_id              integer,
+  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 table pfile_content (
+  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 table paggview (
+  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 auto_increment not null,
+  zone_sid                      integer not null,
+  attribute                     varchar(255),
+  constraint pk_pallet_location primary key (id)
+);
+
+create table parcel (
+  parcelid                      bigint auto_increment not null,
+  description                   varchar(255),
+  constraint pk_parcel primary key (parcelid)
+);
+
+create table parcel_location (
+  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 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)
+);
+
+create table rawinherit_parent_rawinherit_data (
+  rawinherit_parent_id          bigint not null,
+  rawinherit_data_id            bigint not null,
+  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),
+  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,
+  type                          integer,
+  conversation_id               bigint not null,
+  user_id                       bigint not null,
+  version                       bigint not null,
+  when_created                  datetime(6) not null,
+  when_modified                 datetime(6) not null,
+  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 pcf_calendar (
+  id                            bigint auto_increment not null,
+  pcf_person_id                 bigint not null,
+  version                       bigint not null,
+  constraint pk_pcf_calendar primary key (id)
+);
+
+create table pcf_city (
+  id                            bigint auto_increment not null,
+  pcf_country_id                bigint not null,
+  name                          varchar(255),
+  mayor_id                      bigint not null,
+  vice_mayor_id                 bigint not null,
+  version                       bigint not null,
+  constraint uq_pcf_city_mayor_id unique (mayor_id),
+  constraint uq_pcf_city_vice_mayor_id unique (vice_mayor_id),
+  constraint pk_pcf_city primary key (id)
+);
+
+create table pcf_country (
+  id                            bigint auto_increment not null,
+  version                       bigint not null,
+  constraint pk_pcf_country primary key (id)
+);
+
+create table pcf_event (
+  id                            bigint auto_increment not null,
+  pcf_calendar_id               bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_event primary key (id)
+);
+
+create table pcf_person (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_person primary key (id)
+);
+
+create table mt_permission (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_mt_permission primary key (id)
+);
+
+create table persistent_file (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_persistent_file primary key (id)
+);
+
+create table persistent_file_content (
+  id                            integer auto_increment not null,
+  persistent_file_id            integer,
+  content                       longblob,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint uq_persistent_file_content_persistent_file_id unique (persistent_file_id),
+  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,
+  name                          varchar(64) not null,
+  constraint pk_persons primary key (id)
+);
+
+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 (
+  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 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,
+  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),
+  name                          varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  constraint pk_o_product primary key (id)
+);
+
+create table pp (
+  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                         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(127) not null,
+  name                          varchar(127) not null,
+  description                   varchar(255),
+  constraint pk_rcustomer primary key (company,name)
+);
+
+create table r_orders (
+  company                       varchar(127) not null,
+  order_number                  integer not null,
+  customername                  varchar(127),
+  item                          varchar(255),
+  constraint pk_r_orders primary key (company,order_number)
+);
+
+create table referencing_bean (
+  id                            varchar(40) not null,
+  constraint pk_referencing_bean primary key (id)
+);
+
+create table region (
+  customer                      integer not null,
+  type                          integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  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),
+  name                          varchar(128) not null,
+  constraint pk_resourcefile 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 em_role (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
+create table root_bean (
+  dtype                         varchar(31) not null,
+  id                            varchar(40) not null,
+  referencing_bean_id           varchar(40) not null,
+  value                         varchar(255),
+  constraint pk_root_bean primary key (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),
+  constraint pk_f_second primary key (id)
+);
+
+create table section (
+  id                            integer auto_increment not null,
+  article_id                    integer,
+  type                          integer,
+  content                       longtext,
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_section primary key (id)
+);
+
+create table self_parent (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_self_parent primary key (id)
+);
+
+create table self_ref_customer (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  referred_by_id                bigint,
+  constraint pk_self_ref_customer primary key (id)
+);
+
+create table self_ref_example (
+  id                            bigint auto_increment not null,
+  name                          varchar(255) not null,
+  parent_id                     bigint,
+  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 pk_some_enum_bean primary key (id)
+);
+
+create table some_file_bean (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  content                       longblob,
+  version                       bigint not null,
+  constraint pk_some_file_bean primary key (id)
+);
+
+create table some_new_types_bean (
+  id                            bigint auto_increment not null,
+  dow                           integer(1),
+  mth                           integer(1),
+  yr                            integer,
+  yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
+  sql_time                      time,
+  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 pk_some_new_types_bean primary key (id)
+);
+
+create table some_period_bean (
+  id                            bigint auto_increment not null,
+  anniversary                   date,
+  version                       bigint not null,
+  constraint pk_some_period_bean primary key (id)
+);
+
+create table source_base (
+  dtype                         varchar(31) not null,
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  pos                           integer not null,
+  target_id                     varchar(40),
+  constraint pk_source_base primary key (id)
+);
+
+create table stockforecast (
+  type                          varchar(31) not null,
+  id                            bigint auto_increment not null,
+  inner_report_id               bigint,
+  constraint pk_stockforecast primary key (id)
+);
+
+create table sub_section (
+  id                            integer auto_increment not null,
+  section_id                    integer,
+  title                         varchar(255),
+  cretime                       datetime(6) not null,
+  updtime                       datetime(6) not null,
+  version                       bigint not null,
+  constraint pk_sub_section primary key (id)
+);
+
+create table sub_type (
+  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 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,
+  constraint pk_tbytes_only primary key (id)
+);
+
+create table tcar (
+  type                          varchar(31) 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 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,
+  name                          varchar(255),
+  child_property                varchar(255),
+  constraint pk_tint_root primary key (id)
+);
+
+create table tjoda_entity (
+  id                            integer auto_increment not null,
+  local_time                    time,
+  constraint pk_tjoda_entity primary key (id)
+);
+
+create table t_mapsuper1 (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_t_mapsuper1 primary key (id)
+);
+
+create table t_oneb (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        tinyint(1) default 0 not null,
+  constraint pk_t_oneb primary key (id)
+);
+
+create table t_detail_with_other_namexxxyy (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  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)
+);
+
+create table t_atable_thatisrelatively (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        tinyint(1) default 0 not null,
+  constraint pk_t_atable_thatisrelatively primary key (id)
+);
+
+create table ttruck_holder (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  truck_plate_no                varchar(32) not null,
+  basic_id                      integer,
+  version                       bigint not null,
+  constraint pk_ttruck_holder primary key (id)
+);
+
+create table ttruck_holder_item (
+  id                            bigint auto_increment not null,
+  some_uid                      varchar(40),
+  foo                           varchar(255),
+  owner_id                      bigint not null,
+  constraint pk_ttruck_holder_item primary key (id)
+);
+
+create table tuuid_entity (
+  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(32) not null,
+  constraint pk_twheel primary key (id)
+);
+
+create table twith_pre_insert (
+  id                            integer auto_increment not null,
+  name                          varchar(255) not null,
+  title                         varchar(255),
+  constraint pk_twith_pre_insert primary key (id)
+);
+
+create table target_base (
+  dtype                         varchar(31) not null,
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  constraint pk_target_base primary key (id)
+);
+
+create table mt_tenant (
+  id                            varchar(40) not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mt_tenant 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 (
+  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 table sa_tire (
+  id                            bigint auto_increment not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
+
+create table tree_entity (
+  id                            integer auto_increment not null,
+  text                          varchar(255),
+  parent_id                     integer,
+  constraint pk_tree_entity primary key (id)
+);
+
+create table trip (
+  id                            integer auto_increment not null,
+  vehicle_driver_id             integer,
+  destination                   varchar(255),
+  address_id                    integer,
+  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 table truck_ref (
+  id                            integer auto_increment not null,
+  something                     varchar(255),
+  constraint pk_truck_ref primary key (id)
+);
+
+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),
+  sub_type_id                   integer,
+  version                       bigint not null,
+  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 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,
+  name                          varchar(255),
+  qty                           integer,
+  amount                        double,
+  version                       integer not null,
+  constraint pk_ut_detail primary key (id)
+);
+
+create table ut_master (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  event_date                    date,
+  version                       integer not null,
+  constraint pk_ut_master primary key (id)
+);
+
+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,
+  name                          varchar(255),
+  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 (
+  id                            bigint auto_increment not null,
+  name                          varchar(255),
+  constraint pk_tx_user primary key (id)
+);
+
+create table g_user (
+  id                            bigint auto_increment not null,
+  username                      varchar(255),
+  version                       bigint not null,
+  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 user_interest_live (
+  user_id                       bigint not null,
+  live_id                       bigint not null,
+  created_at                    datetime(6) not null,
+  constraint pk_user_interest_live primary key (user_id,live_id)
+);
+
+create table em_user_role (
+  user_id                       bigint not null,
+  role_id                       bigint not null,
+  constraint pk_em_user_role primary key (user_id,role_id)
+);
+
+create table vehicle (
+  dtype                         varchar(3) not null,
+  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(3),
+  driver                        varchar(255),
+  car_ref_id                    integer,
+  notes                         varchar(255),
+  truck_ref_id                  integer,
+  capacity                      double,
+  constraint pk_vehicle primary key (id)
+);
+
+create table vehicle_driver (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  vehicle_id                    integer,
+  address_id                    integer,
+  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 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,
+  constraint pk_warehouses primary key (id)
+);
+
+create table warehousesshippingzones (
+  warehouseid                   integer not null,
+  shippingzoneid                integer not null,
+  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,
+  car                           bigint,
+  version                       integer not null,
+  constraint pk_sa_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)
+);
+
+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)
+);
+
+create table parent (
+  id                            integer auto_increment not null,
+  name                          varchar(255),
+  constraint pk_parent primary key (id)
+);
+
+create table wview (
+  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 auto_increment not null,
+  attribute                     varchar(255),
+  constraint pk_zones primary key (id)
+);
+
+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_ecsm_values_host_id on ecsm_values (host_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;
+
+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 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;
+
+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;
+
+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_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_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;
+
+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;
+
+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;
+
+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;
+
+create index ix_coone_many_coone_id on coone_many (coone_id);
+alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_id) references coone (id) on delete restrict on update restrict;
+
+alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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;
+
+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_e_basicenc_relate_other_id on e_basicenc_relate (other_id);
+alter table e_basicenc_relate add constraint fk_e_basicenc_relate_other_id foreign key (other_id) references e_basicenc (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_ec_top_person_id on ec_top (person_id);
+alter table ec_top add constraint fk_ec_top_person_id foreign key (person_id) references ecs_person (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person (ec_top_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ec_top foreign key (ec_top_id) references ec_top (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ecs_person on ec_top_ecs_person (ecs_person_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ecs_person foreign key (ecs_person_id) references ecs_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_ecsm_child_ecsm_parent_id on ecsm_child (ecsm_parent_id);
+alter table ecsm_child add constraint fk_ecsm_child_ecsm_parent_id foreign key (ecsm_parent_id) references ecsm_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_element_bean_complex_bean_id on element_bean (complex_bean_id);
+alter table element_bean add constraint fk_element_bean_complex_bean_id foreign key (complex_bean_id) references root_bean (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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_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_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_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_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;
+
+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_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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_bean_child_cached_bean_id on o_bean_child (cached_bean_id);
+alter table o_bean_child add constraint fk_o_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
+
+create index ix_ocached_app_detail_app_id on ocached_app_detail (app_id);
+alter table ocached_app_detail add constraint fk_ocached_app_detail_app_id foreign key (app_id) references ocached_app (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;
+
+create index ix_omvertex_other_omvertex_id on omvertex_other (omvertex_id);
+alter table omvertex_other add constraint fk_omvertex_other_omvertex_id foreign key (omvertex_id) references omvertex (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_account_child_dbo_banana_rama_id on om_account_child_dbo (banana_rama_id);
+alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_rama_id foreign key (banana_rama_id) references om_account_dbo (id) on delete restrict on update restrict;
+
+create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
+alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+create index ix_pcf_calendar_pcf_person_id on pcf_calendar (pcf_person_id);
+alter table pcf_calendar add constraint fk_pcf_calendar_pcf_person_id foreign key (pcf_person_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_city_pcf_country_id on pcf_city (pcf_country_id);
+alter table pcf_city add constraint fk_pcf_city_pcf_country_id foreign key (pcf_country_id) references pcf_country (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_mayor_id foreign key (mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_vice_mayor_id foreign key (vice_mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_event_pcf_calendar_id on pcf_event (pcf_calendar_id);
+alter table pcf_event add constraint fk_pcf_event_pcf_calendar_id foreign key (pcf_calendar_id) references pcf_calendar (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;
+
+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;
+
+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_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;
+
+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;
+
+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_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_root_bean_referencing_bean_id on root_bean (referencing_bean_id);
+alter table root_bean add constraint fk_root_bean_referencing_bean_id foreign key (referencing_bean_id) references referencing_bean (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;
+
+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;
+
+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;
+
+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;
+
+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_source_base_target_id on source_base (target_id);
+alter table source_base add constraint fk_source_base_target_id foreign key (target_id) references target_base (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;
+
+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;
+
+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;
+
+create index ix_ttruck_holder_truck_plate_no on ttruck_holder (truck_plate_no);
+alter table ttruck_holder add constraint fk_ttruck_holder_truck_plate_no foreign key (truck_plate_no) references tcar (plate_no) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_basic_id on ttruck_holder (basic_id);
+alter table ttruck_holder add constraint fk_ttruck_holder_basic_id foreign key (basic_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_item_owner_id on ttruck_holder_item (owner_id);
+alter table ttruck_holder_item add constraint fk_ttruck_holder_item_owner_id foreign key (owner_id) references ttruck_holder (id) 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;
+
+create index ix_tree_entity_parent_id on tree_entity (parent_id);
+alter table tree_entity add constraint fk_tree_entity_parent_id foreign key (parent_id) references tree_entity (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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_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;
+
+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;
+
+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),
+  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;
+
+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;
+
+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;
+
+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;
+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;
+
+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 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);
+    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/ebean-core/src/test/ddl-review/mysql-drop-all.sql b/ebean-core/src/test/ddl-review/mysql-drop-all.sql
new file mode 100644
index 000000000..eb2ce81b6
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/mysql-drop-all.sql
@@ -0,0 +1,1867 @@
+-- Generated by ebean unknown at 2020-02-21T19:45:37.488834Z
+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;
+
+alter table o_address drop foreign key fk_o_address_country_code;
+drop index ix_o_address_country_code on o_address;
+
+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;
+
+alter table bbookmark drop foreign key fk_bbookmark_user_id;
+drop index ix_bbookmark_user_id on bbookmark;
+
+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_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;
+
+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 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;
+
+alter table ckey_parent drop foreign key fk_ckey_parent_assoc_id;
+drop index ix_ckey_parent_assoc_id on ckey_parent;
+
+alter table coone_many drop foreign key fk_coone_many_coone_id;
+drop index ix_coone_many_coone_id on coone_many;
+
+alter table coroot drop foreign key fk_coroot_one_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 calculation_result drop foreign key fk_calculation_result_group_configuration_id;
+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_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;
+
+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 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;
+
+alter table contact drop foreign key fk_contact_customer_id;
+drop index ix_contact_customer_id on contact;
+
+alter table contact drop foreign key fk_contact_group_id;
+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;
+
+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 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 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;
+
+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 e_basicenc_relate drop foreign key fk_e_basicenc_relate_other_id;
+drop index ix_e_basicenc_relate_other_id on e_basicenc_relate;
+
+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 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;
+
+alter table einvoice drop foreign key fk_einvoice_person_id;
+drop index ix_einvoice_person_id on einvoice;
+
+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 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 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;
+
+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 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 ec_top drop foreign key fk_ec_top_person_id;
+drop index ix_ec_top_person_id on ec_top;
+
+alter table ec_top_ecs_person drop foreign key fk_ec_top_ecs_person_ec_top;
+drop index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person;
+
+alter table ec_top_ecs_person drop foreign key fk_ec_top_ecs_person_ecs_person;
+drop index ix_ec_top_ecs_person_ecs_person on ec_top_ecs_person;
+
+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 ecsm_child drop foreign key fk_ecsm_child_ecsm_parent_id;
+drop index ix_ecsm_child_ecsm_parent_id on ecsm_child;
+
+alter table td_child drop foreign key fk_td_child_parent_id;
+drop index ix_td_child_parent_id on td_child;
+
+alter table element_bean drop foreign key fk_element_bean_complex_bean_id;
+drop index ix_element_bean_complex_bean_id on element_bean;
+
+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;
+
+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 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;
+
+alter table info_contact drop foreign key fk_info_contact_company_id;
+drop index ix_info_contact_company_id on info_contact;
+
+alter table info_customer drop foreign key fk_info_customer_company_id;
+
+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_etype;
+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;
+
+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 on level1_level4;
+
+alter table level1_level4 drop foreign key fk_level1_level4_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 on level1_level2;
+
+alter table level1_level2 drop foreign key fk_level1_level2_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 on level2_level3;
+
+alter table level2_level3 drop foreign key fk_level2_level3_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 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;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_cyan_id;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_magenta_id;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_yellow_id;
+
+alter table mprinter drop foreign key fk_mprinter_last_swap_black_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 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 on mrole_muser;
+
+alter table mrole_muser drop foreign key fk_mrole_muser_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;
+
+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;
+
+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 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_bean_child drop foreign key fk_o_bean_child_cached_bean_id;
+drop index ix_o_bean_child_cached_bean_id on o_bean_child;
+
+alter table ocached_app_detail drop foreign key fk_ocached_app_detail_app_id;
+drop index ix_ocached_app_detail_app_id on ocached_app_detail;
+
+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 omvertex_other drop foreign key fk_omvertex_other_omvertex_id;
+drop index ix_omvertex_other_omvertex_id on omvertex_other;
+
+alter table oroad_show_msg drop foreign key fk_oroad_show_msg_company_id;
+
+alter table om_account_child_dbo drop foreign key fk_om_account_child_dbo_banana_rama_id;
+drop index ix_om_account_child_dbo_banana_rama_id on om_account_child_dbo;
+
+alter table om_basic_child drop foreign key fk_om_basic_child_parent_id;
+drop index ix_om_basic_child_parent_id on om_basic_child;
+
+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 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;
+
+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_user_model drop foreign key fk_oto_user_model_user_optional_id;
+
+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 pcf_calendar drop foreign key fk_pcf_calendar_pcf_person_id;
+drop index ix_pcf_calendar_pcf_person_id on pcf_calendar;
+
+alter table pcf_city drop foreign key fk_pcf_city_pcf_country_id;
+drop index ix_pcf_city_pcf_country_id on pcf_city;
+
+alter table pcf_city drop foreign key fk_pcf_city_mayor_id;
+
+alter table pcf_city drop foreign key fk_pcf_city_vice_mayor_id;
+
+alter table pcf_event drop foreign key fk_pcf_event_pcf_calendar_id;
+drop index ix_pcf_event_pcf_calendar_id on pcf_event;
+
+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 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;
+
+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 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;
+
+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 root_bean drop foreign key fk_root_bean_referencing_bean_id;
+drop index ix_root_bean_referencing_bean_id on root_bean;
+
+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 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 source_base drop foreign key fk_source_base_target_id;
+drop index ix_source_base_target_id on source_base;
+
+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 ttruck_holder drop foreign key fk_ttruck_holder_truck_plate_no;
+drop index ix_ttruck_holder_truck_plate_no on ttruck_holder;
+
+alter table ttruck_holder drop foreign key fk_ttruck_holder_basic_id;
+drop index ix_ttruck_holder_basic_id on ttruck_holder;
+
+alter table ttruck_holder_item drop foreign key fk_ttruck_holder_item_owner_id;
+drop index ix_ttruck_holder_item_owner_id on ttruck_holder_item;
+
+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 tree_entity drop foreign key fk_tree_entity_parent_id;
+drop index ix_tree_entity_parent_id on tree_entity;
+
+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 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;
+
+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 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;
+
+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 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;
+
+drop table if exists o_address;
+
+drop table if exists album;
+
+drop table if exists animal;
+
+drop table if exists animal_shelter;
+
+drop table if exists article;
+
+drop table if exists attribute;
+
+drop table if exists attribute_holder;
+
+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_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;
+
+drop table if exists ckey_detail;
+
+drop table if exists ckey_parent;
+
+drop table if exists coone;
+
+drop table if exists coone_many;
+
+drop table if exists coroot;
+
+drop table if exists calculation_result;
+
+drop table if exists cao_bean;
+
+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;
+
+drop table if exists contact;
+
+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;
+
+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 dint_parent;
+
+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;
+
+drop table if exists drot;
+
+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;
+
+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;
+
+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 sp_car_door;
+
+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;
+
+drop table if exists ebasic_clob_no_ver;
+
+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_basicenc_relate;
+
+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;
+
+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;
+
+drop table if exists ebasic_json_node;
+
+drop table if exists ebasic_json_node_blob;
+
+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_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 eid_uid_bean;
+
+drop table if exists einvoice;
+
+drop table if exists e_main;
+
+drop table if exists enull_collection;
+
+drop table if exists enull_collection_detail;
+
+drop table if exists eopt_one_a;
+
+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;
+
+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 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;
+
+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 ec_top;
+
+drop table if exists ec_top_ecs_person;
+
+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 ecsm_child;
+
+drop table if exists ecsm_values;
+
+drop table if exists ecsm_one;
+
+drop table if exists ecsm_parent;
+
+drop table if exists ecsm_two;
+
+drop table if exists td_child;
+
+drop table if exists td_parent;
+
+drop table if exists element_bean;
+
+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;
+
+drop table if exists foo;
+
+drop table if exists gen_key_identity;
+
+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 trigger hi_tone_history_upd;
+drop trigger hi_tone_history_del;
+drop view hi_tone_with_history;
+alter table hi_tone drop column sys_period_start;
+alter table hi_tone drop column 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;
+alter table hi_tthree drop column sys_period_start;
+alter table hi_tthree drop column 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;
+alter table hi_ttwo drop column sys_period_start;
+alter table hi_ttwo drop column 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;
+alter table hsd_setting drop column sys_period_start;
+alter table hsd_setting drop column 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;
+alter table hsd_user drop column sys_period_start;
+alter table hsd_user drop column 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;
+
+drop table if exists ixresource;
+
+drop table if exists info_company;
+
+drop table if exists info_contact;
+
+drop table if exists info_customer;
+
+drop table if exists inner_report;
+
+drop table if exists drel_invoice;
+
+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;
+
+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;
+
+drop table if exists level1_level2;
+
+drop table if exists level2;
+
+drop table if exists level2_level3;
+
+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;
+
+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;
+
+drop table if exists mprinter;
+
+drop table if exists mprinter_state;
+
+drop table if exists mprofile;
+
+drop table if exists mprotected_construct_bean;
+
+drop table if exists mrole;
+
+drop table if exists mrole_muser;
+
+drop table if exists msome_other;
+
+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 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;
+
+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;
+
+drop table if exists noidbean;
+
+drop table if exists o_bean_child;
+
+drop table if exists ocached_app;
+
+drop table if exists ocached_app_detail;
+
+drop table if exists o_cached_bean;
+
+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;
+
+drop table if exists ocached_nkey_uid;
+
+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 omvertex;
+
+drop table if exists omvertex_other;
+
+drop table if exists oroad_show_msg;
+
+drop table if exists om_account_child_dbo;
+
+drop table if exists om_account_dbo;
+
+drop table if exists om_basic_child;
+
+drop table if exists om_basic_parent;
+
+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;
+
+drop table if exists s_orders;
+
+drop table if exists s_order_items;
+
+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;
+
+drop table if exists oto_child;
+
+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;
+
+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 oto_user_model;
+
+drop table if exists oto_user_model_optional;
+
+drop table if exists pfile;
+
+drop table if exists pfile_content;
+
+drop table if exists paggview;
+
+drop table if exists pallet_location;
+
+drop table if exists parcel;
+
+drop table if exists parcel_location;
+
+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 pcf_calendar;
+
+drop table if exists pcf_city;
+
+drop table if exists pcf_country;
+
+drop table if exists pcf_event;
+
+drop table if exists pcf_person;
+
+drop table if exists mt_permission;
+
+drop table if exists persistent_file;
+
+drop table if exists persistent_file_content;
+
+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;
+
+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;
+
+drop table if exists referencing_bean;
+
+drop table if exists region;
+
+drop table if exists rel_detail;
+
+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 root_bean;
+
+drop table if exists f_second;
+
+drop table if exists section;
+
+drop table if exists self_parent;
+
+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;
+
+drop table if exists some_new_types_bean;
+
+drop table if exists some_period_bean;
+
+drop table if exists source_base;
+
+drop table if exists stockforecast;
+
+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;
+
+drop table if exists t_mapsuper1;
+
+drop table if exists t_oneb;
+
+drop table if exists t_detail_with_other_namexxxyy;
+
+drop table if exists t_atable_thatisrelatively;
+
+drop table if exists ttruck_holder;
+
+drop table if exists ttruck_holder_item;
+
+drop table if exists tuuid_entity;
+
+drop table if exists twheel;
+
+drop table if exists twith_pre_insert;
+
+drop table if exists target_base;
+
+drop table if exists mt_tenant;
+
+drop table if exists test_annotation_base_entity;
+
+drop table if exists tire;
+
+drop table if exists sa_tire;
+
+drop table if exists tree_entity;
+
+drop table if exists trip;
+
+drop table if exists truck_ref;
+
+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;
+
+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;
+drop table c_user_history;
+
+drop table if exists c_user;
+
+drop table if exists tx_user;
+
+drop table if exists g_user;
+
+drop table if exists em_user;
+
+drop table if exists user_interest_live;
+
+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 wheel;
+
+drop table if exists sa_wheel;
+
+drop table if exists sp_car_wheel;
+
+drop table if exists g_who_props_otm;
+
+drop table if exists with_zero;
+
+drop table if exists parent;
+
+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;
+drop index ix_efile2_no_fk_owner_id on efile2_no_fk;
+drop index ix_ecsm_values_host_id on ecsm_values;
+drop index ix_organization_node_kind on organization_node;
diff --git a/ebean-core/src/test/ddl-review/oracle-create-all.sql b/ebean-core/src/test/ddl-review/oracle-create-all.sql
new file mode 100644
index 000000000..6c3b054cf
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/oracle-create-all.sql
@@ -0,0 +1,4826 @@
+-- Generated by ebean unknown at 2020-03-17T09:34:02.384264Z
+create table asimple_bean (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_asimple_bean primary key (id)
+);
+
+create table bar (
+  bar_type                      varchar2(31) not null,
+  bar_id                        number(10) generated by default as identity not null,
+  foo_id                        number(10) not null,
+  version                       number(10) not null,
+  constraint pk_bar primary key (bar_id)
+);
+
+create table block (
+  case_type                     number(31) not null,
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  notes                         varchar2(255),
+  constraint pk_block primary key (id)
+);
+
+create table oto_account (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_oto_account primary key (id)
+);
+
+create table acl (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_acl primary key (id)
+);
+
+create table acl_container_relation (
+  id                            number(19) generated by default as identity not null,
+  container_id                  number(19) not null,
+  acl_entry_id                  number(19) not null,
+  constraint pk_acl_container_relation primary key (id)
+);
+
+create table addr (
+  id                            number(19) generated by default as identity 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 table address (
+  oid                           number(19) generated by default as identity not null,
+  street                        varchar2(255),
+  version                       number(10) not null,
+  constraint pk_address primary key (oid)
+);
+
+create table o_address (
+  id                            number(10) generated by default as identity not null,
+  line_1                        varchar2(100),
+  line_2                        varchar2(100),
+  city                          varchar2(100),
+  cretime                       timestamp,
+  country_code                  varchar2(2),
+  updtime                       timestamp not null,
+  constraint pk_o_address primary key (id)
+);
+
+create table album (
+  id                            number(19) generated by default as identity 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 table animal (
+  species                       varchar2(255) not null,
+  id                            number(19) generated by default as identity not null,
+  shelter_id                    number(19),
+  version                       number(19) not null,
+  name                          varchar2(255),
+  registration_number           varchar2(255),
+  date_of_birth                 date,
+  dog_size                      varchar2(255),
+  constraint pk_animal primary key (id)
+);
+
+create table animal_shelter (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_animal_shelter primary key (id)
+);
+
+create table article (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  author                        varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_article primary key (id)
+);
+
+create table attribute (
+  option_type                   number(31) not null,
+  id                            number(10) generated by default as identity not null,
+  attribute_holder_id           number(10),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_attribute primary key (id)
+);
+
+create table attribute_holder (
+  id                            number(10) generated by default as identity not null,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_attribute_holder primary key (id)
+);
+
+create table audit_log (
+  id                            number(19) generated by default as identity (start with 1000 cache 100) not null,
+  description                   varchar2(255),
+  modified_description          varchar2(255),
+  constraint pk_audit_log primary key (id)
+);
+
+create table bbookmark (
+  id                            number(10) generated by default as identity not null,
+  bookmark_reference            varchar2(255),
+  user_id                       number(10),
+  constraint pk_bbookmark primary key (id)
+);
+
+create table bbookmark_org (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_bbookmark_org primary key (id)
+);
+
+create table bbookmark_user (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  password                      varchar2(255),
+  email_address                 varchar2(255),
+  country                       varchar2(255),
+  org_id                        number(10),
+  constraint pk_bbookmark_user primary key (id)
+);
+
+create table bsimple_with_gen (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_bsimple_with_gen primary key (id)
+);
+
+create table bsite (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_bsite primary key (id)
+);
+
+create table bsite_user_a (
+  site_id                       varchar2(40) not null,
+  user_id                       varchar2(40) not null,
+  access_level                  number(10),
+  version                       number(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 (
+  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 bsite_user_d (
+  site_id                       varchar2(40) not null,
+  user_id                       varchar2(40) not null,
+  access_level                  number(10),
+  version                       number(19) not null,
+  constraint ck_bsite_user_d_access_level check ( access_level in (0,1,2))
+);
+
+create table bsite_user_e (
+  site_id                       varchar2(40) not null,
+  user_id                       varchar2(40) not null,
+  access_level                  number(10),
+  constraint ck_bsite_user_e_access_level check ( access_level in (0,1,2))
+);
+
+create table buser (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_buser primary key (id)
+);
+
+create table bwith_qident (
+  id                            number(10) generated by default as identity not null,
+  "Name"                        varchar2(191),
+  "CODE"                        varchar2(255),
+  last_updated                  timestamp not null,
+  constraint uq_bwith_qident_name unique ("Name"),
+  constraint pk_bwith_qident primary key (id)
+);
+
+create table basic_draftable_bean (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_basic_draftable_bean primary key (id)
+);
+
+create table basic_draftable_bean_draft (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_basic_draftable_bean_draft primary key (id)
+);
+
+create table basic_joda_entity (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  period                        varchar2(50),
+  local_date                    date,
+  created                       timestamp not null,
+  updated                       timestamp not null,
+  version                       timestamp not null,
+  constraint pk_basic_joda_entity primary key (id)
+);
+
+create table bean_with_time_zone (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  timezone                      varchar2(20),
+  constraint pk_bean_with_time_zone primary key (id)
+);
+
+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_drl_bkng_clnt_nvc unique (client_invoice),
+  constraint pk_drel_booking primary key (id)
+);
+create sequence drel_booking_seq increment by 1;
+
+create table bw_bean (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  flags                         number(10) not null,
+  version                       number(19) not null,
+  constraint pk_bw_bean primary key (id)
+);
+
+create table cepcategory (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_cepcategory primary key (id)
+);
+
+create table cepproduct (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_cepproduct primary key (id)
+);
+
+create table cepproduct_category (
+  customer_id                   number(19) not null,
+  address_id                    number(19) not null,
+  category_id                   number(19) not null,
+  product_id                    number(19) not null,
+  priority                      number(10)
+);
+
+create table ciaddress (
+  id                            number(19) generated by default as identity not null,
+  street_id                     number(19),
+  constraint pk_ciaddress primary key (id)
+);
+
+create table cicustomer_parent (
+  dtype                         number(31) not null,
+  id                            number(19) generated by default as identity not null,
+  address_id                    number(19),
+  notes                         varchar2(255),
+  constraint pk_cicustomer_parent primary key (id)
+);
+
+create table cistreet_parent (
+  dtype                         number(31) not null,
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  num                           varchar2(255),
+  constraint pk_cistreet_parent primary key (id)
+);
+
+create table cinh_ref (
+  id                            number(10) generated by default as identity not null,
+  ref_id                        number(10),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_cinh_ref primary key (id)
+);
+
+create table cinh_root (
+  dtype                         varchar2(3) not null,
+  id                            number(10) generated by default as identity 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 table ckey_assoc (
+  id                            number(10) generated by default as identity not null,
+  assoc_one                     varchar2(255),
+  constraint pk_ckey_assoc primary key (id)
+);
+
+create table ckey_detail (
+  id                            number(10) generated by default as identity not null,
+  something                     varchar2(255),
+  one_key                       number(10),
+  two_key                       varchar2(127),
+  constraint pk_ckey_detail primary key (id)
+);
+
+create table ckey_parent (
+  one_key                       number(10) not null,
+  two_key                       varchar2(127) not null,
+  name                          varchar2(255),
+  assoc_id                      number(10),
+  version                       number(10) not null,
+  constraint pk_ckey_parent primary key (one_key,two_key)
+);
+
+create table coone (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_coone primary key (id)
+);
+
+create table coone_many (
+  id                            number(19) generated by default as identity not null,
+  coone_id                      number(19) not null,
+  name                          varchar2(255),
+  deleted                       number(1) default 0 not null,
+  constraint pk_coone_many primary key (id)
+);
+
+create table coroot (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint uq_coroot_one_id unique (one_id),
+  constraint pk_coroot primary key (id)
+);
+
+create table calculation_result (
+  id                            number(10) generated by default as identity not null,
+  charge                        number(19,4) not null,
+  product_configuration_id      number(10),
+  group_configuration_id        number(10),
+  constraint pk_calculation_result primary key (id)
+);
+
+create table cao_bean (
+  x_cust_id                     number(10) not null,
+  x_type_id                     number(10) not null,
+  description                   varchar2(255),
+  version                       number(19) not null,
+  constraint pk_cao_bean primary key (x_cust_id,x_type_id)
+);
+
+create table sp_car_car (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(10) not null,
+  constraint pk_sp_car_car primary key (id)
+);
+create sequence sp_car_car_seq increment by 1;
+
+create table sp_car_car_wheels (
+  car                           number(19) not null,
+  wheel                         number(19) not null,
+  constraint pk_sp_car_car_wheels primary key (car,wheel)
+);
+
+create table sp_car_car_doors (
+  car                           number(19) not null,
+  door                          number(19) not null,
+  constraint pk_sp_car_car_doors primary key (car,door)
+);
+
+create table sa_car (
+  id                            number(19) not null,
+  brand                         varchar2(255),
+  sold                          number(10) not null,
+  version                       number(10) not null,
+  constraint pk_sa_car primary key (id)
+);
+create sequence sa_car_seq increment by 1;
+
+create table car_accessory (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  fuse_id                       number(19) not null,
+  car_id                        number(10),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_car_accessory primary key (id)
+);
+
+create table car_fuse (
+  id                            number(19) generated by default as identity not null,
+  location_code                 varchar2(255),
+  constraint pk_car_fuse primary key (id)
+);
+
+create table category (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  surveyobjectid                number(19),
+  sequence_number               number(10) not null,
+  constraint pk_category primary key (id)
+);
+
+create table e_save_test_d (
+  id                            number(19) generated by default as identity not null,
+  parent_id                     number(19),
+  test_property                 number(1) default 0 not null,
+  version                       number(19) 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                    number(10) generated by default as identity 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 table cke_client (
+  cod_cpny                      number(10) not null,
+  cod_client                    varchar2(100) not null,
+  username                      varchar2(100) not null,
+  notes                         varchar2(255),
+  constraint pk_cke_client primary key (cod_cpny,cod_client)
+);
+
+create table cke_user (
+  username                      varchar2(100) not null,
+  cod_cpny                      number(10) not null,
+  name                          varchar2(255),
+  constraint pk_cke_user primary key (username,cod_cpny)
+);
+
+create table class_super (
+  dtype                         varchar2(31) not null,
+  sid                           number(19) generated by default as identity not null,
+  constraint pk_class_super primary key (sid)
+);
+
+create table class_super_monkey (
+  class_super_sid               number(19) not null,
+  monkey_mid                    number(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                          varchar2(21) not null,
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  configurations_id             number(10),
+  group_name                    varchar2(255),
+  product_name                  varchar2(255),
+  constraint pk_configuration primary key (id)
+);
+
+create table configurations (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_configurations primary key (id)
+);
+
+create table contact (
+  id                            number(10) generated by default as identity not null,
+  first_name                    varchar2(127),
+  last_name                     varchar2(127),
+  phone                         varchar2(255),
+  mobile                        varchar2(255),
+  email                         varchar2(255),
+  is_member                     number(1) default 0 not null,
+  customer_id                   number(10) not null,
+  group_id                      number(10),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  constraint pk_contact primary key (id)
+);
+
+create table contact_group (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_contact_group primary key (id)
+);
+
+create table contact_note (
+  id                            number(10) generated by default as identity not null,
+  contact_id                    number(10),
+  title                         varchar2(255),
+  note                          clob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_contact_note primary key (id)
+);
+
+create table contract (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_contract primary key (id)
+);
+
+create table contract_costs (
+  id                            number(19) generated by default as identity not null,
+  status                        varchar2(255),
+  position_id                   number(19) not null,
+  constraint pk_contract_costs primary key (id)
+);
+
+create table c_conversation (
+  id                            number(19) generated by default as identity not null,
+  title                         varchar2(255),
+  isopen                        number(1) default 0 not null,
+  group_id                      number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_c_conversation primary key (id)
+);
+
+create table o_country (
+  code                          varchar2(2) not null,
+  name                          varchar2(60),
+  constraint pk_o_country primary key (code)
+);
+
+create table cover (
+  id                            number(19) generated by default as identity not null,
+  s3_url                        varchar2(255),
+  deleted                       number(1) default 0 not null,
+  constraint pk_cover primary key (id)
+);
+
+create table o_customer (
+  id                            number(10) generated by default as identity not null,
+  status                        varchar2(1),
+  name                          varchar2(40) not null,
+  smallnote                     varchar2(100),
+  anniversary                   date,
+  billing_address_id            number(10),
+  shipping_address_id           number(10),
+  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 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                            number(19) generated by default as identity not null,
+  credit                        varchar2(255),
+  constraint pk_dcredit primary key (id)
+);
+
+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) generated by default as identity not null,
+  exhange                       varchar2(255),
+  an_enum_type                  varchar2(255),
+  last_updated                  timestamp not null,
+  constraint pk_dexh_entity primary key (oid)
+);
+
+create table dint_parent (
+  type                          number(31) not null,
+  id                            number(19) generated by default as identity not null,
+  val                           number(10),
+  more                          varchar2(255),
+  constraint pk_dint_parent primary key (id)
+);
+
+create table dmachine (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  organisation_id               number(19),
+  version                       number(19) not null,
+  constraint pk_dmachine primary key (id)
+);
+
+create table d_machine_aux_use (
+  id                            number(19) generated by default as identity not null,
+  machine_id                    number(19) not null,
+  name                          varchar2(255),
+  edate                         date,
+  use_secs                      number(19) not null,
+  fuel                          number(16,3),
+  version                       number(19) not null,
+  constraint pk_d_machine_aux_use primary key (id)
+);
+
+create table d_machine_stats (
+  id                            number(19) generated by default as identity not null,
+  machine_id                    number(19) not null,
+  edate                         date,
+  total_kms                     number(19) not null,
+  hours                         number(19) not null,
+  rate                          number(16,3),
+  cost                          number(16,3),
+  version                       number(19) not null,
+  constraint pk_d_machine_stats primary key (id)
+);
+
+create table d_machine_use (
+  id                            number(19) generated by default as identity not null,
+  machine_id                    number(19) not null,
+  edate                         date,
+  distance_kms                  number(19) not null,
+  time_secs                     number(19) not null,
+  fuel                          number(9,3),
+  version                       number(19) not null,
+  constraint pk_d_machine_use primary key (id)
+);
+
+create table dorg (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_dorg primary key (id)
+);
+
+create table dperson (
+  id                            number(19) generated by default as identity not null,
+  first_name                    varchar2(255),
+  last_name                     varchar2(255),
+  salary                        number(16,3),
+  constraint pk_dperson primary key (id)
+);
+
+create table drol (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_drol primary key (id)
+);
+
+create table drot (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_drot primary key (id)
+);
+
+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) generated by default as identity not null,
+  val                           number(10),
+  constraint pk_rawinherit_data primary key (id)
+);
+
+create table data_container (
+  id                            varchar2(40) not null,
+  content                       varchar2(255),
+  constraint pk_data_container primary key (id)
+);
+
+create table dc_detail (
+  id                            number(19) generated by default as identity not null,
+  master_id                     number(19),
+  description                   varchar2(255),
+  version                       number(19) not null,
+  constraint pk_dc_detail primary key (id)
+);
+
+create table dc_master (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_dc_master primary key (id)
+);
+
+create table dfk_cascade (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_cascade primary key (id)
+);
+
+create table dfk_cascade_one (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+
+create table dfk_none (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_none primary key (id)
+);
+
+create table dfk_none_via_join (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_none_via_join primary key (id)
+);
+
+create table dfk_none_via_mto_m (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(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         number(19) not null,
+  dfk_one_id                    number(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                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_dfk_one primary key (id)
+);
+
+create table dfk_set_null (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  one_id                        number(19),
+  constraint pk_dfk_set_null primary key (id)
+);
+
+create table doc (
+  id                            number(19) generated by default as identity 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 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) generated by default as identity 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 table document (
+  id                            number(19) generated by default as identity 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 table document_draft (
+  id                            number(19) generated by default as identity 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 table document_media (
+  id                            number(19) generated by default as identity 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 table document_media_draft (
+  id                            number(19) generated by default as identity 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 table sp_car_door (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(10) not null,
+  constraint pk_sp_car_door primary key (id)
+);
+create sequence sp_car_door_seq increment by 1;
+
+create table earray_bean (
+  id                            number(19) generated by default as identity not null,
+  foo                           number(10),
+  name                          varchar2(255),
+  phone_numbers                 varchar(300),
+  uids                          varchar(1000) not null,
+  other_ids                     varchar(1000),
+  doubs                         varchar(1000),
+  statuses                      varchar(1000),
+  vc_enums                      varchar(1000),
+  int_enums                     varchar(1000),
+  status2                       varchar(1000),
+  version                       number(19) not null,
+  constraint ck_earray_bean_foo check ( foo in (100,101,102)),
+  constraint pk_earray_bean primary key (id)
+);
+
+create table earray_set_bean (
+  id                            number(19) generated by default as identity 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 table e_basic (
+  id                            number(10) generated by default as identity not null,
+  status                        varchar2(1),
+  name                          varchar2(127),
+  description                   varchar2(255),
+  some_date                     timestamp,
+  constraint ck_e_basic_status check ( status in ('N','A','I')),
+  constraint pk_e_basic primary key (id)
+);
+
+create table ebasic_change_log (
+  id                            number(19) generated by default as identity 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 table ebasic_clob (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  title                         varchar2(255),
+  description                   clob,
+  last_update                   timestamp not null,
+  constraint pk_ebasic_clob primary key (id)
+);
+
+create table ebasic_clob_fetch_eager (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  title                         varchar2(255),
+  description                   clob,
+  last_update                   timestamp not null,
+  constraint pk_ebasic_clob_fetch_eager primary key (id)
+);
+
+create table ebasic_clob_no_ver (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   clob,
+  constraint pk_ebasic_clob_no_ver primary key (id)
+);
+
+create table e_basicenc (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   raw(80),
+  dob                           raw(20),
+  status                        raw(20),
+  last_update                   timestamp,
+  constraint pk_e_basicenc primary key (id)
+);
+
+create table e_basicenc_bin (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  data                          blob,
+  some_time                     raw(255),
+  last_update                   timestamp not null,
+  constraint pk_e_basicenc_bin primary key (id)
+);
+
+create table e_basicenc_client (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   raw(80),
+  dob                           raw(20),
+  status                        raw(20),
+  version                       number(19) not null,
+  constraint pk_e_basicenc_client primary key (id)
+);
+
+create table e_basicenc_relate (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  other_id                      number(10),
+  constraint pk_e_basicenc_relate primary key (id)
+);
+
+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 pk_e_basic_enum_id primary key (status)
+);
+
+create table e_basic_eni (
+  id                            number(10) generated by default as identity 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 table ebasic_hstore (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  map                           varchar2(800),
+  version                       number(19) not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+
+create table ebasic_json_jackson (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  value_set                     varchar2(700),
+  value_list                    clob,
+  value_map                     varchar2(700),
+  plain_value                   varchar2(500),
+  version                       number(19) not null,
+  constraint pk_ebasic_json_jackson primary key (id)
+);
+
+create table ebasic_json_jackson2 (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  value_set                     varchar2(700),
+  value_list                    clob,
+  value_map                     varchar2(700),
+  plain_value                   varchar2(500),
+  version                       number(19) not null,
+  constraint pk_ebasic_json_jackson2 primary key (id)
+);
+
+create table ebasic_json_list (
+  id                            number(19) generated by default as identity 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 table ebasic_json_map (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       clob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_map primary key (id)
+);
+
+create table ebasic_json_map_blob (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       blob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_map_blob primary key (id)
+);
+
+create table ebasic_json_map_clob (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       clob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_map_clob primary key (id)
+);
+
+create table ebasic_json_map_detail (
+  id                            number(19) generated by default as identity 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 table ebasic_json_map_json_b (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       clob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_map_json_b primary key (id)
+);
+
+create table ebasic_json_map_varchar (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       varchar2(3000),
+  version                       number(19) not null,
+  constraint pk_ebasic_json_map_varchar primary key (id)
+);
+
+create table ebasic_json_node (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       clob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_node primary key (id)
+);
+
+create table ebasic_json_node_blob (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       blob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_node_blob primary key (id)
+);
+
+create table ebasic_json_node_json_b (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       clob,
+  version                       number(19) not null,
+  constraint pk_ebasic_json_node_json_b primary key (id)
+);
+
+create table ebasic_json_node_varchar (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       varchar2(1000),
+  version                       number(19) not null,
+  constraint pk_ebasic_json_node_varchar primary key (id)
+);
+
+create table ebasic_json_unmapped (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
+
+create table e_basic_ndc (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_e_basic_ndc primary key (id)
+);
+
+create table ebasic_no_sdchild (
+  id                            number(19) generated by default as identity 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 table ebasic_sdchild (
+  id                            number(19) generated by default as identity 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 table ebasic_soft_delete (
+  id                            number(19) generated by default as identity 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 table e_basicver (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  other                         varchar2(255),
+  last_update                   timestamp not null,
+  constraint pk_e_basicver primary key (id)
+);
+
+create table e_basic_withlife (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  other                         varchar2(255),
+  deleted                       number(1) default 0 not null,
+  version                       number(19) not null,
+  constraint pk_e_basic_withlife primary key (id)
+);
+
+create table e_basic_with_ex (
+  id                            number(19) generated by default as identity not null,
+  deleted                       number(1) default 0 not null,
+  version                       number(19) not null,
+  constraint pk_e_basic_with_ex primary key (id)
+);
+
+create table e_basicverucon (
+  id                            number(10) generated by default as identity not null,
+  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 table ecache_child (
+  id                            varchar2(40) not null,
+  name                          varchar2(100),
+  root_id                       varchar2(40) not null,
+  constraint pk_ecache_child primary key (id)
+);
+
+create table ecache_root (
+  id                            varchar2(40) not null,
+  name                          varchar2(100),
+  constraint pk_ecache_root primary key (id)
+);
+
+create table e_col_ab (
+  id                            number(19) generated by default as identity not null,
+  column_a                      varchar2(255),
+  column_b                      varchar2(255),
+  constraint pk_e_col_ab primary key (id)
+);
+
+create table ecustom_id (
+  id                            varchar2(127) not null,
+  name                          varchar2(255),
+  constraint pk_ecustom_id primary key (id)
+);
+
+create table edefault_prop (
+  id                            number(10) generated by default as identity not null,
+  e_simple_usertypeid           number(10),
+  name                          varchar2(255),
+  constraint uq_edflt_prp__smpl_srtypd unique (e_simple_usertypeid),
+  constraint pk_edefault_prop primary key (id)
+);
+
+create table eemb_inner (
+  id                            number(10) generated by default as identity not null,
+  nome_inner                    varchar2(255),
+  outer_id                      number(10),
+  update_count                  number(10) not null,
+  constraint pk_eemb_inner primary key (id)
+);
+
+create table eemb_outer (
+  id                            number(10) generated by default as identity not null,
+  nome_outer                    varchar2(255),
+  date1                         timestamp,
+  date2                         timestamp,
+  update_count                  number(10) not null,
+  constraint pk_eemb_outer primary key (id)
+);
+
+create table efile2_no_fk (
+  file_name                     varchar2(64) not null,
+  owner_id                      number(10) not null,
+  constraint pk_efile2_no_fk primary key (file_name)
+);
+
+create table efile_no_fk (
+  file_name                     varchar2(64) not null,
+  owner_user_id                 number(10),
+  owner_soft_del_user_id        number(10),
+  constraint pk_efile_no_fk primary key (file_name)
+);
+
+create table efile_no_fk_euser_no_fk (
+  efile_no_fk_file_name         varchar2(64) not null,
+  euser_no_fk_user_id           number(10) 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_d (
+  efile_no_fk_file_name         varchar2(64) not null,
+  euser_no_fk_soft_del_user_id  number(10) not null,
+  constraint pk_efl_n_fk_sr_n_fk_sft_d primary key (efile_no_fk_file_name,euser_no_fk_soft_del_user_id)
+);
+
+create table egen_props (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) 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,
+  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)
+);
+
+create table eid_uid_bean (
+  id                            number(19) generated by default as identity not null,
+  uuid                          varchar2(40) not null,
+  name                          varchar2(255),
+  constraint uq_eid_uid_bean_uuid unique (uuid),
+  constraint pk_eid_uid_bean primary key (id)
+);
+
+create table einvoice (
+  id                            number(19) generated by default as identity not null,
+  invoice_date                  timestamp,
+  state                         number(10),
+  person_id                     number(19),
+  ship_street                   varchar2(255),
+  ship_suburb                   varchar2(255),
+  ship_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_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 table e_main (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  version                       number(19) not null,
+  constraint pk_e_main primary key (id)
+);
+
+create table enull_collection (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_enull_collection primary key (id)
+);
+
+create table enull_collection_detail (
+  id                            number(10) generated by default as identity not null,
+  enull_collection_id           number(10) not null,
+  something                     varchar2(255),
+  constraint pk_enull_collection_detail primary key (id)
+);
+
+create table eopt_one_a (
+  id                            number(10) generated by default as identity not null,
+  name_for_a                    varchar2(255),
+  b_id                          number(10),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_eopt_one_a primary key (id)
+);
+
+create table eopt_one_b (
+  id                            number(10) generated by default as identity not null,
+  name_for_b                    varchar2(255),
+  c_id                          number(10) not null,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_eopt_one_b primary key (id)
+);
+
+create table eopt_one_c (
+  id                            number(10) generated by default as identity not null,
+  name_for_c                    varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_eopt_one_c primary key (id)
+);
+
+create table eper_addr (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  ma_street                     varchar2(255),
+  ma_suburb                     varchar2(255),
+  ma_city                       varchar2(255),
+  ma_country_code               varchar2(2),
+  version                       number(19) not null,
+  constraint pk_eper_addr primary key (id)
+);
+
+create table eperson (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  notes                         varchar2(255),
+  street                        varchar2(255),
+  suburb                        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 table e_person_online (
+  id                            number(19) generated by default as identity 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 table esimple (
+  usertypeid                    number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_esimple primary key (usertypeid)
+);
+
+create table esoft_del_book (
+  id                            number(19) generated by default as identity 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 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) generated by default as identity 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 table esoft_del_mid (
+  id                            number(19) generated by default as identity 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 table esoft_del_one_a (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  oneb_id                       number(19),
+  deleted                       number(1) default 0 not null,
+  version                       number(19) 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                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_esoft_del_one_b primary key (id)
+);
+
+create table esoft_del_role (
+  id                            number(19) generated by default as identity 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 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) generated by default as identity 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 table esoft_del_up (
+  id                            number(19) generated by default as identity 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 table esoft_del_user (
+  id                            number(19) generated by default as identity 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 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) generated by default as identity not null,
+  name                          varchar2(255),
+  money                         number(16,3),
+  constraint pk_esome_convert_type primary key (id)
+);
+
+create table esome_type (
+  id                            number(10) generated by default as identity not null,
+  currency                      varchar2(3),
+  locale                        varchar2(20),
+  time_zone                     varchar2(20),
+  constraint pk_esome_type primary key (id)
+);
+
+create table etrans_many (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_etrans_many primary key (id)
+);
+
+create table rawinherit_uncle (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  parent_id                     number(19) not null,
+  version                       number(19) not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
+
+create table euser_no_fk (
+  user_id                       number(10) generated by default as identity not null,
+  user_name                     varchar2(255),
+  constraint pk_euser_no_fk primary key (user_id)
+);
+
+create table euser_no_fk_soft_del (
+  user_id                       number(10) generated by default as identity not null,
+  user_name                     varchar2(255),
+  constraint pk_euser_no_fk_soft_del primary key (user_id)
+);
+
+create table evanilla_collection (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_evanilla_collection primary key (id)
+);
+
+create table evanilla_collection_detail (
+  id                            number(10) generated by default as identity not null,
+  evanilla_collection_id        number(10) not null,
+  something                     varchar2(255),
+  constraint pk_evanilla_collection_detail primary key (id)
+);
+
+create table ewho_props (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  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 table e_withinet (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  inet_address                  varchar2(50),
+  inet2                         varchar2(255),
+  cidr                          varchar(50),
+  version                       number(19) not null,
+  constraint pk_e_withinet primary key (id)
+);
+
+create table ec_enum_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ec_enum_person primary key (id)
+);
+
+create table ec_enum_person_tags (
+  ec_enum_person_id             number(19) not null,
+  value                         varchar2(5) not null,
+  constraint ck_ec_enum_person_tags_value check ( value in ('RED','BLUE','GREEN'))
+);
+
+create table ec_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ec_person primary key (id)
+);
+
+create table ec_person_phone (
+  owner_id                      number(19) not null,
+  phone                         varchar2(255) not null
+);
+
+create table ec_top (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  person_id                     number(19),
+  version                       number(19) not null,
+  constraint pk_ec_top primary key (id)
+);
+
+create table ec_top_ecs_person (
+  ec_top_id                     number(19) not null,
+  ecs_person_id                 number(19) not null,
+  constraint pk_ec_top_ecs_person primary key (ec_top_id,ecs_person_id)
+);
+
+create table ecbl_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecbl_person primary key (id)
+);
+
+create table ecbl_person_phone_numbers (
+  person_id                     number(19) not null,
+  country_code                  varchar2(2),
+  area                          varchar2(6),
+  phnum                         varchar2(20)
+);
+
+create table ecbm_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecbm_person primary key (id)
+);
+
+create table ecbm_person_phone_numbers (
+  person_id                     number(19) not null,
+  mkey                          varchar2(255) not null,
+  country_code                  varchar2(2),
+  area                          varchar2(6),
+  phnum                         varchar2(20)
+);
+
+create table ecm_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecm_person primary key (id)
+);
+
+create table ecm_person_phone_numbers (
+  ecm_person_id                 number(19) not null,
+  type                          varchar2(4) not null,
+  phnum                         varchar2(10) not null
+);
+
+create table ecmc_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecmc_person primary key (id)
+);
+
+create table ecmc_person_phone_numbers (
+  ecmc_person_id                number(19) not null,
+  type                          varchar2(4) not null,
+  value                         clob not null
+);
+
+create table ecs_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecs_person primary key (id)
+);
+
+create table ecs_person_phone (
+  ecs_person_id                 number(19) not null,
+  phone                         varchar2(255) not null
+);
+
+create table ecsm_child (
+  one_id                        varchar2(40) not null,
+  ecsm_parent_id                number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecsm_child primary key (one_id)
+);
+
+create table ecsm_values (
+  host_id                       varchar2(40) not null,
+  value                         varchar2(255) not null
+);
+
+create table ecsm_one (
+  one_id                        varchar2(40) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecsm_one primary key (one_id)
+);
+
+create table ecsm_parent (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecsm_parent primary key (id)
+);
+
+create table ecsm_two (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ecsm_two primary key (id)
+);
+
+create table td_child (
+  child_id                      number(10) generated by default as identity not null,
+  child_name                    varchar2(255),
+  parent_id                     number(10) not null,
+  constraint pk_td_child primary key (child_id)
+);
+
+create table td_parent (
+  parent_type                   varchar2(31) not null,
+  parent_id                     number(10) generated by default as identity not null,
+  parent_name                   varchar2(255),
+  extended_name                 varchar2(255),
+  constraint pk_td_parent primary key (parent_id)
+);
+
+create table element_bean (
+  id                            number(19) generated by default as identity not null,
+  complex_bean_id               varchar2(40) not null,
+  value                         varchar2(255) not null,
+  constraint pk_element_bean primary key (id)
+);
+
+create table empl (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  age                           number(10),
+  default_address_id            number(19),
+  constraint pk_empl primary key (id)
+);
+
+create table esd_detail (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  master_id                     number(19) not null,
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esd_detail primary key (id)
+);
+
+create table esd_master (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_esd_master primary key (id)
+);
+
+create table feature_desc (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  constraint pk_feature_desc primary key (id)
+);
+
+create table f_first (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_f_first primary key (id)
+);
+
+create table foo (
+  foo_id                        number(10) generated by default as identity not null,
+  important_text                varchar2(255),
+  version                       number(10) not null,
+  constraint pk_foo primary key (foo_id)
+);
+
+create table gen_key_identity (
+  id                            number(19) generated by default as identity not null,
+  description                   varchar2(255),
+  constraint pk_gen_key_identity primary key (id)
+);
+
+create table gen_key_sequence (
+  id                            number(19) not null,
+  description                   varchar2(255),
+  constraint pk_gen_key_sequence primary key (id)
+);
+create sequence SEQ_NAME increment by 1;
+
+create table grand_parent_person (
+  identifier                    number(10) generated by default as identity 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 table survey_group (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  categoryobjectid              number(19),
+  sequence_number               number(10) not null,
+  constraint pk_survey_group primary key (id)
+);
+
+create table c_group (
+  id                            number(19) generated by default as identity not null,
+  inactive                      number(1) default 0 not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_c_group primary key (id)
+);
+
+create table he_doc (
+  id                            number(19) generated by default as identity 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 table hx_link (
+  id                            number(19) generated by default as identity 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,
+  deleted                       number(1) default 0 not null,
+  constraint pk_hx_link primary key (id)
+);
+
+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) generated by default as identity 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 table hi_link (
+  id                            number(19) generated by default as identity 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 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 hi_tone (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  comments                      varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_tone primary key (id)
+);
+
+create table hi_tthree (
+  id                            number(19) generated by default as identity not null,
+  hi_ttwo_id                    number(19) not null,
+  three                         varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_tthree primary key (id)
+);
+
+create table hi_ttwo (
+  id                            number(19) generated by default as identity not null,
+  hi_tone_id                    number(19) not null,
+  two                           varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_hi_ttwo primary key (id)
+);
+
+create table hsd_setting (
+  id                            number(19) generated by default as identity not null,
+  code                          varchar2(255),
+  content                       varchar2(255),
+  user_id                       number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  deleted                       number(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                            number(19) generated by default as identity not null,
+  name                          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_hsd_user primary key (id)
+);
+
+create table iaf_segment (
+  ptype                         varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  segment_id_zat                number(19) not null,
+  status_id                     number(19) not null,
+  constraint pk_iaf_segment primary key (id)
+);
+
+create table iaf_segment_status (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_iaf_segment_status primary key (id)
+);
+
+create table imrelated (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  owner_id                      number(19) not null,
+  constraint pk_imrelated primary key (id)
+);
+
+create table imroot (
+  dtype                         varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  title                         varchar2(255),
+  when_title                    timestamp,
+  constraint pk_imroot primary key (id)
+);
+
+create table ixresource (
+  dtype                         varchar2(255),
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_ixresource primary key (id)
+);
+
+create table info_company (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_info_company primary key (id)
+);
+
+create table info_contact (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  company_id                    number(19) not null,
+  version                       number(19) not null,
+  constraint pk_info_contact primary key (id)
+);
+
+create table info_customer (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  company_id                    number(19),
+  version                       number(19) not null,
+  constraint uq_info_customer_company_id unique (company_id),
+  constraint pk_info_customer primary key (id)
+);
+
+create table inner_report (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  forecast_id                   number(19),
+  constraint uq_inner_report_forecast_id unique (forecast_id),
+  constraint pk_inner_report primary key (id)
+);
+
+create table drel_invoice (
+  id                            number(19) not null,
+  booking                       number(19),
+  version                       number(10) not null,
+  constraint pk_drel_invoice primary key (id)
+);
+create sequence drel_invoice_seq increment by 1;
+
+create table item (
+  customer                      number(10) not null,
+  itemnumber                    varchar2(127) not null,
+  description                   varchar2(255),
+  units                         varchar2(255),
+  type                          number(10) not null,
+  region                        number(10) not null,
+  date_modified                 timestamp,
+  date_created                  timestamp,
+  modified_by                   varchar2(255),
+  created_by                    varchar2(255),
+  version                       number(19) not null,
+  constraint pk_item primary key (customer,itemnumber)
+);
+
+create table monkey (
+  mid                           number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  food_preference               varchar2(255),
+  version                       number(19) not null,
+  constraint pk_monkey primary key (mid)
+);
+
+create table mkeygroup (
+  pid                           number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mkeygroup primary key (pid)
+);
+
+create table mkeygroup_monkey (
+  mkeygroup_pid                 number(19) not null,
+  monkey_mid                    number(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                           number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_trainer primary key (tid)
+);
+
+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) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_troop primary key (pid)
+);
+
+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) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+
+create table l2_cldf_reset_bean_child (
+  id                            number(19) generated by default as identity not null,
+  parent_id                     number(19),
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+
+create table level1 (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_level1 primary key (id)
+);
+
+create table level1_level4 (
+  level1_id                     number(19) not null,
+  level4_id                     number(19) not null,
+  constraint pk_level1_level4 primary key (level1_id,level4_id)
+);
+
+create table level1_level2 (
+  level1_id                     number(19) not null,
+  level2_id                     number(19) not null,
+  constraint pk_level1_level2 primary key (level1_id,level2_id)
+);
+
+create table level2 (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_level2 primary key (id)
+);
+
+create table level2_level3 (
+  level2_id                     number(19) not null,
+  level3_id                     number(19) not null,
+  constraint pk_level2_level3 primary key (level2_id,level3_id)
+);
+
+create table level3 (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_level3 primary key (id)
+);
+
+create table level4 (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_level4 primary key (id)
+);
+
+create table link (
+  id                            number(19) generated by default as identity 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 table link_draft (
+  id                            number(19) generated by default as identity 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 table la_attr_value (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_la_attr_value primary key (id)
+);
+
+create table la_attr_value_attribute (
+  la_attr_value_id              number(10) not null,
+  attribute_id                  number(10) not null,
+  constraint pk_la_attr_value_attribute primary key (la_attr_value_id,attribute_id)
+);
+
+create table looney (
+  id                            number(19) generated by default as identity not null,
+  tune_id                       number(19),
+  name                          varchar2(255),
+  constraint pk_looney primary key (id)
+);
+
+create table maddress (
+  id                            varchar2(40) not null,
+  street                        varchar2(255),
+  city                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_maddress primary key (id)
+);
+
+create table mcontact (
+  id                            varchar2(40) not null,
+  email                         varchar2(255),
+  first_name                    varchar2(255),
+  last_name                     varchar2(255),
+  customer_id                   varchar2(40),
+  version                       number(19) not null,
+  constraint pk_mcontact primary key (id)
+);
+
+create table mcontact_message (
+  id                            varchar2(40) not null,
+  title                         varchar2(255),
+  subject                       varchar2(255),
+  notes                         varchar2(255),
+  contact_id                    varchar2(40) not null,
+  version                       number(19) not null,
+  constraint pk_mcontact_message primary key (id)
+);
+
+create table mcustomer (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  notes                         varchar2(255),
+  shipping_address_id           varchar2(40),
+  billing_address_id            varchar2(40),
+  version                       number(19) not null,
+  constraint pk_mcustomer primary key (id)
+);
+
+create table mgroup (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_mgroup primary key (id)
+);
+
+create table mmachine (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mmachine primary key (id)
+);
+
+create table mmachine_mgroup (
+  mmachine_id                   number(19) not null,
+  mgroup_id                     number(19) not null,
+  constraint pk_mmachine_mgroup primary key (mmachine_id,mgroup_id)
+);
+
+create table mmedia (
+  type                          varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  url                           varchar2(255),
+  note                          varchar2(255),
+  constraint pk_mmedia primary key (id)
+);
+
+create table non_updateprop (
+  id                            number(10) generated by default as identity not null,
+  non_enum                      varchar2(5),
+  name                          varchar2(255),
+  note                          varchar2(255),
+  constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')),
+  constraint pk_non_updateprop primary key (id)
+);
+
+create table mprinter (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  flags                         number(19) not null,
+  current_state_id              number(19),
+  last_swap_cyan_id             number(19),
+  last_swap_magenta_id          number(19),
+  last_swap_yellow_id           number(19),
+  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_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 table mprinter_state (
+  id                            number(19) generated by default as identity not null,
+  flags                         number(19) not null,
+  printer_id                    number(19),
+  version                       number(19) not null,
+  constraint pk_mprinter_state primary key (id)
+);
+
+create table mprofile (
+  id                            number(19) generated by default as identity not null,
+  picture_id                    number(19),
+  name                          varchar2(255),
+  constraint pk_mprofile primary key (id)
+);
+
+create table mprotected_construct_bean (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_mprotected_construct_bean primary key (id)
+);
+
+create table mrole (
+  roleid                        number(10) generated by default as identity not null,
+  role_name                     varchar2(255),
+  constraint pk_mrole primary key (roleid)
+);
+
+create table mrole_muser (
+  mrole_roleid                  number(10) not null,
+  muser_userid                  number(10) not null,
+  constraint pk_mrole_muser primary key (mrole_roleid,muser_userid)
+);
+
+create table msome_other (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_msome_other primary key (id)
+);
+
+create table muser (
+  userid                        number(10) generated by default as identity not null,
+  user_name                     varchar2(255),
+  user_type_id                  number(10),
+  constraint pk_muser primary key (userid)
+);
+
+create table muser_type (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_muser_type primary key (id)
+);
+
+create table mail_box (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mail_box primary key (id)
+);
+
+create table mail_user (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mail_user primary key (id)
+);
+
+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 main_entity (
+  id                            varchar2(255) not null,
+  attr1                         varchar2(255),
+  attr2                         varchar2(255),
+  constraint pk_main_entity primary key (id)
+);
+
+create table main_entity_relation (
+  id                            varchar2(40) not null,
+  id1                           varchar2(255),
+  id2                           varchar2(255),
+  attr1                         varchar2(255),
+  constraint pk_main_entity_relation primary key (id)
+);
+
+create table map_super_actual (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  when_created                  timestamp not null,
+  when_updated                  timestamp not null,
+  constraint pk_map_super_actual primary key (id)
+);
+
+create table c_message (
+  id                            number(19) generated by default as identity not null,
+  title                         varchar2(255),
+  body                          varchar2(255),
+  conversation_id               number(19),
+  user_id                       number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_c_message primary key (id)
+);
+
+create table meter_address_data (
+  id                            varchar2(40) not null,
+  street                        varchar2(255) not null,
+  constraint pk_meter_address_data primary key (id)
+);
+
+create table meter_contract_data (
+  id                            varchar2(40) not null,
+  special_needs_client_id       varchar2(40) not null,
+  constraint uq_mtr_cntrct_dt_spcl_nds_c_1 unique (special_needs_client_id),
+  constraint pk_meter_contract_data primary key (id)
+);
+
+create table meter_special_needs_client (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  primary_id                    varchar2(40),
+  constraint uq_mtr_spcl_nds_clnt_prmry_d unique (primary_id),
+  constraint pk_meter_special_needs_client primary key (id)
+);
+
+create table meter_special_needs_contact (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_mtr_spcl_nds_cntct primary key (id)
+);
+
+create table meter_version (
+  id                            varchar2(40) not null,
+  address_data_id               varchar2(40),
+  contract_data_id              varchar2(40) not null,
+  constraint uq_mtr_vrsn_ddrss_dt_d unique (address_data_id),
+  constraint uq_mtr_vrsn_cntrct_dt_d unique (contract_data_id),
+  constraint pk_meter_version primary key (id)
+);
+
+create table mnoc_role (
+  role_id                       number(10) generated by default as identity not null,
+  role_name                     varchar2(255),
+  version                       number(10) not null,
+  constraint pk_mnoc_role primary key (role_id)
+);
+
+create table mnoc_user (
+  user_id                       number(10) generated by default as identity not null,
+  user_name                     varchar2(255),
+  version                       number(10) not null,
+  constraint pk_mnoc_user primary key (user_id)
+);
+
+create table mnoc_user_mnoc_role (
+  mnoc_user_user_id             number(10) not null,
+  mnoc_role_role_id             number(10) not null,
+  constraint pk_mnoc_user_mnoc_role primary key (mnoc_user_user_id,mnoc_role_role_id)
+);
+
+create table mny_a (
+  id                            number(19) generated by default as identity 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 table mny_b (
+  id                            number(19) generated by default as identity 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 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) generated by default as identity 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 table mny_topic (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mny_topic primary key (id)
+);
+
+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) generated by default as identity not null,
+  mp_user_id                    number(19) not null,
+  code                          varchar2(255),
+  organization_id               number(19),
+  constraint pk_mp_role primary key (id)
+);
+
+create table mp_user (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_mp_user primary key (id)
+);
+
+create table ms_many_a (
+  aid                           number(19) generated by default as identity 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 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) generated by default as identity not null,
+  name                          varchar2(255),
+  deleted                       number(1) default 0 not null,
+  constraint pk_ms_many_b primary key (bid)
+);
+
+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) generated by default as identity not null,
+  name                          varchar2(255),
+  my_count                      number(10) not null,
+  my_lob                        clob,
+  constraint pk_my_lob_size primary key (id)
+);
+
+create table my_lob_size_join_many (
+  id                            number(10) generated by default as identity not null,
+  something                     varchar2(255),
+  other                         varchar2(255),
+  parent_id                     number(10),
+  constraint pk_my_lob_size_join_many primary key (id)
+);
+
+create table noidbean (
+  name                          varchar2(255),
+  subject                       varchar2(255),
+  when_created                  timestamp not null
+);
+
+create table o_bean_child (
+  id                            number(19) generated by default as identity not null,
+  cached_bean_id                number(19),
+  constraint pk_o_bean_child primary key (id)
+);
+
+create table ocached_app (
+  id                            number(19) generated by default as identity not null,
+  app_name                      varchar2(255),
+  version                       number(19) not null,
+  constraint uq_ocached_app_app_name unique (app_name),
+  constraint pk_ocached_app primary key (id)
+);
+
+create table ocached_app_detail (
+  id                            number(19) generated by default as identity not null,
+  app_id                        number(19) not null,
+  detail                        varchar2(255),
+  version                       number(19) not null,
+  constraint uq_occhd_pp_dtl_pp_d_dtl unique (app_id,detail),
+  constraint pk_ocached_app_detail primary key (id)
+);
+
+create table o_cached_bean (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_o_cached_bean primary key (id)
+);
+
+create table o_cached_bean_country (
+  o_cached_bean_id              number(19) not null,
+  o_country_code                varchar2(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                            number(19) generated by default as identity not null,
+  cached_bean_id                number(19),
+  constraint pk_o_cached_bean_child primary key (id)
+);
+
+create table o_cached_inherit (
+  dtype                         varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  child_adata                   varchar2(255),
+  child_bdata                   varchar2(255),
+  constraint pk_o_cached_inherit primary key (id)
+);
+
+create table o_cached_natkey (
+  id                            number(19) generated by default as identity not null,
+  store                         varchar2(255),
+  sku                           varchar2(255),
+  description                   varchar2(255),
+  constraint pk_o_cached_natkey primary key (id)
+);
+
+create table o_cached_natkey3 (
+  id                            number(19) generated by default as identity 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 table ocached_nkey_uid (
+  id                            number(19) generated by default as identity not null,
+  cid                           varchar2(40),
+  other                         varchar2(255),
+  version                       number(19) not null,
+  constraint pk_ocached_nkey_uid primary key (id)
+);
+
+create table ocar (
+  id                            number(10) generated by default as identity not null,
+  vin                           varchar2(255),
+  name                          varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_ocar primary key (id)
+);
+
+create table ocompany (
+  id                            number(10) generated by default as identity 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 table oengine (
+  engine_id                     varchar2(40) not null,
+  short_desc                    varchar2(255),
+  car_id                        number(10),
+  version                       number(10) not null,
+  constraint uq_oengine_car_id unique (car_id),
+  constraint pk_oengine primary key (engine_id)
+);
+
+create table ogear_box (
+  id                            varchar2(40) not null,
+  box_desc                      varchar2(255),
+  box_size                      number(10),
+  car_id                        number(10),
+  version                       number(10) not null,
+  constraint uq_ogear_box_car_id unique (car_id),
+  constraint pk_ogear_box primary key (id)
+);
+
+create table omvertex (
+  id                            varchar2(40) not null,
+  constraint pk_omvertex primary key (id)
+);
+
+create table omvertex_other (
+  id                            varchar2(40) not null,
+  omvertex_id                   varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_omvertex_other primary key (id)
+);
+
+create table oroad_show_msg (
+  id                            number(10) generated by default as identity 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 table om_account_child_dbo (
+  id                            number(19) generated by default as identity not null,
+  description                   varchar2(255),
+  banana_rama_id                number(19),
+  constraint pk_om_account_child_dbo primary key (id)
+);
+
+create table om_account_dbo (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_om_account_dbo primary key (id)
+);
+
+create table om_basic_child (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  parent_id                     number(19),
+  version                       number(19) not null,
+  constraint pk_om_basic_child primary key (id)
+);
+
+create table om_basic_parent (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_om_basic_parent primary key (id)
+);
+
+create table om_ordered_detail (
+  id                            number(19) generated by default as identity 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 table om_ordered_master (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+
+create table only_id_entity (
+  id                            number(19) generated by default as identity not null,
+  constraint pk_only_id_entity primary key (id)
+);
+
+create table o_order (
+  id                            number(10) generated by default as identity not null,
+  status                        number(10),
+  order_date                    date,
+  ship_date                     date,
+  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 pk_o_order primary key (id)
+);
+
+create table o_order_detail (
+  id                            number(10) generated by default as identity not null,
+  order_id                      number(10) not null,
+  order_qty                     number(10),
+  ship_qty                      number(10),
+  unit_price                    number(19,4),
+  product_id                    number(10),
+  cretime                       timestamp,
+  updtime                       timestamp not null,
+  constraint pk_o_order_detail primary key (id)
+);
+
+create table s_orders (
+  uuid                          varchar2(40) not null,
+  constraint pk_s_orders primary key (uuid)
+);
+
+create table s_order_items (
+  uuid                          varchar2(40) not null,
+  product_variant_uuid          varchar2(255),
+  order_uuid                    varchar2(40),
+  quantity                      number(10) not null,
+  amount                        number(16,3),
+  constraint pk_s_order_items primary key (uuid)
+);
+
+create table or_order_ship (
+  id                            number(10) generated by default as identity not null,
+  order_id                      number(10),
+  ship_time                     timestamp,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_or_order_ship primary key (id)
+);
+
+create table organisation (
+  id                            number(19) generated by default as identity 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 table organization_node (
+  kind                          varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  parent_tree_node_id           number(19) not null,
+  title                         varchar2(255),
+  constraint uq_orgnztn_nd_prnt_tr_nd_d unique (parent_tree_node_id),
+  constraint pk_organization_node primary key (id)
+);
+
+create table organization_tree_node (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_organization_tree_node primary key (id)
+);
+
+create table orp_detail (
+  id                            varchar2(100) not null,
+  detail                        varchar2(255),
+  master_id                     varchar2(100),
+  version                       number(19) not null,
+  constraint pk_orp_detail primary key (id)
+);
+
+create table orp_detail2 (
+  id                            varchar2(100) not null,
+  orp_master2_id                varchar2(100) not null,
+  detail                        varchar2(255),
+  master_id                     varchar2(255),
+  version                       number(19) not null,
+  constraint pk_orp_detail2 primary key (id)
+);
+
+create table orp_master (
+  id                            varchar2(100) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_orp_master primary key (id)
+);
+
+create table orp_master2 (
+  id                            varchar2(100) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_orp_master2 primary key (id)
+);
+
+create table oto_aone (
+  id                            varchar2(100) not null,
+  description                   varchar2(255),
+  constraint pk_oto_aone primary key (id)
+);
+
+create table oto_atwo (
+  id                            varchar2(100) not null,
+  description                   varchar2(255),
+  aone_id                       varchar2(100),
+  constraint uq_oto_atwo_aone_id unique (aone_id),
+  constraint pk_oto_atwo primary key (id)
+);
+
+create table oto_bchild (
+  master_id                     number(19) generated by default as identity not null,
+  child                         varchar2(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+
+create table oto_bmaster (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_oto_bmaster primary key (id)
+);
+
+create table oto_child (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  master_id                     number(19),
+  constraint uq_oto_child_master_id unique (master_id),
+  constraint pk_oto_child primary key (id)
+);
+
+create table oto_cust (
+  cid                           number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_cust primary key (cid)
+);
+
+create table oto_cust_address (
+  aid                           number(19) generated by default as identity 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 table oto_level_a (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  b_id                          number(19),
+  constraint uq_oto_level_a_b_id unique (b_id),
+  constraint pk_oto_level_a primary key (id)
+);
+
+create table oto_level_b (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  c_id                          number(19),
+  constraint uq_oto_level_b_c_id unique (c_id),
+  constraint pk_oto_level_b primary key (id)
+);
+
+create table oto_level_c (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_oto_level_c primary key (id)
+);
+
+create table oto_master (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_oto_master primary key (id)
+);
+
+create table oto_prime (
+  pid                           number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_prime primary key (pid)
+);
+
+create table oto_prime_extra (
+  eid                           number(19) generated by default as identity not null,
+  extra                         varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_sd_child (
+  id                            number(19) generated by default as identity not null,
+  child                         varchar2(255),
+  master_id                     number(19),
+  deleted                       number(1) default 0 not null,
+  version                       number(19) 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                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_oto_sd_master primary key (id)
+);
+
+create table oto_th_many (
+  id                            number(19) generated by default as identity 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 table oto_th_one (
+  id                            number(19) generated by default as identity 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 table oto_th_top (
+  id                            number(19) generated by default as identity 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 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 oto_user_model (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  user_optional_id              number(19),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint uq_ot_sr_mdl_sr_ptnl_d unique (user_optional_id),
+  constraint pk_oto_user_model primary key (id)
+);
+
+create table oto_user_model_optional (
+  id                            number(19) generated by default as identity not null,
+  optional                      varchar2(255),
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_oto_user_model_optional primary key (id)
+);
+
+create table pfile (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  file_content_id               number(10),
+  file_content2_id              number(10),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) 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 table pfile_content (
+  id                            number(10) generated by default as identity not null,
+  content                       blob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_pfile_content primary key (id)
+);
+
+create table paggview (
+  pview_id                      varchar2(40),
+  amount                        number(10) not null,
+  constraint uq_paggview_pview_id unique (pview_id)
+);
+
+create table pallet_location (
+  type                          varchar2(31) not null,
+  id                            number(10) generated by default as identity not null,
+  zone_sid                      number(10) not null,
+  attribute                     varchar2(255),
+  constraint pk_pallet_location primary key (id)
+);
+
+create table parcel (
+  parcelid                      number(19) generated by default as identity not null,
+  description                   varchar2(255),
+  constraint pk_parcel primary key (parcelid)
+);
+
+create table parcel_location (
+  parcellocid                   number(19) generated by default as identity not null,
+  location                      varchar2(255),
+  parcelid                      number(19),
+  constraint uq_parcel_location_parcelid unique (parcelid),
+  constraint pk_parcel_location primary key (parcellocid)
+);
+
+create table rawinherit_parent (
+  type                          varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  val                           number(10),
+  more                          varchar2(255),
+  constraint pk_rawinherit_parent primary key (id)
+);
+
+create table rawinherit_parent_rawinherit_d (
+  rawinherit_parent_id          number(19) not null,
+  rawinherit_data_id            number(19) not null,
+  constraint pk_rwnhrt_prnt_rwnhrt_d primary key (rawinherit_parent_id,rawinherit_data_id)
+);
+
+create table e_save_test_c (
+  id                            number(19) generated by default as identity not null,
+  version                       number(19) not null,
+  constraint pk_e_save_test_c primary key (id)
+);
+
+create table parent_person (
+  identifier                    number(10) generated by default as identity 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 table c_participation (
+  id                            number(19) generated by default as identity not null,
+  rating                        number(10),
+  type                          number(10),
+  conversation_id               number(19) not null,
+  user_id                       number(19) not null,
+  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 pk_c_participation primary key (id)
+);
+
+create table password_store_model (
+  id                            number(19) generated by default as identity not null,
+  enc1                          varchar2(30),
+  enc2                          varchar2(40),
+  enc3                          clob,
+  enc4                          raw(30),
+  enc5                          raw(40),
+  enc6                          blob,
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint pk_password_store_model primary key (id)
+);
+
+create table pcf_calendar (
+  id                            number(19) generated by default as identity not null,
+  pcf_person_id                 number(19) not null,
+  version                       number(19) not null,
+  constraint pk_pcf_calendar primary key (id)
+);
+
+create table pcf_city (
+  id                            number(19) generated by default as identity not null,
+  pcf_country_id                number(19) not null,
+  name                          varchar2(255),
+  mayor_id                      number(19) not null,
+  vice_mayor_id                 number(19) not null,
+  version                       number(19) not null,
+  constraint uq_pcf_city_mayor_id unique (mayor_id),
+  constraint uq_pcf_city_vice_mayor_id unique (vice_mayor_id),
+  constraint pk_pcf_city primary key (id)
+);
+
+create table pcf_country (
+  id                            number(19) generated by default as identity not null,
+  version                       number(19) not null,
+  constraint pk_pcf_country primary key (id)
+);
+
+create table pcf_event (
+  id                            number(19) generated by default as identity not null,
+  pcf_calendar_id               number(19) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_pcf_event primary key (id)
+);
+
+create table pcf_person (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_pcf_person primary key (id)
+);
+
+create table mt_permission (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_mt_permission primary key (id)
+);
+
+create table persistent_file (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_persistent_file primary key (id)
+);
+
+create table persistent_file_content (
+  id                            number(10) generated by default as identity not null,
+  persistent_file_id            number(10),
+  content                       blob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint uq_prsstnt_fl_cntnt_prsstnt_1 unique (persistent_file_id),
+  constraint pk_persistent_file_content primary key (id)
+);
+
+create table person (
+  oid                           number(19) generated by default as identity not null,
+  default_address_oid           number(19),
+  version                       number(10) not null,
+  constraint pk_person primary key (oid)
+);
+
+create table persons (
+  id                            number(19) generated by default as identity (start with 1000 increment by 40) not null,
+  surname                       varchar2(64) not null,
+  name                          varchar2(64) not null,
+  constraint pk_persons primary key (id)
+);
+
+create table person_cache_email (
+  id                            varchar2(128) not null,
+  person_info_person_id         varchar2(128),
+  email                         varchar2(255),
+  constraint pk_person_cache_email primary key (id)
+);
+
+create table person_cache_info (
+  person_id                     varchar2(128) not null,
+  name                          varchar2(255),
+  constraint pk_person_cache_info primary key (person_id)
+);
+
+create table phones (
+  id                            number(19) generated by default as identity not null,
+  phone_number                  varchar2(7) not null,
+  person_id                     number(19) not null,
+  constraint uq_phones_phone_number unique (phone_number),
+  constraint pk_phones primary key (id)
+);
+
+create table e_position (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  contract_id                   number(19) not null,
+  constraint pk_e_position primary key (id)
+);
+
+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) generated by default as identity not null,
+  sku                           varchar2(20),
+  name                          varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  constraint pk_o_product primary key (id)
+);
+
+create table pp (
+  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                         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) generated by default as identity not null,
+  name                          varchar2(255),
+  groupobjectid                 number(19),
+  sequence_number               number(10) not null,
+  constraint pk_question primary key (id)
+);
+
+create table rcustomer (
+  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(127) not null,
+  order_number                  number(10) not null,
+  customername                  varchar2(127),
+  item                          varchar2(255),
+  constraint pk_r_orders primary key (company,order_number)
+);
+
+create table referencing_bean (
+  id                            varchar2(40) not null,
+  constraint pk_referencing_bean primary key (id)
+);
+
+create table region (
+  customer                      number(10) not null,
+  type                          number(10) not null,
+  description                   varchar2(255),
+  version                       number(19) not null,
+  constraint pk_region primary key (customer,type)
+);
+
+create table rel_detail (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(10) not null,
+  constraint pk_rel_detail primary key (id)
+);
+
+create table rel_master (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  detail_id                     number(19),
+  version                       number(10) not null,
+  constraint pk_rel_master primary key (id)
+);
+
+create table resourcefile (
+  id                            varchar2(64) not null,
+  parentresourcefileid          varchar2(64),
+  name                          varchar2(128) not null,
+  constraint pk_resourcefile primary key (id)
+);
+
+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 em_role (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_em_role primary key (id)
+);
+
+create table root_bean (
+  dtype                         varchar2(31) not null,
+  id                            varchar2(40) not null,
+  referencing_bean_id           varchar2(40) not null,
+  value                         varchar2(255),
+  constraint pk_root_bean primary key (id)
+);
+
+create table f_second (
+  id                            number(19) generated by default as identity not null,
+  mod_name                      varchar2(255),
+  first                         number(19),
+  title                         varchar2(255),
+  constraint uq_f_second_first unique (first),
+  constraint pk_f_second primary key (id)
+);
+
+create table section (
+  id                            number(10) generated by default as identity not null,
+  article_id                    number(10),
+  type                          number(10),
+  content                       clob,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint ck_section_type check ( type in (0,1)),
+  constraint pk_section primary key (id)
+);
+
+create table self_parent (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  parent_id                     number(19),
+  version                       number(19) not null,
+  constraint pk_self_parent primary key (id)
+);
+
+create table self_ref_customer (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  referred_by_id                number(19),
+  constraint pk_self_ref_customer primary key (id)
+);
+
+create table self_ref_example (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255) not null,
+  parent_id                     number(19),
+  constraint pk_self_ref_example primary key (id)
+);
+
+create table e_save_test_a (
+  id                            number(19) generated by default as identity not null,
+  version                       number(19) not null,
+  constraint pk_e_save_test_a primary key (id)
+);
+
+create table e_save_test_b (
+  id                            number(19) generated by default as identity not null,
+  sibling_a_id                  number(19),
+  test_property                 number(1) default 0 not null,
+  version                       number(19) 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                            varchar2(40) not null,
+  name                          varchar2(255),
+  parent_id                     varchar2(40),
+  data_container_id             varchar2(40),
+  site_address_id               varchar2(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                            varchar2(40) not null,
+  street                        varchar2(255),
+  city                          varchar2(255),
+  zip_code                      varchar2(255),
+  constraint pk_site_address primary key (id)
+);
+
+create table some_enum_bean (
+  id                            number(19) generated by default as identity not null,
+  some_enum                     number(10),
+  name                          varchar2(255),
+  constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)),
+  constraint pk_some_enum_bean primary key (id)
+);
+
+create table some_file_bean (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  content                       blob,
+  version                       number(19) not null,
+  constraint pk_some_file_bean primary key (id)
+);
+
+create table some_new_types_bean (
+  id                            number(19) generated by default as identity not null,
+  dow                           number(1),
+  mth                           number(1),
+  yr                            number(10),
+  yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
+  sql_time                      timestamp,
+  local_date                    date,
+  local_date_time               timestamp,
+  offset_date_time              timestamp,
+  zoned_date_time               timestamp,
+  local_time                    timestamp,
+  instant                       timestamp,
+  zone_id                       varchar2(60),
+  zone_offset                   varchar2(60),
+  path                          varchar2(255),
+  period                        varchar2(20),
+  duration                      number(19),
+  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 pk_some_new_types_bean primary key (id)
+);
+
+create table some_period_bean (
+  id                            number(19) generated by default as identity not null,
+  anniversary                   date,
+  version                       number(19) not null,
+  constraint pk_some_period_bean primary key (id)
+);
+
+create table source_base (
+  dtype                         varchar2(31) not null,
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  pos                           number(10) not null,
+  target_id                     varchar2(40),
+  constraint pk_source_base primary key (id)
+);
+
+create table stockforecast (
+  type                          varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  inner_report_id               number(19),
+  constraint pk_stockforecast primary key (id)
+);
+
+create table sub_section (
+  id                            number(10) generated by default as identity not null,
+  section_id                    number(10),
+  title                         varchar2(255),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_sub_section primary key (id)
+);
+
+create table sub_type (
+  sub_type_id                   number(10) generated by default as identity not null,
+  description                   varchar2(255),
+  version                       number(19) not null,
+  constraint pk_sub_type primary key (sub_type_id)
+);
+
+create table survey (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_survey primary key (id)
+);
+
+create table tbytes_only (
+  id                            number(10) generated by default as identity not null,
+  content                       blob,
+  constraint pk_tbytes_only primary key (id)
+);
+
+create table tcar (
+  type                          varchar2(31) not null,
+  plate_no                      varchar2(32) not null,
+  truckload                     number(19),
+  constraint pk_tcar primary key (plate_no)
+);
+
+create table tevent (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_tevent primary key (id)
+);
+
+create table tevent_many (
+  id                            number(19) generated by default as identity 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 table tevent_one (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  status                        number(10),
+  event_id                      number(19),
+  version                       number(19) 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                       number(3) not null,
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  child_property                varchar2(255),
+  constraint pk_tint_root primary key (id)
+);
+
+create table tjoda_entity (
+  id                            number(10) generated by default as identity not null,
+  local_time                    timestamp,
+  constraint pk_tjoda_entity primary key (id)
+);
+
+create table t_mapsuper1 (
+  id                            number(10) generated by default as identity not null,
+  something                     varchar2(255),
+  name                          varchar2(255),
+  version                       number(10) not null,
+  constraint pk_t_mapsuper1 primary key (id)
+);
+
+create table t_oneb (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  active                        number(1) default 0 not null,
+  constraint pk_t_oneb primary key (id)
+);
+
+create table t_detail_with_other_namexxxyy (
+  id                            number(10) not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  some_unique_value             varchar2(127),
+  active                        number(1) default 0 not null,
+  master_id                     number(10),
+  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 increment by 1;
+
+create table t_atable_thatisrelatively (
+  id                            number(10) not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  active                        number(1) default 0 not null,
+  constraint pk_t_atable_thatisrelatively primary key (id)
+);
+create sequence t_atable_master_seq increment by 1;
+
+create table ttruck_holder (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  truck_plate_no                varchar2(32) not null,
+  basic_id                      number(10),
+  version                       number(19) not null,
+  constraint pk_ttruck_holder primary key (id)
+);
+
+create table ttruck_holder_item (
+  id                            number(19) generated by default as identity not null,
+  some_uid                      varchar2(40),
+  foo                           varchar2(255),
+  owner_id                      number(19) not null,
+  constraint pk_ttruck_holder_item primary key (id)
+);
+
+create table tuuid_entity (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_tuuid_entity primary key (id)
+);
+
+create table twheel (
+  id                            number(19) generated by default as identity not null,
+  owner_plate_no                varchar2(32) not null,
+  constraint pk_twheel primary key (id)
+);
+
+create table twith_pre_insert (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255) not null,
+  title                         varchar2(255),
+  constraint pk_twith_pre_insert primary key (id)
+);
+
+create table target_base (
+  dtype                         varchar2(31) not null,
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  constraint pk_target_base primary key (id)
+);
+
+create table mt_tenant (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  version                       number(19) not null,
+  constraint pk_mt_tenant 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 table tire (
+  id                            number(19) not null,
+  wheel                         number(19),
+  version                       number(10) not null,
+  constraint uq_tire_wheel unique (wheel),
+  constraint pk_tire primary key (id)
+);
+create sequence tire_seq increment by 1;
+
+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 increment by 1;
+
+create table tree_entity (
+  id                            number(10) generated by default as identity not null,
+  text                          varchar2(255),
+  parent_id                     number(10),
+  constraint pk_tree_entity primary key (id)
+);
+
+create table trip (
+  id                            number(10) generated by default as identity not null,
+  vehicle_driver_id             number(10),
+  destination                   varchar2(255),
+  address_id                    number(10),
+  star_date                     timestamp,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_trip primary key (id)
+);
+
+create table truck_ref (
+  id                            number(10) generated by default as identity not null,
+  something                     varchar2(255),
+  constraint pk_truck_ref primary key (id)
+);
+
+create table tune (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_tune primary key (id)
+);
+
+create table "type" (
+  customer                      number(10) not null,
+  type                          number(10) not null,
+  description                   varchar2(255),
+  sub_type_id                   number(10),
+  version                       number(19) not null,
+  constraint pk_type primary key (customer,type)
+);
+
+create table tz_bean (
+  id                            number(19) generated by default as identity not null,
+  moda                          varchar2(255),
+  ts                            timestamp,
+  tstz                          timestamp,
+  constraint pk_tz_bean primary key (id)
+);
+
+create table usib_child (
+  id                            varchar2(40) not null,
+  parent_id                     number(19),
+  deleted                       number(1) default 0 not null,
+  constraint pk_usib_child primary key (id)
+);
+
+create table usib_child_sibling (
+  id                            number(19) generated by default as identity not null,
+  child_id                      varchar2(40),
+  deleted                       number(1) default 0 not null,
+  constraint uq_usb_chld_sblng_chld_d unique (child_id),
+  constraint pk_usib_child_sibling primary key (id)
+);
+
+create table usib_parent (
+  id                            number(19) generated by default as identity not null,
+  deleted                       number(1) default 0 not null,
+  constraint pk_usib_parent primary key (id)
+);
+
+create table ut_detail (
+  id                            number(10) generated by default as identity not null,
+  utmaster_id                   number(10) not null,
+  name                          varchar2(255),
+  qty                           number(10),
+  amount                        number(19,4),
+  version                       number(10) not null,
+  constraint pk_ut_detail primary key (id)
+);
+
+create table ut_master (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  event_date                    date,
+  version                       number(10) not null,
+  constraint pk_ut_master primary key (id)
+);
+
+create table uuone (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  description                   varchar2(255),
+  version                       number(19) not null,
+  constraint pk_uuone primary key (id)
+);
+
+create table uutwo (
+  id                            varchar2(40) not null,
+  name                          varchar2(255),
+  notes                         varchar2(255),
+  master_id                     varchar2(40),
+  version                       number(19) not null,
+  constraint pk_uutwo primary key (id)
+);
+
+create table oto_user (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  account_id                    number(19) not null,
+  version                       number(19) not null,
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  constraint uq_oto_user_account_id unique (account_id),
+  constraint pk_oto_user primary key (id)
+);
+
+create table c_user (
+  id                            number(19) generated by default as identity not null,
+  inactive                      number(1) default 0 not null,
+  name                          varchar2(255),
+  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 table tx_user (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_tx_user primary key (id)
+);
+
+create table g_user (
+  id                            number(19) generated by default as identity not null,
+  username                      varchar2(255),
+  version                       number(19) not null,
+  constraint pk_g_user primary key (id)
+);
+
+create table em_user (
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_em_user primary key (id)
+);
+
+create table user_interest_live (
+  user_id                       number(19) not null,
+  live_id                       number(19) not null,
+  created_at                    timestamp not null,
+  constraint pk_user_interest_live primary key (user_id,live_id)
+);
+
+create table em_user_role (
+  user_id                       number(19) not null,
+  role_id                       number(19) not null,
+  constraint pk_em_user_role primary key (user_id,role_id)
+);
+
+create table vehicle (
+  dtype                         varchar2(3) not null,
+  id                            number(10) generated by default as identity not null,
+  license_number                varchar2(255),
+  registration_date             timestamp,
+  lease_id                      number(19),
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  siz                           varchar2(3),
+  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 table vehicle_driver (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  vehicle_id                    number(10),
+  address_id                    number(10),
+  license_issued_on             timestamp,
+  cretime                       timestamp not null,
+  updtime                       timestamp not null,
+  version                       number(19) not null,
+  constraint pk_vehicle_driver primary key (id)
+);
+
+create table vehicle_lease (
+  dtype                         varchar2(31) not null,
+  id                            number(19) generated by default as identity not null,
+  name                          varchar2(255),
+  active_start                  date,
+  active_end                    date,
+  version                       number(19) not null,
+  bond                          number(16,3),
+  min_duration                  number(10) not null,
+  day_rate                      number(16,3),
+  max_days                      number(10),
+  constraint pk_vehicle_lease primary key (id)
+);
+
+create table warehouses (
+  id                            number(10) generated by default as identity not null,
+  officezoneid                  number(10),
+  constraint pk_warehouses primary key (id)
+);
+
+create table warehousesshippingzones (
+  warehouseid                   number(10) not null,
+  shippingzoneid                number(10) not null,
+  constraint pk_warehousesshippingzones primary key (warehouseid,shippingzoneid)
+);
+
+create table wheel (
+  id                            number(19) not null,
+  version                       number(10) not null,
+  constraint pk_wheel primary key (id)
+);
+create sequence wheel_seq increment by 1;
+
+create table sa_wheel (
+  id                            number(19) not null,
+  tire                          number(19),
+  car                           number(19),
+  version                       number(10) not null,
+  constraint pk_sa_wheel primary key (id)
+);
+create sequence sa_wheel_seq increment by 1;
+
+create table sp_car_wheel (
+  id                            number(19) not null,
+  name                          varchar2(255),
+  version                       number(10) not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+create sequence sp_car_wheel_seq increment by 1;
+
+create table g_who_props_otm (
+  id                            number(19) generated by default as identity 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 table with_zero (
+  id                            number(19) generated by default as identity 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)
+);
+
+create table parent (
+  id                            number(10) generated by default as identity not null,
+  name                          varchar2(255),
+  constraint pk_parent primary key (id)
+);
+
+create table wview (
+  id                            varchar2(40) not null,
+  name                          varchar2(127) not null,
+  constraint uq_wview_name unique (name),
+  constraint pk_wview primary key (id)
+);
+
+create table zones (
+  type                          varchar2(31) not null,
+  id                            number(10) generated by default as identity not null,
+  attribute                     varchar2(255),
+  constraint pk_zones primary key (id)
+);
+
+create index ix_cntct_lst_nm_frst_nm 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_ecsm_values_host_id on ecsm_values (host_id);
+create index ix_organization_node_kind on organization_node (kind);
+create index ano_3 on test_annotation_base_entity (direct);
+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_cntnr_rltn_cntnr_d on acl_container_relation (container_id);
+alter table acl_container_relation add constraint fk_acl_cntnr_rltn_cntnr_d foreign key (container_id) references contract (id);
+
+create index ix_acl_cntnr_rltn_cl_ntry_d on acl_container_relation (acl_entry_id);
+alter table acl_container_relation add constraint fk_acl_cntnr_rltn_cl_ntry_d 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);
+
+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_attrbt_ttrbt_hldr_d on attribute (attribute_holder_id);
+alter table attribute add constraint fk_attrbt_ttrbt_hldr_d 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_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_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);
+
+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);
+
+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_drl_bkng_clnt_nvc foreign key (client_invoice) references drel_invoice (id);
+
+create index ix_cpprdct_ctgry_ctgry_d on cepproduct_category (category_id);
+alter table cepproduct_category add constraint fk_cpprdct_ctgry_ctgry_d foreign key (category_id) references cepcategory (id);
+
+create index ix_cpprdct_ctgry_prdct_d on cepproduct_category (product_id);
+alter table cepproduct_category add constraint fk_cpprdct_ctgry_prdct_d foreign key (product_id) references cepproduct (id);
+
+create index ix_ciaddress_street_id on ciaddress (street_id);
+alter table ciaddress add constraint fk_ciaddress_street_id foreign key (street_id) references cistreet_parent (id);
+
+create index ix_ccstmr_prnt_ddrss_d on cicustomer_parent (address_id);
+alter table cicustomer_parent add constraint fk_ccstmr_prnt_ddrss_d foreign key (address_id) references ciaddress (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);
+
+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_coone_many_coone_id on coone_many (coone_id);
+alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_id) references coone (id);
+
+alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (id);
+
+create index ix_clcltn_rslt_prdct_cnfgrt_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_grp_cnfgrtn_d 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_sp_cr_cr_whls_sp_cr_cr 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_whl 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_drs_sp_cr_cr on sp_car_car_doors (car);
+alter table sp_car_car_doors add constraint fk_sp_cr_cr_drs_sp_cr_cr foreign key (car) references sp_car_car (id);
+
+create index ix_sp_cr_cr_drs_sp_cr_dr on sp_car_car_doors (door);
+alter table sp_car_car_doors add constraint fk_sp_cr_cr_drs_sp_cr_dr 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);
+
+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);
+
+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_chld_prsn_prnt_dntfr on child_person (parent_identifier);
+alter table child_person add constraint fk_chld_prsn_prnt_dntfr 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_clss_spr_mnky_clss_spr 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_cnfgrtn_cnfgrtns_d on configuration (configurations_id);
+alter table configuration add constraint fk_cnfgrtn_cnfgrtns_d 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_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);
+
+create index ix_o_cstmr_bllng_ddrss_d 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_shppng_ddrss_d 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_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_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_mchn_x_s_mchn_d on d_machine_aux_use (machine_id);
+alter table d_machine_aux_use add constraint fk_d_mchn_x_s_mchn_d 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;
+
+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;
+
+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_dcmnt_drft_rgnstn_d on document_draft (organisation_id);
+alter table document_draft add constraint fk_dcmnt_drft_rgnstn_d 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_dcmnt_md_drft_dcmnt_d on document_media_draft (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_e_basicenc_relate_other_id on e_basicenc_relate (other_id);
+alter table e_basicenc_relate add constraint fk_e_basicenc_relate_other_id foreign key (other_id) references e_basicenc (id);
+
+create index ix_ebsc_jsn_mp_dtl_wnr_d on ebasic_json_map_detail (owner_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_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_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_edflt_prp__smpl_srtypd 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);
+
+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_enll_cllctn_dtl_nll_cllc_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_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_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);
+
+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_1 foreign key (esoft_del_book_id) references esoft_del_book (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_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_dwn_sft_dl_md_d on esoft_del_down (esoft_del_mid_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_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_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_1 foreign key (esoft_del_role_id) references esoft_del_role (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_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_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_1 foreign key (esoft_del_user_id) references esoft_del_user (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 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_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_evnll_cllctn_dtl_vnll_cl_1 on evanilla_collection_detail (evanilla_collection_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_ec_nm_prsn_tgs_c_nm_prsn_d on ec_enum_person_tags (ec_enum_person_id);
+alter table ec_enum_person_tags add constraint fk_ec_nm_prsn_tgs_c_nm_prsn_d 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_ec_top_person_id on ec_top (person_id);
+alter table ec_top add constraint fk_ec_top_person_id foreign key (person_id) references ecs_person (id);
+
+create index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person (ec_top_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ec_top foreign key (ec_top_id) references ec_top (id);
+
+create index ix_ec_tp_cs_prsn_cs_prsn on ec_top_ecs_person (ecs_person_id);
+alter table ec_top_ecs_person add constraint fk_ec_tp_cs_prsn_cs_prsn foreign key (ecs_person_id) references ecs_person (id);
+
+create index ix_ecbl_prsn_phn_nmbrs_prsn_d on ecbl_person_phone_numbers (person_id);
+alter table ecbl_person_phone_numbers add constraint fk_ecbl_prsn_phn_nmbrs_prsn_d foreign key (person_id) references ecbl_person (id);
+
+create index ix_ecbm_prsn_phn_nmbrs_prsn_d on ecbm_person_phone_numbers (person_id);
+alter table ecbm_person_phone_numbers add constraint fk_ecbm_prsn_phn_nmbrs_prsn_d foreign key (person_id) references ecbm_person (id);
+
+create index ix_ecm_prsn_phn_nmbrs_cm_pr_1 on ecm_person_phone_numbers (ecm_person_id);
+alter table ecm_person_phone_numbers add constraint fk_ecm_prsn_phn_nmbrs_cm_pr_1 foreign key (ecm_person_id) references ecm_person (id);
+
+create index ix_ecmc_prsn_phn_nmbrs_cmc__1 on ecmc_person_phone_numbers (ecmc_person_id);
+alter table ecmc_person_phone_numbers add constraint fk_ecmc_prsn_phn_nmbrs_cmc__1 foreign key (ecmc_person_id) references ecmc_person (id);
+
+create index ix_ecs_prsn_phn_cs_prsn_d on ecs_person_phone (ecs_person_id);
+alter table ecs_person_phone add constraint fk_ecs_prsn_phn_cs_prsn_d foreign key (ecs_person_id) references ecs_person (id);
+
+create index ix_ecsm_child_ecsm_parent_id on ecsm_child (ecsm_parent_id);
+alter table ecsm_child add constraint fk_ecsm_child_ecsm_parent_id foreign key (ecsm_parent_id) references ecsm_parent (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_elmnt_bn_cmplx_bn_d on element_bean (complex_bean_id);
+alter table element_bean add constraint fk_elmnt_bn_cmplx_bn_d foreign key (complex_bean_id) references root_bean (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_grnd_prnt_prsn_sm_bn_d on grand_parent_person (some_bean_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_srvy_grp_ctgrybjctd on survey_group (categoryobjectid);
+alter table survey_group add constraint fk_srvy_grp_ctgrybjctd 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_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);
+
+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 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);
+
+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_rst_bn_chld_prnt_d on l2_cldf_reset_bean_child (parent_id);
+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_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_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_l_ttr_vl foreign key (la_attr_value_id) references la_attr_value (id);
+
+create index ix_l_ttr_vl_ttrbt_ttrbt on la_attr_value_attribute (attribute_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_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_mcntct_mssg_cntct_d on mcontact_message (contact_id);
+alter table mcontact_message add constraint fk_mcntct_mssg_cntct_d foreign key (contact_id) references mcontact (id);
+
+create index ix_mcstmr_shppng_ddrss_d on mcustomer (shipping_address_id);
+alter table mcustomer add constraint fk_mcstmr_shppng_ddrss_d foreign key (shipping_address_id) references maddress (id);
+
+create index ix_mcstmr_bllng_ddrss_d on mcustomer (billing_address_id);
+alter table mcustomer add constraint fk_mcstmr_bllng_ddrss_d 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);
+
+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_mprntr_lst_swp_mgnt_d foreign key (last_swap_magenta_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_mprntr_lst_swp_blck_d 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);
+
+alter table meter_contract_data add constraint fk_mtr_cntrct_dt_spcl_nds_c_1 foreign key (special_needs_client_id) references meter_special_needs_client (id);
+
+alter table meter_special_needs_client add constraint fk_mtr_spcl_nds_clnt_prmry_d foreign key (primary_id) references meter_special_needs_contact (id);
+
+alter table meter_version add constraint fk_mtr_vrsn_ddrss_dt_d foreign key (address_data_id) references meter_address_data (id);
+
+alter table meter_version add constraint fk_mtr_vrsn_cntrct_dt_d foreign key (contract_data_id) references meter_contract_data (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_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_rl 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_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_lb_sz_jn_mny_prnt_d on my_lob_size_join_many (parent_id);
+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_o_bn_chld_cchd_bn_d on o_bean_child (cached_bean_id);
+alter table o_bean_child add constraint fk_o_bn_chld_cchd_bn_d foreign key (cached_bean_id) references o_cached_bean (id);
+
+create index ix_ocached_app_detail_app_id on ocached_app_detail (app_id);
+alter table ocached_app_detail add constraint fk_ocached_app_detail_app_id foreign key (app_id) references ocached_app (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__cchd_bn foreign key (o_cached_bean_id) references o_cached_bean (id);
+
+create index ix_o_cchd_bn_cntry__cntry on o_cached_bean_country (o_country_code);
+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_chld_cchd_bn_d on o_cached_bean_child (cached_bean_id);
+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);
+
+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);
+
+create index ix_omvertex_other_omvertex_id on omvertex_other (omvertex_id);
+alter table omvertex_other add constraint fk_omvertex_other_omvertex_id foreign key (omvertex_id) references omvertex (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_ccnt_chld_db_bnn_rm_d on om_account_child_dbo (banana_rama_id);
+alter table om_account_child_dbo add constraint fk_om_ccnt_chld_db_bnn_rm_d foreign key (banana_rama_id) references om_account_dbo (id);
+
+create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
+alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (id);
+
+create index ix_om_rdrd_dtl_mstr_d on om_ordered_detail (master_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_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 organization_node add constraint fk_orgnztn_nd_prnt_tr_nd_d 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_ot_cst_ddrss_cstmr_cd 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);
+
+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_user_model add constraint fk_ot_sr_mdl_sr_ptnl_d 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);
+
+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_rwnhrt_prnt_rwnhrt_d_rwn_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_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_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_prnt_prsn_prnt_dntfr on parent_person (parent_identifier);
+alter table parent_person add constraint fk_prnt_prsn_prnt_dntfr foreign key (parent_identifier) references grand_parent_person (identifier);
+
+create index ix_c_prtcptn_cnvrstn_d on c_participation (conversation_id);
+alter table c_participation add constraint fk_c_prtcptn_cnvrstn_d 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);
+
+create index ix_pcf_calendar_pcf_person_id on pcf_calendar (pcf_person_id);
+alter table pcf_calendar add constraint fk_pcf_calendar_pcf_person_id foreign key (pcf_person_id) references pcf_person (id);
+
+create index ix_pcf_city_pcf_country_id on pcf_city (pcf_country_id);
+alter table pcf_city add constraint fk_pcf_city_pcf_country_id foreign key (pcf_country_id) references pcf_country (id);
+
+alter table pcf_city add constraint fk_pcf_city_mayor_id foreign key (mayor_id) references pcf_person (id);
+
+alter table pcf_city add constraint fk_pcf_city_vice_mayor_id foreign key (vice_mayor_id) references pcf_person (id);
+
+create index ix_pcf_event_pcf_calendar_id on pcf_event (pcf_calendar_id);
+alter table pcf_event add constraint fk_pcf_event_pcf_calendar_id foreign key (pcf_calendar_id) references pcf_calendar (id);
+
+alter table persistent_file_content add constraint fk_prsstnt_fl_cntnt_prsstnt_1 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_prsn_cch_ml_prsn_nf_prsn_d on person_cache_email (person_info_person_id);
+alter table person_cache_email add constraint fk_prsn_cch_ml_prsn_nf_prsn_d 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);
+
+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_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_rsrcfl_prntrsrcfld on resourcefile (parentresourcefileid);
+alter table resourcefile add constraint fk_rsrcfl_prntrsrcfld 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_rl_prmssn_mt_prmssn 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_rt_bn_rfrncng_bn_d on root_bean (referencing_bean_id);
+alter table root_bean add constraint fk_rt_bn_rfrncng_bn_d foreign key (referencing_bean_id) references referencing_bean (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_slf_rf_cstmr_rfrrd_by_d 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_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_source_base_target_id on source_base (target_id);
+alter table source_base add constraint fk_source_base_target_id foreign key (target_id) references target_base (id);
+
+create index ix_stckfrcst_nnr_rprt_d 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_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_dtl_wth_thr_nmxxxyy_ms_1 on t_detail_with_other_namexxxyy (master_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_ttrck_hldr_trck_plt_n on ttruck_holder (truck_plate_no);
+alter table ttruck_holder add constraint fk_ttrck_hldr_trck_plt_n foreign key (truck_plate_no) references tcar (plate_no);
+
+create index ix_ttruck_holder_basic_id on ttruck_holder (basic_id);
+alter table ttruck_holder add constraint fk_ttruck_holder_basic_id foreign key (basic_id) references e_basic (id);
+
+create index ix_ttrck_hldr_tm_wnr_d on ttruck_holder_item (owner_id);
+alter table ttruck_holder_item add constraint fk_ttrck_hldr_tm_wnr_d foreign key (owner_id) references ttruck_holder (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_tree_entity_parent_id on tree_entity (parent_id);
+alter table tree_entity add constraint fk_tree_entity_parent_id foreign key (parent_id) references tree_entity (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_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_usb_chld_sblng_chld_d 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);
+
+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);
+
+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);
+
+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_wrhssshppngzns_wrhss on warehousesshippingzones (warehouseid);
+alter table warehousesshippingzones add constraint fk_wrhssshppngzns_wrhss foreign key (warehouseid) references warehouses (id);
+
+create index ix_wrhssshppngzns_zns on warehousesshippingzones (shippingzoneid);
+alter table warehousesshippingzones add constraint fk_wrhssshppngzns_zns 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_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_crtd_d foreign key (who_created_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 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_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);
+
diff --git a/ebean-core/src/test/ddl-review/oracle-drop-all.sql b/ebean-core/src/test/ddl-review/oracle-drop-all.sql
new file mode 100644
index 000000000..318c4b276
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/oracle-drop-all.sql
@@ -0,0 +1,1821 @@
+-- Generated by ebean unknown at 2020-03-17T09:34:02.384264Z
+alter table bar drop constraint fk_bar_foo_id;
+drop index ix_bar_foo_id;
+
+alter table acl_container_relation drop constraint fk_acl_cntnr_rltn_cntnr_d;
+drop index ix_acl_cntnr_rltn_cntnr_d;
+
+alter table acl_container_relation drop constraint fk_acl_cntnr_rltn_cl_ntry_d;
+drop index ix_acl_cntnr_rltn_cl_ntry_d;
+
+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 album drop constraint fk_album_cover_id;
+
+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 bbookmark_user drop constraint fk_bbookmark_user_org_id;
+drop index ix_bbookmark_user_org_id;
+
+alter table bsite_user_a drop constraint fk_bsite_user_a_site_id;
+drop index ix_bsite_user_a_site_id;
+
+alter table bsite_user_a drop constraint fk_bsite_user_a_user_id;
+drop index ix_bsite_user_a_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 bsite_user_e drop constraint fk_bsite_user_e_site_id;
+drop index ix_bsite_user_e_site_id;
+
+alter table bsite_user_e drop constraint fk_bsite_user_e_user_id;
+drop index ix_bsite_user_e_user_id;
+
+alter table basic_draftable_bean drop constraint fk_basic_draftable_bean_id;
+
+alter table drel_booking drop constraint fk_drel_booking_agent_invoice;
+
+alter table drel_booking drop constraint fk_drl_bkng_clnt_nvc;
+
+alter table cepproduct_category drop constraint fk_cpprdct_ctgry_ctgry_d;
+drop index ix_cpprdct_ctgry_ctgry_d;
+
+alter table cepproduct_category drop constraint fk_cpprdct_ctgry_prdct_d;
+drop index ix_cpprdct_ctgry_prdct_d;
+
+alter table ciaddress drop constraint fk_ciaddress_street_id;
+drop index ix_ciaddress_street_id;
+
+alter table cicustomer_parent drop constraint fk_ccstmr_prnt_ddrss_d;
+drop index ix_ccstmr_prnt_ddrss_d;
+
+alter table cinh_ref drop constraint fk_cinh_ref_ref_id;
+drop index ix_cinh_ref_ref_id;
+
+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 coone_many drop constraint fk_coone_many_coone_id;
+drop index ix_coone_many_coone_id;
+
+alter table coroot drop constraint fk_coroot_one_id;
+
+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_clcltn_rslt_grp_cnfgrtn_d;
+drop index ix_clcltn_rslt_grp_cnfgrtn_d;
+
+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_cr_cr_whls_sp_cr_whl;
+drop index ix_sp_cr_cr_whls_sp_cr_whl;
+
+alter table sp_car_car_doors drop constraint fk_sp_cr_cr_drs_sp_cr_cr;
+drop index ix_sp_cr_cr_drs_sp_cr_cr;
+
+alter table sp_car_car_doors drop constraint fk_sp_cr_cr_drs_sp_cr_dr;
+drop index ix_sp_cr_cr_drs_sp_cr_dr;
+
+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 category drop constraint fk_category_surveyobjectid;
+drop index ix_category_surveyobjectid;
+
+alter table e_save_test_d drop constraint fk_e_save_test_d_parent_id;
+
+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 cke_client drop constraint fk_cke_client_user;
+drop index ix_cke_client_user;
+
+alter table class_super_monkey drop constraint fk_clss_spr_mnky_clss_spr;
+
+alter table class_super_monkey drop constraint fk_class_super_monkey_monkey;
+
+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;
+
+alter table contact drop constraint fk_contact_group_id;
+drop index ix_contact_group_id;
+
+alter table contact_note drop constraint fk_contact_note_contact_id;
+drop index ix_contact_note_contact_id;
+
+alter table contract_costs drop constraint fk_contract_costs_position_id;
+drop index ix_contract_costs_position_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_cstmr_bllng_ddrss_d;
+drop index ix_o_cstmr_bllng_ddrss_d;
+
+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 dmachine drop constraint fk_dmachine_organisation_id;
+drop index ix_dmachine_organisation_id;
+
+alter table d_machine_aux_use drop constraint fk_d_mchn_x_s_mchn_d;
+drop index ix_d_mchn_x_s_mchn_d;
+
+alter table d_machine_stats drop constraint fk_d_machine_stats_machine_id;
+drop index ix_d_machine_stats_machine_id;
+
+alter table d_machine_use drop constraint fk_d_machine_use_machine_id;
+drop index ix_d_machine_use_machine_id;
+
+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 dc_detail drop constraint fk_dc_detail_master_id;
+drop index ix_dc_detail_master_id;
+
+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 e_basicenc_relate drop constraint fk_e_basicenc_relate_other_id;
+drop index ix_e_basicenc_relate_other_id;
+
+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 ecache_child drop constraint fk_ecache_child_root_id;
+drop index ix_ecache_child_root_id;
+
+alter table edefault_prop drop constraint fk_edflt_prp__smpl_srtypd;
+
+alter table eemb_inner drop constraint fk_eemb_inner_outer_id;
+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_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;
+
+alter table eopt_one_b drop constraint fk_eopt_one_b_c_id;
+drop index ix_eopt_one_b_c_id;
+
+alter table eper_addr drop constraint fk_eper_addr_ma_country_code;
+drop index ix_eper_addr_ma_country_code;
+
+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_one_a drop constraint fk_esoft_del_one_a_oneb_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 ec_enum_person_tags drop constraint fk_ec_nm_prsn_tgs_c_nm_prsn_d;
+drop index ix_ec_nm_prsn_tgs_c_nm_prsn_d;
+
+alter table ec_person_phone drop constraint fk_ec_person_phone_owner_id;
+drop index ix_ec_person_phone_owner_id;
+
+alter table ec_top drop constraint fk_ec_top_person_id;
+drop index ix_ec_top_person_id;
+
+alter table ec_top_ecs_person drop constraint fk_ec_top_ecs_person_ec_top;
+drop index ix_ec_top_ecs_person_ec_top;
+
+alter table ec_top_ecs_person drop constraint fk_ec_tp_cs_prsn_cs_prsn;
+drop index ix_ec_tp_cs_prsn_cs_prsn;
+
+alter table ecbl_person_phone_numbers drop constraint fk_ecbl_prsn_phn_nmbrs_prsn_d;
+drop index ix_ecbl_prsn_phn_nmbrs_prsn_d;
+
+alter table ecbm_person_phone_numbers drop constraint fk_ecbm_prsn_phn_nmbrs_prsn_d;
+drop index ix_ecbm_prsn_phn_nmbrs_prsn_d;
+
+alter table ecm_person_phone_numbers drop constraint fk_ecm_prsn_phn_nmbrs_cm_pr_1;
+drop index ix_ecm_prsn_phn_nmbrs_cm_pr_1;
+
+alter table ecmc_person_phone_numbers drop constraint fk_ecmc_prsn_phn_nmbrs_cmc__1;
+drop index ix_ecmc_prsn_phn_nmbrs_cmc__1;
+
+alter table ecs_person_phone drop constraint fk_ecs_prsn_phn_cs_prsn_d;
+drop index ix_ecs_prsn_phn_cs_prsn_d;
+
+alter table ecsm_child drop constraint fk_ecsm_child_ecsm_parent_id;
+drop index ix_ecsm_child_ecsm_parent_id;
+
+alter table td_child drop constraint fk_td_child_parent_id;
+drop index ix_td_child_parent_id;
+
+alter table element_bean drop constraint fk_elmnt_bn_cmplx_bn_d;
+drop index ix_elmnt_bn_cmplx_bn_d;
+
+alter table empl drop constraint fk_empl_default_address_id;
+drop index ix_empl_default_address_id;
+
+alter table esd_detail drop constraint fk_esd_detail_master_id;
+drop index ix_esd_detail_master_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 hi_tthree drop constraint fk_hi_tthree_hi_ttwo_id;
+drop index ix_hi_tthree_hi_ttwo_id;
+
+alter table hi_ttwo drop constraint fk_hi_ttwo_hi_tone_id;
+drop index ix_hi_ttwo_hi_tone_id;
+
+alter table hsd_setting drop constraint fk_hsd_setting_user_id;
+
+alter table iaf_segment drop constraint fk_iaf_segment_status_id;
+drop index ix_iaf_segment_status_id;
+
+alter table imrelated drop constraint fk_imrelated_owner_id;
+drop index ix_imrelated_owner_id;
+
+alter table info_contact drop constraint fk_info_contact_company_id;
+drop index ix_info_contact_company_id;
+
+alter table info_customer drop constraint fk_info_customer_company_id;
+
+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_etype;
+drop index ix_item_etype;
+
+alter table item drop constraint fk_item_eregion;
+drop index ix_item_eregion;
+
+alter table mkeygroup_monkey drop constraint fk_mkeygroup_monkey_mkeygroup;
+
+alter table mkeygroup_monkey drop constraint fk_mkeygroup_monkey_monkey;
+
+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;
+
+alter table level1_level4 drop constraint fk_level1_level4_level4;
+drop index ix_level1_level4_level4;
+
+alter table level1_level2 drop constraint fk_level1_level2_level1;
+drop index ix_level1_level2_level1;
+
+alter table level1_level2 drop constraint fk_level1_level2_level2;
+drop index ix_level1_level2_level2;
+
+alter table level2_level3 drop constraint fk_level2_level3_level2;
+drop index ix_level2_level3_level2;
+
+alter table level2_level3 drop constraint fk_level2_level3_level3;
+drop index ix_level2_level3_level3;
+
+alter table link drop constraint fk_link_id;
+
+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 looney drop constraint fk_looney_tune_id;
+drop index ix_looney_tune_id;
+
+alter table mcontact drop constraint fk_mcontact_customer_id;
+drop index ix_mcontact_customer_id;
+
+alter table mcontact_message drop constraint fk_mcntct_mssg_cntct_d;
+drop index ix_mcntct_mssg_cntct_d;
+
+alter table mcustomer drop constraint fk_mcstmr_shppng_ddrss_d;
+drop index ix_mcstmr_shppng_ddrss_d;
+
+alter table mcustomer drop constraint fk_mcstmr_bllng_ddrss_d;
+drop index ix_mcstmr_bllng_ddrss_d;
+
+alter table mmachine_mgroup drop constraint fk_mmachine_mgroup_mmachine;
+drop index ix_mmachine_mgroup_mmachine;
+
+alter table mmachine_mgroup drop constraint fk_mmachine_mgroup_mgroup;
+drop index ix_mmachine_mgroup_mgroup;
+
+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_mprntr_lst_swp_mgnt_d;
+
+alter table mprinter drop constraint fk_mprntr_lst_swp_yllw_d;
+
+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;
+
+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;
+
+alter table mrole_muser drop constraint fk_mrole_muser_muser;
+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 meter_contract_data drop constraint fk_mtr_cntrct_dt_spcl_nds_c_1;
+
+alter table meter_special_needs_client drop constraint fk_mtr_spcl_nds_clnt_prmry_d;
+
+alter table meter_version drop constraint fk_mtr_vrsn_ddrss_dt_d;
+
+alter table meter_version drop constraint fk_mtr_vrsn_cntrct_dt_d;
+
+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_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 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 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 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 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_bean_child drop constraint fk_o_bn_chld_cchd_bn_d;
+drop index ix_o_bn_chld_cchd_bn_d;
+
+alter table ocached_app_detail drop constraint fk_ocached_app_detail_app_id;
+drop index ix_ocached_app_detail_app_id;
+
+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 omvertex_other drop constraint fk_omvertex_other_omvertex_id;
+drop index ix_omvertex_other_omvertex_id;
+
+alter table oroad_show_msg drop constraint fk_oroad_show_msg_company_id;
+
+alter table om_account_child_dbo drop constraint fk_om_ccnt_chld_db_bnn_rm_d;
+drop index ix_om_ccnt_chld_db_bnn_rm_d;
+
+alter table om_basic_child drop constraint fk_om_basic_child_parent_id;
+drop index ix_om_basic_child_parent_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;
+
+alter table o_order_detail drop constraint fk_o_order_detail_order_id;
+drop index ix_o_order_detail_order_id;
+
+alter table o_order_detail drop constraint fk_o_order_detail_product_id;
+drop index ix_o_order_detail_product_id;
+
+alter table s_order_items drop constraint fk_s_order_items_order_uuid;
+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 organization_node drop constraint fk_orgnztn_nd_prnt_tr_nd_d;
+
+alter table orp_detail drop constraint fk_orp_detail_master_id;
+drop index ix_orp_detail_master_id;
+
+alter table orp_detail2 drop constraint fk_orp_detail2_orp_master2_id;
+drop index ix_orp_detail2_orp_master2_id;
+
+alter table oto_atwo drop constraint fk_oto_atwo_aone_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_level_a drop constraint fk_oto_level_a_b_id;
+
+alter table oto_level_b drop constraint fk_oto_level_b_c_id;
+
+alter table oto_prime_extra drop constraint fk_oto_prime_extra_eid;
+
+alter table oto_sd_child drop constraint fk_oto_sd_child_master_id;
+
+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_user_model drop constraint fk_ot_sr_mdl_sr_ptnl_d;
+
+alter table pfile drop constraint fk_pfile_file_content_id;
+
+alter table pfile drop constraint fk_pfile_file_content2_id;
+
+alter table paggview drop constraint fk_paggview_pview_id;
+
+alter table pallet_location drop constraint fk_pallet_location_zone_sid;
+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_rwnhrt_prnt_rwnhrt_d_rwn_1;
+drop index ix_rwnhrt_prnt_rwnhrt_d_rwn_1;
+
+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 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 pcf_calendar drop constraint fk_pcf_calendar_pcf_person_id;
+drop index ix_pcf_calendar_pcf_person_id;
+
+alter table pcf_city drop constraint fk_pcf_city_pcf_country_id;
+drop index ix_pcf_city_pcf_country_id;
+
+alter table pcf_city drop constraint fk_pcf_city_mayor_id;
+
+alter table pcf_city drop constraint fk_pcf_city_vice_mayor_id;
+
+alter table pcf_event drop constraint fk_pcf_event_pcf_calendar_id;
+drop index ix_pcf_event_pcf_calendar_id;
+
+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;
+
+alter table person_cache_email drop constraint fk_prsn_cch_ml_prsn_nf_prsn_d;
+drop index ix_prsn_cch_ml_prsn_nf_prsn_d;
+
+alter table phones drop constraint fk_phones_person_id;
+drop index ix_phones_person_id;
+
+alter table e_position drop constraint fk_e_position_contract_id;
+drop index ix_e_position_contract_id;
+
+alter table pp_to_ww drop constraint fk_pp_to_ww_pp;
+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_wview;
+
+alter table question drop constraint fk_question_groupobjectid;
+drop index ix_question_groupobjectid;
+
+alter table r_orders drop constraint fk_r_orders_customer;
+drop index ix_r_orders_customer;
+
+alter table rel_master drop constraint fk_rel_master_detail_id;
+drop index ix_rel_master_detail_id;
+
+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_role;
+
+alter table mt_role_permission drop constraint fk_mt_rl_prmssn_mt_prmssn;
+drop index ix_mt_rl_prmssn_mt_prmssn;
+
+alter table root_bean drop constraint fk_rt_bn_rfrncng_bn_d;
+drop index ix_rt_bn_rfrncng_bn_d;
+
+alter table f_second drop constraint fk_f_second_first;
+
+alter table section drop constraint fk_section_article_id;
+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_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 e_save_test_b drop constraint fk_e_save_test_b_sibling_a_id;
+
+alter table site drop constraint fk_site_parent_id;
+drop index ix_site_parent_id;
+
+alter table site drop constraint fk_site_data_container_id;
+
+alter table site drop constraint fk_site_site_address_id;
+
+alter table source_base drop constraint fk_source_base_target_id;
+drop index ix_source_base_target_id;
+
+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 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 ttruck_holder drop constraint fk_ttrck_hldr_trck_plt_n;
+drop index ix_ttrck_hldr_trck_plt_n;
+
+alter table ttruck_holder drop constraint fk_ttruck_holder_basic_id;
+drop index ix_ttruck_holder_basic_id;
+
+alter table ttruck_holder_item drop constraint fk_ttrck_hldr_tm_wnr_d;
+drop index ix_ttrck_hldr_tm_wnr_d;
+
+alter table twheel drop constraint fk_twheel_owner_plate_no;
+drop index ix_twheel_owner_plate_no;
+
+alter table tire drop constraint fk_tire_wheel;
+
+alter table tree_entity drop constraint fk_tree_entity_parent_id;
+drop index ix_tree_entity_parent_id;
+
+alter table trip drop constraint fk_trip_vehicle_driver_id;
+drop index ix_trip_vehicle_driver_id;
+
+alter table trip drop constraint fk_trip_address_id;
+drop index ix_trip_address_id;
+
+alter table "type" drop constraint fk_type_sub_type_id;
+drop index ix_type_sub_type_id;
+
+alter table usib_child drop constraint fk_usib_child_parent_id;
+drop index ix_usib_child_parent_id;
+
+alter table usib_child_sibling drop constraint fk_usb_chld_sblng_chld_d;
+
+alter table ut_detail drop constraint fk_ut_detail_utmaster_id;
+drop index ix_ut_detail_utmaster_id;
+
+alter table uutwo drop constraint fk_uutwo_master_id;
+drop index ix_uutwo_master_id;
+
+alter table oto_user drop constraint fk_oto_user_account_id;
+
+alter table c_user drop constraint fk_c_user_group_id;
+drop index ix_c_user_group_id;
+
+alter table em_user_role drop constraint fk_em_user_role_user_id;
+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_lease_id;
+drop index ix_vehicle_lease_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;
+
+alter table vehicle_driver drop constraint fk_vehicle_driver_address_id;
+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_wrhssshppngzns_wrhss;
+drop index ix_wrhssshppngzns_wrhss;
+
+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;
+
+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;
+
+drop table asimple_bean cascade constraints purge;
+
+drop table bar cascade constraints purge;
+
+drop table block cascade constraints purge;
+
+drop table oto_account cascade constraints purge;
+
+drop table acl cascade constraints purge;
+
+drop table acl_container_relation cascade constraints purge;
+
+drop table addr cascade constraints purge;
+
+drop table address cascade constraints purge;
+
+drop table o_address cascade constraints purge;
+
+drop table album cascade constraints purge;
+
+drop table animal cascade constraints purge;
+
+drop table animal_shelter cascade constraints purge;
+
+drop table article cascade constraints purge;
+
+drop table attribute cascade constraints purge;
+
+drop table attribute_holder cascade constraints purge;
+
+drop table audit_log cascade constraints purge;
+
+drop table bbookmark cascade constraints purge;
+
+drop table bbookmark_org cascade constraints purge;
+
+drop table bbookmark_user cascade constraints purge;
+
+drop table bsimple_with_gen cascade constraints purge;
+
+drop table bsite cascade constraints purge;
+
+drop table bsite_user_a cascade constraints purge;
+
+drop table bsite_user_b cascade constraints purge;
+
+drop table bsite_user_c cascade constraints purge;
+
+drop table bsite_user_d cascade constraints purge;
+
+drop table bsite_user_e cascade constraints purge;
+
+drop table buser cascade constraints purge;
+
+drop table bwith_qident cascade constraints purge;
+
+drop table basic_draftable_bean cascade constraints purge;
+
+drop table basic_draftable_bean_draft cascade constraints purge;
+
+drop table basic_joda_entity cascade constraints purge;
+
+drop table bean_with_time_zone cascade constraints purge;
+
+drop table drel_booking cascade constraints purge;
+drop sequence drel_booking_seq;
+
+drop table bw_bean cascade constraints purge;
+
+drop table cepcategory cascade constraints purge;
+
+drop table cepproduct cascade constraints purge;
+
+drop table cepproduct_category cascade constraints purge;
+
+drop table ciaddress cascade constraints purge;
+
+drop table cicustomer_parent cascade constraints purge;
+
+drop table cistreet_parent cascade constraints purge;
+
+drop table cinh_ref cascade constraints purge;
+
+drop table cinh_root cascade constraints purge;
+
+drop table ckey_assoc cascade constraints purge;
+
+drop table ckey_detail cascade constraints purge;
+
+drop table ckey_parent cascade constraints purge;
+
+drop table coone cascade constraints purge;
+
+drop table coone_many cascade constraints purge;
+
+drop table coroot cascade constraints purge;
+
+drop table calculation_result cascade constraints purge;
+
+drop table cao_bean cascade constraints purge;
+
+drop table sp_car_car cascade constraints purge;
+drop sequence sp_car_car_seq;
+
+drop table sp_car_car_wheels cascade constraints purge;
+
+drop table sp_car_car_doors cascade constraints purge;
+
+drop table sa_car cascade constraints purge;
+drop sequence sa_car_seq;
+
+drop table car_accessory cascade constraints purge;
+
+drop table car_fuse cascade constraints purge;
+
+drop table category cascade constraints purge;
+
+drop table e_save_test_d cascade constraints purge;
+
+drop table child_person cascade constraints purge;
+
+drop table cke_client cascade constraints purge;
+
+drop table cke_user cascade constraints purge;
+
+drop table class_super cascade constraints purge;
+
+drop table class_super_monkey cascade constraints purge;
+
+drop table configuration cascade constraints purge;
+
+drop table configurations cascade constraints purge;
+
+drop table contact cascade constraints purge;
+
+drop table contact_group cascade constraints purge;
+
+drop table contact_note cascade constraints purge;
+
+drop table contract cascade constraints purge;
+
+drop table contract_costs cascade constraints purge;
+
+drop table c_conversation cascade constraints purge;
+
+drop table o_country cascade constraints purge;
+
+drop table cover cascade constraints purge;
+
+drop table o_customer cascade constraints purge;
+
+drop table dcredit cascade constraints purge;
+
+drop table dcredit_drol cascade constraints purge;
+
+drop table dexh_entity cascade constraints purge;
+
+drop table dint_parent cascade constraints purge;
+
+drop table dmachine cascade constraints purge;
+
+drop table d_machine_aux_use cascade constraints purge;
+
+drop table d_machine_stats cascade constraints purge;
+
+drop table d_machine_use cascade constraints purge;
+
+drop table dorg cascade constraints purge;
+
+drop table dperson cascade constraints purge;
+
+drop table drol cascade constraints purge;
+
+drop table drot cascade constraints purge;
+
+drop table drot_drol cascade constraints purge;
+
+drop table rawinherit_data cascade constraints purge;
+
+drop table data_container cascade constraints purge;
+
+drop table dc_detail cascade constraints purge;
+
+drop table dc_master cascade constraints purge;
+
+drop table dfk_cascade cascade constraints purge;
+
+drop table dfk_cascade_one cascade constraints purge;
+
+drop table dfk_none cascade constraints purge;
+
+drop table dfk_none_via_join cascade constraints purge;
+
+drop table dfk_none_via_mto_m cascade constraints purge;
+
+drop table dfk_none_via_mto_m_dfk_one cascade constraints purge;
+
+drop table dfk_one cascade constraints purge;
+
+drop table dfk_set_null cascade constraints purge;
+
+drop table doc cascade constraints purge;
+
+drop table doc_link cascade constraints purge;
+
+drop table doc_link_draft cascade constraints purge;
+
+drop table doc_draft cascade constraints purge;
+
+drop table document cascade constraints purge;
+
+drop table document_draft cascade constraints purge;
+
+drop table document_media cascade constraints purge;
+
+drop table document_media_draft cascade constraints purge;
+
+drop table sp_car_door cascade constraints purge;
+drop sequence sp_car_door_seq;
+
+drop table earray_bean cascade constraints purge;
+
+drop table earray_set_bean cascade constraints purge;
+
+drop table e_basic cascade constraints purge;
+
+drop table ebasic_change_log cascade constraints purge;
+
+drop table ebasic_clob cascade constraints purge;
+
+drop table ebasic_clob_fetch_eager cascade constraints purge;
+
+drop table ebasic_clob_no_ver cascade constraints purge;
+
+drop table e_basicenc cascade constraints purge;
+
+drop table e_basicenc_bin cascade constraints purge;
+
+drop table e_basicenc_client cascade constraints purge;
+
+drop table e_basicenc_relate cascade constraints purge;
+
+drop table e_basic_enum_id cascade constraints purge;
+
+drop table e_basic_eni cascade constraints purge;
+
+drop table ebasic_hstore cascade constraints purge;
+
+drop table ebasic_json_jackson cascade constraints purge;
+
+drop table ebasic_json_jackson2 cascade constraints purge;
+
+drop table ebasic_json_list cascade constraints purge;
+
+drop table ebasic_json_map cascade constraints purge;
+
+drop table ebasic_json_map_blob cascade constraints purge;
+
+drop table ebasic_json_map_clob cascade constraints purge;
+
+drop table ebasic_json_map_detail cascade constraints purge;
+
+drop table ebasic_json_map_json_b cascade constraints purge;
+
+drop table ebasic_json_map_varchar cascade constraints purge;
+
+drop table ebasic_json_node cascade constraints purge;
+
+drop table ebasic_json_node_blob cascade constraints purge;
+
+drop table ebasic_json_node_json_b cascade constraints purge;
+
+drop table ebasic_json_node_varchar cascade constraints purge;
+
+drop table ebasic_json_unmapped cascade constraints purge;
+
+drop table e_basic_ndc cascade constraints purge;
+
+drop table ebasic_no_sdchild cascade constraints purge;
+
+drop table ebasic_sdchild cascade constraints purge;
+
+drop table ebasic_soft_delete cascade constraints purge;
+
+drop table e_basicver cascade constraints purge;
+
+drop table e_basic_withlife cascade constraints purge;
+
+drop table e_basic_with_ex cascade constraints purge;
+
+drop table e_basicverucon cascade constraints purge;
+
+drop table ecache_child cascade constraints purge;
+
+drop table ecache_root cascade constraints purge;
+
+drop table e_col_ab cascade constraints purge;
+
+drop table ecustom_id cascade constraints purge;
+
+drop table edefault_prop cascade constraints purge;
+
+drop table eemb_inner cascade constraints purge;
+
+drop table eemb_outer cascade constraints purge;
+
+drop table efile2_no_fk cascade constraints purge;
+
+drop table efile_no_fk cascade constraints purge;
+
+drop table efile_no_fk_euser_no_fk cascade constraints purge;
+
+drop table efile_no_fk_euser_no_fk_soft_d cascade constraints purge;
+
+drop table egen_props cascade constraints purge;
+
+drop table eid_uid_bean cascade constraints purge;
+
+drop table einvoice cascade constraints purge;
+
+drop table e_main cascade constraints purge;
+
+drop table enull_collection cascade constraints purge;
+
+drop table enull_collection_detail cascade constraints purge;
+
+drop table eopt_one_a cascade constraints purge;
+
+drop table eopt_one_b cascade constraints purge;
+
+drop table eopt_one_c cascade constraints purge;
+
+drop table eper_addr cascade constraints purge;
+
+drop table eperson cascade constraints purge;
+
+drop table e_person_online cascade constraints purge;
+
+drop table esimple cascade constraints purge;
+
+drop table esoft_del_book cascade constraints purge;
+
+drop table esoft_del_book_esoft_del_user cascade constraints purge;
+
+drop table esoft_del_down cascade constraints purge;
+
+drop table esoft_del_mid cascade constraints purge;
+
+drop table esoft_del_one_a cascade constraints purge;
+
+drop table esoft_del_one_b cascade constraints purge;
+
+drop table esoft_del_role cascade constraints purge;
+
+drop table esoft_del_role_esoft_del_user cascade constraints purge;
+
+drop table esoft_del_top cascade constraints purge;
+
+drop table esoft_del_up cascade constraints purge;
+
+drop table esoft_del_user cascade constraints purge;
+
+drop table esoft_del_user_esoft_del_role cascade constraints purge;
+
+drop table esome_convert_type cascade constraints purge;
+
+drop table esome_type cascade constraints purge;
+
+drop table etrans_many cascade constraints purge;
+
+drop table rawinherit_uncle cascade constraints purge;
+
+drop table euser_no_fk cascade constraints purge;
+
+drop table euser_no_fk_soft_del cascade constraints purge;
+
+drop table evanilla_collection cascade constraints purge;
+
+drop table evanilla_collection_detail cascade constraints purge;
+
+drop table ewho_props cascade constraints purge;
+
+drop table e_withinet cascade constraints purge;
+
+drop table ec_enum_person cascade constraints purge;
+
+drop table ec_enum_person_tags cascade constraints purge;
+
+drop table ec_person cascade constraints purge;
+
+drop table ec_person_phone cascade constraints purge;
+
+drop table ec_top cascade constraints purge;
+
+drop table ec_top_ecs_person cascade constraints purge;
+
+drop table ecbl_person cascade constraints purge;
+
+drop table ecbl_person_phone_numbers cascade constraints purge;
+
+drop table ecbm_person cascade constraints purge;
+
+drop table ecbm_person_phone_numbers cascade constraints purge;
+
+drop table ecm_person cascade constraints purge;
+
+drop table ecm_person_phone_numbers cascade constraints purge;
+
+drop table ecmc_person cascade constraints purge;
+
+drop table ecmc_person_phone_numbers cascade constraints purge;
+
+drop table ecs_person cascade constraints purge;
+
+drop table ecs_person_phone cascade constraints purge;
+
+drop table ecsm_child cascade constraints purge;
+
+drop table ecsm_values cascade constraints purge;
+
+drop table ecsm_one cascade constraints purge;
+
+drop table ecsm_parent cascade constraints purge;
+
+drop table ecsm_two cascade constraints purge;
+
+drop table td_child cascade constraints purge;
+
+drop table td_parent cascade constraints purge;
+
+drop table element_bean cascade constraints purge;
+
+drop table empl cascade constraints purge;
+
+drop table esd_detail cascade constraints purge;
+
+drop table esd_master cascade constraints purge;
+
+drop table feature_desc cascade constraints purge;
+
+drop table f_first cascade constraints purge;
+
+drop table foo cascade constraints purge;
+
+drop table gen_key_identity cascade constraints purge;
+
+drop table gen_key_sequence cascade constraints purge;
+drop sequence SEQ_NAME;
+
+drop table grand_parent_person cascade constraints purge;
+
+drop table survey_group cascade constraints purge;
+
+drop table c_group cascade constraints purge;
+
+drop table he_doc cascade constraints purge;
+
+drop table hx_link cascade constraints purge;
+
+drop table hx_link_doc cascade constraints purge;
+
+drop table hi_doc cascade constraints purge;
+
+drop table hi_link cascade constraints purge;
+
+drop table hi_link_doc cascade constraints purge;
+
+drop table hi_tone cascade constraints purge;
+
+drop table hi_tthree cascade constraints purge;
+
+drop table hi_ttwo cascade constraints purge;
+
+drop table hsd_setting cascade constraints purge;
+
+drop table hsd_user cascade constraints purge;
+
+drop table iaf_segment cascade constraints purge;
+
+drop table iaf_segment_status cascade constraints purge;
+
+drop table imrelated cascade constraints purge;
+
+drop table imroot cascade constraints purge;
+
+drop table ixresource cascade constraints purge;
+
+drop table info_company cascade constraints purge;
+
+drop table info_contact cascade constraints purge;
+
+drop table info_customer cascade constraints purge;
+
+drop table inner_report cascade constraints purge;
+
+drop table drel_invoice cascade constraints purge;
+drop sequence drel_invoice_seq;
+
+drop table item cascade constraints purge;
+
+drop table monkey cascade constraints purge;
+
+drop table mkeygroup cascade constraints purge;
+
+drop table mkeygroup_monkey cascade constraints purge;
+
+drop table trainer cascade constraints purge;
+
+drop table trainer_monkey cascade constraints purge;
+
+drop table troop cascade constraints purge;
+
+drop table troop_monkey cascade constraints purge;
+
+drop table l2_cldf_reset_bean cascade constraints purge;
+
+drop table l2_cldf_reset_bean_child cascade constraints purge;
+
+drop table level1 cascade constraints purge;
+
+drop table level1_level4 cascade constraints purge;
+
+drop table level1_level2 cascade constraints purge;
+
+drop table level2 cascade constraints purge;
+
+drop table level2_level3 cascade constraints purge;
+
+drop table level3 cascade constraints purge;
+
+drop table level4 cascade constraints purge;
+
+drop table link cascade constraints purge;
+
+drop table link_draft cascade constraints purge;
+
+drop table la_attr_value cascade constraints purge;
+
+drop table la_attr_value_attribute cascade constraints purge;
+
+drop table looney cascade constraints purge;
+
+drop table maddress cascade constraints purge;
+
+drop table mcontact cascade constraints purge;
+
+drop table mcontact_message cascade constraints purge;
+
+drop table mcustomer cascade constraints purge;
+
+drop table mgroup cascade constraints purge;
+
+drop table mmachine cascade constraints purge;
+
+drop table mmachine_mgroup cascade constraints purge;
+
+drop table mmedia cascade constraints purge;
+
+drop table non_updateprop cascade constraints purge;
+
+drop table mprinter cascade constraints purge;
+
+drop table mprinter_state cascade constraints purge;
+
+drop table mprofile cascade constraints purge;
+
+drop table mprotected_construct_bean cascade constraints purge;
+
+drop table mrole cascade constraints purge;
+
+drop table mrole_muser cascade constraints purge;
+
+drop table msome_other cascade constraints purge;
+
+drop table muser cascade constraints purge;
+
+drop table muser_type cascade constraints purge;
+
+drop table mail_box cascade constraints purge;
+
+drop table mail_user cascade constraints purge;
+
+drop table mail_user_inbox cascade constraints purge;
+
+drop table mail_user_outbox cascade constraints purge;
+
+drop table main_entity cascade constraints purge;
+
+drop table main_entity_relation cascade constraints purge;
+
+drop table map_super_actual cascade constraints purge;
+
+drop table c_message cascade constraints purge;
+
+drop table meter_address_data cascade constraints purge;
+
+drop table meter_contract_data cascade constraints purge;
+
+drop table meter_special_needs_client cascade constraints purge;
+
+drop table meter_special_needs_contact cascade constraints purge;
+
+drop table meter_version cascade constraints purge;
+
+drop table mnoc_role cascade constraints purge;
+
+drop table mnoc_user cascade constraints purge;
+
+drop table mnoc_user_mnoc_role cascade constraints purge;
+
+drop table mny_a cascade constraints purge;
+
+drop table mny_b cascade constraints purge;
+
+drop table mny_b_mny_c cascade constraints purge;
+
+drop table mny_c cascade constraints purge;
+
+drop table mny_topic cascade constraints purge;
+
+drop table subtopics cascade constraints purge;
+
+drop table mp_role cascade constraints purge;
+
+drop table mp_user cascade constraints purge;
+
+drop table ms_many_a cascade constraints purge;
+
+drop table ms_many_a_many_b cascade constraints purge;
+
+drop table ms_many_b cascade constraints purge;
+
+drop table ms_many_b_many_a cascade constraints purge;
+
+drop table my_lob_size cascade constraints purge;
+
+drop table my_lob_size_join_many cascade constraints purge;
+
+drop table noidbean cascade constraints purge;
+
+drop table o_bean_child cascade constraints purge;
+
+drop table ocached_app cascade constraints purge;
+
+drop table ocached_app_detail cascade constraints purge;
+
+drop table o_cached_bean cascade constraints purge;
+
+drop table o_cached_bean_country cascade constraints purge;
+
+drop table o_cached_bean_child cascade constraints purge;
+
+drop table o_cached_inherit cascade constraints purge;
+
+drop table o_cached_natkey cascade constraints purge;
+
+drop table o_cached_natkey3 cascade constraints purge;
+
+drop table ocached_nkey_uid cascade constraints purge;
+
+drop table ocar cascade constraints purge;
+
+drop table ocompany cascade constraints purge;
+
+drop table oengine cascade constraints purge;
+
+drop table ogear_box cascade constraints purge;
+
+drop table omvertex cascade constraints purge;
+
+drop table omvertex_other cascade constraints purge;
+
+drop table oroad_show_msg cascade constraints purge;
+
+drop table om_account_child_dbo cascade constraints purge;
+
+drop table om_account_dbo cascade constraints purge;
+
+drop table om_basic_child cascade constraints purge;
+
+drop table om_basic_parent cascade constraints purge;
+
+drop table om_ordered_detail cascade constraints purge;
+
+drop table om_ordered_master cascade constraints purge;
+
+drop table only_id_entity cascade constraints purge;
+
+drop table o_order cascade constraints purge;
+
+drop table o_order_detail cascade constraints purge;
+
+drop table s_orders cascade constraints purge;
+
+drop table s_order_items cascade constraints purge;
+
+drop table or_order_ship cascade constraints purge;
+
+drop table organisation cascade constraints purge;
+
+drop table organization_node cascade constraints purge;
+
+drop table organization_tree_node cascade constraints purge;
+
+drop table orp_detail cascade constraints purge;
+
+drop table orp_detail2 cascade constraints purge;
+
+drop table orp_master cascade constraints purge;
+
+drop table orp_master2 cascade constraints purge;
+
+drop table oto_aone cascade constraints purge;
+
+drop table oto_atwo cascade constraints purge;
+
+drop table oto_bchild cascade constraints purge;
+
+drop table oto_bmaster cascade constraints purge;
+
+drop table oto_child cascade constraints purge;
+
+drop table oto_cust cascade constraints purge;
+
+drop table oto_cust_address cascade constraints purge;
+
+drop table oto_level_a cascade constraints purge;
+
+drop table oto_level_b cascade constraints purge;
+
+drop table oto_level_c cascade constraints purge;
+
+drop table oto_master cascade constraints purge;
+
+drop table oto_prime cascade constraints purge;
+
+drop table oto_prime_extra cascade constraints purge;
+
+drop table oto_sd_child cascade constraints purge;
+
+drop table oto_sd_master cascade constraints purge;
+
+drop table oto_th_many cascade constraints purge;
+
+drop table oto_th_one cascade constraints purge;
+
+drop table oto_th_top cascade constraints purge;
+
+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 oto_user_model cascade constraints purge;
+
+drop table oto_user_model_optional cascade constraints purge;
+
+drop table pfile cascade constraints purge;
+
+drop table pfile_content cascade constraints purge;
+
+drop table paggview cascade constraints purge;
+
+drop table pallet_location cascade constraints purge;
+
+drop table parcel cascade constraints purge;
+
+drop table parcel_location cascade constraints purge;
+
+drop table rawinherit_parent cascade constraints purge;
+
+drop table rawinherit_parent_rawinherit_d cascade constraints purge;
+
+drop table e_save_test_c cascade constraints purge;
+
+drop table parent_person cascade constraints purge;
+
+drop table c_participation cascade constraints purge;
+
+drop table password_store_model cascade constraints purge;
+
+drop table pcf_calendar cascade constraints purge;
+
+drop table pcf_city cascade constraints purge;
+
+drop table pcf_country cascade constraints purge;
+
+drop table pcf_event cascade constraints purge;
+
+drop table pcf_person cascade constraints purge;
+
+drop table mt_permission cascade constraints purge;
+
+drop table persistent_file cascade constraints purge;
+
+drop table persistent_file_content cascade constraints purge;
+
+drop table person cascade constraints purge;
+
+drop table persons cascade constraints purge;
+
+drop table person_cache_email cascade constraints purge;
+
+drop table person_cache_info cascade constraints purge;
+
+drop table phones cascade constraints purge;
+
+drop table e_position cascade constraints purge;
+
+drop table primary_revision cascade constraints purge;
+
+drop table o_product cascade constraints purge;
+
+drop table pp cascade constraints purge;
+
+drop table pp_to_ww cascade constraints purge;
+
+drop table question cascade constraints purge;
+
+drop table rcustomer cascade constraints purge;
+
+drop table r_orders cascade constraints purge;
+
+drop table referencing_bean cascade constraints purge;
+
+drop table region cascade constraints purge;
+
+drop table rel_detail cascade constraints purge;
+
+drop table rel_master cascade constraints purge;
+
+drop table resourcefile cascade constraints purge;
+
+drop table mt_role cascade constraints purge;
+
+drop table mt_role_permission cascade constraints purge;
+
+drop table em_role cascade constraints purge;
+
+drop table root_bean cascade constraints purge;
+
+drop table f_second cascade constraints purge;
+
+drop table section cascade constraints purge;
+
+drop table self_parent cascade constraints purge;
+
+drop table self_ref_customer cascade constraints purge;
+
+drop table self_ref_example cascade constraints purge;
+
+drop table e_save_test_a cascade constraints purge;
+
+drop table e_save_test_b cascade constraints purge;
+
+drop table site cascade constraints purge;
+
+drop table site_address cascade constraints purge;
+
+drop table some_enum_bean cascade constraints purge;
+
+drop table some_file_bean cascade constraints purge;
+
+drop table some_new_types_bean cascade constraints purge;
+
+drop table some_period_bean cascade constraints purge;
+
+drop table source_base cascade constraints purge;
+
+drop table stockforecast cascade constraints purge;
+
+drop table sub_section cascade constraints purge;
+
+drop table sub_type cascade constraints purge;
+
+drop table survey cascade constraints purge;
+
+drop table tbytes_only cascade constraints purge;
+
+drop table tcar cascade constraints purge;
+
+drop table tevent cascade constraints purge;
+
+drop table tevent_many cascade constraints purge;
+
+drop table tevent_one cascade constraints purge;
+
+drop table tint_root cascade constraints purge;
+
+drop table tjoda_entity cascade constraints purge;
+
+drop table t_mapsuper1 cascade constraints purge;
+
+drop table t_oneb cascade constraints purge;
+
+drop table t_detail_with_other_namexxxyy cascade constraints purge;
+drop sequence t_atable_detail_seq;
+
+drop table t_atable_thatisrelatively cascade constraints purge;
+drop sequence t_atable_master_seq;
+
+drop table ttruck_holder cascade constraints purge;
+
+drop table ttruck_holder_item cascade constraints purge;
+
+drop table tuuid_entity cascade constraints purge;
+
+drop table twheel cascade constraints purge;
+
+drop table twith_pre_insert cascade constraints purge;
+
+drop table target_base cascade constraints purge;
+
+drop table mt_tenant cascade constraints purge;
+
+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 tree_entity cascade constraints purge;
+
+drop table trip cascade constraints purge;
+
+drop table truck_ref cascade constraints purge;
+
+drop table tune cascade constraints purge;
+
+drop table "type" cascade constraints purge;
+
+drop table tz_bean cascade constraints purge;
+
+drop table usib_child cascade constraints purge;
+
+drop table usib_child_sibling cascade constraints purge;
+
+drop table usib_parent cascade constraints purge;
+
+drop table ut_detail cascade constraints purge;
+
+drop table ut_master cascade constraints purge;
+
+drop table uuone cascade constraints purge;
+
+drop table uutwo cascade constraints purge;
+
+drop table oto_user cascade constraints purge;
+
+drop table c_user cascade constraints purge;
+
+drop table tx_user cascade constraints purge;
+
+drop table g_user cascade constraints purge;
+
+drop table em_user cascade constraints purge;
+
+drop table user_interest_live cascade constraints purge;
+
+drop table em_user_role cascade constraints purge;
+
+drop table vehicle cascade constraints purge;
+
+drop table vehicle_driver cascade constraints purge;
+
+drop table vehicle_lease cascade constraints purge;
+
+drop table warehouses cascade constraints purge;
+
+drop table warehousesshippingzones cascade constraints purge;
+
+drop table wheel cascade constraints purge;
+drop sequence wheel_seq;
+
+drop table sa_wheel cascade constraints purge;
+drop sequence sa_wheel_seq;
+
+drop table sp_car_wheel cascade constraints purge;
+drop sequence sp_car_wheel_seq;
+
+drop table g_who_props_otm cascade constraints purge;
+
+drop table with_zero cascade constraints purge;
+
+drop table parent cascade constraints purge;
+
+drop table wview cascade constraints purge;
+
+drop table zones cascade constraints purge;
+
+drop index ix_cntct_lst_nm_frst_nm;
+drop index ix_e_basic_name;
+drop index ix_efile2_no_fk_owner_id;
+drop index ix_ecsm_values_host_id;
+drop index ix_organization_node_kind;
+drop index ano_3;
diff --git a/ebean-core/src/test/ddl-review/pg-create-all.sql b/ebean-core/src/test/ddl-review/pg-create-all.sql
new file mode 100644
index 000000000..5b4bc24dd
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/pg-create-all.sql
@@ -0,0 +1,5236 @@
+-- Generated by ebean unknown at 2020-08-24T21:02:32.420817Z
+create table asimple_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_asimple_bean primary key (id)
+);
+
+create table bar (
+  bar_type                      varchar(31) not null,
+  bar_id                        integer generated by default as identity not null,
+  foo_id                        integer not null,
+  version                       integer not null,
+  constraint pk_bar primary key (bar_id)
+);
+
+create table block (
+  case_type                     integer not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  notes                         varchar(255),
+  constraint pk_block primary key (id)
+);
+
+create table oto_account (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_oto_account primary key (id)
+);
+
+create table acl (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_acl primary key (id)
+);
+
+create table acl_container_relation (
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  street                        varchar(255),
+  version                       integer not null,
+  constraint pk_address primary key (oid)
+);
+
+create table o_address (
+  id                            integer generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  shelter_id                    bigint,
+  version                       bigint not null,
+  name                          varchar(255),
+  registration_number           varchar(255),
+  date_of_birth                 date,
+  dog_size                      varchar(255),
+  constraint pk_animal primary key (id)
+);
+
+create table animal_shelter (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_animal_shelter primary key (id)
+);
+
+create table article (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  author                        varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_article primary key (id)
+);
+
+create table attribute (
+  option_type                   integer not null,
+  id                            integer generated by default as identity not null,
+  attribute_holder_id           integer,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_attribute primary key (id)
+);
+
+create table attribute_holder (
+  id                            integer generated by default as identity not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_attribute_holder primary key (id)
+);
+
+create table audit_log (
+  id                            bigint generated by default as identity (start with 1000 cache 100) not null,
+  description                   varchar(255),
+  modified_description          varchar(255),
+  constraint pk_audit_log primary key (id)
+);
+
+create table bbookmark (
+  id                            integer generated by default as identity not null,
+  bookmark_reference            varchar(255),
+  user_id                       integer,
+  constraint pk_bbookmark primary key (id)
+);
+
+create table bbookmark_org (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_bbookmark_org primary key (id)
+);
+
+create table bbookmark_user (
+  id                            integer generated by default as identity 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)
+);
+
+create table bsimple_with_gen (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  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_a (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  access_level                  integer,
+  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 (
+  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 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),
+  constraint pk_buser primary key (id)
+);
+
+create table bwith_qident (
+  id                            integer generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  period                        varchar(50),
+  local_date                    date,
+  created                       timestamptz not null,
+  updated                       timestamptz not null,
+  version                       timestamptz not null,
+  constraint pk_basic_joda_entity primary key (id)
+);
+
+create table bean_with_time_zone (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  timezone                      varchar(20),
+  constraint pk_bean_with_time_zone primary key (id)
+);
+
+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 increment by 1;
+
+create table bw_bean (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_cepcategory primary key (id)
+);
+
+create table cepproduct (
+  id                            bigint generated by default as identity 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 ciaddress (
+  id                            bigint generated by default as identity not null,
+  street_id                     bigint,
+  constraint pk_ciaddress primary key (id)
+);
+
+create table cicustomer_parent (
+  dtype                         integer not null,
+  id                            bigint generated by default as identity not null,
+  address_id                    bigint,
+  notes                         varchar(255),
+  constraint pk_cicustomer_parent primary key (id)
+);
+
+create table cistreet_parent (
+  dtype                         integer not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  num                           varchar(255),
+  constraint pk_cistreet_parent primary key (id)
+);
+
+create table cinh_ref (
+  id                            integer generated by default as identity 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                            integer generated by default as identity 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                            integer generated by default as identity not null,
+  assoc_one                     varchar(255),
+  constraint pk_ckey_assoc primary key (id)
+);
+
+create table ckey_detail (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  one_key                       integer,
+  two_key                       varchar(127),
+  constraint pk_ckey_detail primary key (id)
+);
+
+create table ckey_parent (
+  one_key                       integer not null,
+  two_key                       varchar(127) not null,
+  name                          varchar(255),
+  assoc_id                      integer,
+  version                       integer not null,
+  constraint pk_ckey_parent primary key (one_key,two_key)
+);
+
+create table coone (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_coone primary key (id)
+);
+
+create table coone_many (
+  id                            bigint generated by default as identity not null,
+  coone_id                      bigint not null,
+  name                          varchar(255),
+  deleted                       boolean default false not null,
+  constraint pk_coone_many primary key (id)
+);
+
+create table coroot (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint uq_coroot_one_id unique (one_id),
+  constraint pk_coroot primary key (id)
+);
+
+create table calculation_result (
+  id                            integer generated by default as identity not null,
+  charge                        float not null,
+  product_configuration_id      integer,
+  group_configuration_id        integer,
+  constraint pk_calculation_result primary key (id)
+);
+
+create table cao_bean (
+  x_cust_id                     integer not null,
+  x_type_id                     integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_cao_bean primary key (x_cust_id,x_type_id)
+);
+
+create table sp_car_car (
+  id                            bigint not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_car primary key (id)
+);
+create sequence sp_car_car_seq increment by 1;
+
+create table sp_car_car_wheels (
+  car                           bigint not null,
+  wheel                         bigint not null,
+  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,
+  brand                         varchar(255),
+  sold                          integer not null,
+  version                       integer not null,
+  constraint pk_sa_car primary key (id)
+);
+create sequence sa_car_seq increment by 1;
+
+create table car_accessory (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  fuse_id                       bigint not null,
+  car_id                        integer,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_car_accessory primary key (id)
+);
+
+create table car_fuse (
+  id                            bigint generated by default as identity not null,
+  location_code                 varchar(255),
+  constraint pk_car_fuse primary key (id)
+);
+
+create table category (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  surveyobjectid                bigint,
+  sequence_number               integer not null,
+  constraint pk_category primary key (id)
+);
+
+create table e_save_test_d (
+  id                            bigint generated by default as identity 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                    integer generated by default as identity 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 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 generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  configurations_id             integer,
+  group_name                    varchar(255),
+  product_name                  varchar(255),
+  constraint pk_configuration primary key (id)
+);
+
+create table configurations (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_configurations primary key (id)
+);
+
+create table contact (
+  id                            integer generated by default as identity not null,
+  first_name                    varchar(127),
+  last_name                     varchar(127),
+  phone                         varchar(255),
+  mobile                        varchar(255),
+  email                         varchar(255),
+  is_member                     boolean default false not null,
+  customer_id                   integer not null,
+  group_id                      integer,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  constraint pk_contact primary key (id)
+);
+
+create table contact_group (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_contact_group primary key (id)
+);
+
+create table contact_note (
+  id                            integer generated by default as identity not null,
+  contact_id                    integer,
+  title                         varchar(255),
+  note                          text,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_contact_note primary key (id)
+);
+
+create table contract (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_contract primary key (id)
+);
+
+create table contract_costs (
+  id                            bigint generated by default as identity not null,
+  status                        varchar(255),
+  position_id                   bigint not null,
+  constraint pk_contract_costs primary key (id)
+);
+
+create table c_conversation (
+  id                            bigint generated by default as identity not null,
+  title                         varchar(255),
+  isopen                        boolean default false not null,
+  group_id                      bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_c_conversation primary key (id)
+);
+
+create table o_country (
+  code                          varchar(2) not null,
+  name                          varchar(60),
+  constraint pk_o_country primary key (code)
+);
+
+create table cover (
+  id                            bigint generated by default as identity not null,
+  s3_url                        varchar(255),
+  deleted                       boolean default false not null,
+  constraint pk_cover primary key (id)
+);
+
+create table o_customer (
+  id                            integer generated by default as identity not null,
+  status                        varchar(1),
+  name                          varchar(40) not null,
+  smallnote                     varchar(100),
+  anniversary                   date,
+  billing_address_id            integer,
+  shipping_address_id           integer,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz 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 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                            bigint generated by default as identity 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 generated by default as identity not null,
+  exhange                       varchar(255),
+  an_enum_type                  varchar(255),
+  last_updated                  timestamptz not null,
+  constraint pk_dexh_entity primary key (oid)
+);
+
+create table dint_parent (
+  type                          integer not null,
+  id                            bigint generated by default as identity not null,
+  val                           integer,
+  more                          varchar(255),
+  constraint pk_dint_parent primary key (id)
+);
+
+create table dmachine (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  machine_id                    bigint not null,
+  name                          varchar(255),
+  edate                         date,
+  use_secs                      bigint not null,
+  fuel                          decimal(16,3),
+  version                       bigint not null,
+  constraint pk_d_machine_aux_use primary key (id)
+);
+
+create table d_machine_stats (
+  id                            bigint generated by default as identity not null,
+  machine_id                    bigint not null,
+  edate                         date,
+  total_kms                     bigint not null,
+  hours                         bigint not null,
+  rate                          decimal(16,3),
+  cost                          decimal(16,3),
+  version                       bigint not null,
+  constraint pk_d_machine_stats primary key (id)
+);
+
+create table d_machine_use (
+  id                            bigint generated by default as identity not null,
+  machine_id                    bigint not null,
+  edate                         date,
+  distance_kms                  bigint not null,
+  time_secs                     bigint not null,
+  fuel                          decimal(9,3),
+  version                       bigint not null,
+  constraint pk_d_machine_use primary key (id)
+);
+
+create table dorg (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dorg primary key (id)
+);
+
+create table dperson (
+  id                            bigint generated by default as identity not null,
+  first_name                    varchar(255),
+  last_name                     varchar(255),
+  salary                        decimal(16,3),
+  constraint pk_dperson primary key (id)
+);
+
+create table drol (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_drol primary key (id)
+);
+
+create table drot (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  val                           integer,
+  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                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_dc_master primary key (id)
+);
+
+create table defaults_model (
+  id                            integer generated by default as identity not null,
+  constraint pk_defaults_model primary key (id)
+);
+
+create table defaults_model_draft (
+  id                            integer generated by default as identity not null,
+  constraint pk_defaults_model_draft primary key (id)
+);
+
+create table dfk_cascade (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_cascade primary key (id)
+);
+
+create table dfk_cascade_one (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_dfk_cascade_one primary key (id)
+);
+
+create table dfk_none (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none primary key (id)
+);
+
+create table dfk_none_via_join (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_none_via_join primary key (id)
+);
+
+create table dfk_none_via_mto_m (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_dfk_one primary key (id)
+);
+
+create table dfk_set_null (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  one_id                        bigint,
+  constraint pk_dfk_set_null primary key (id)
+);
+
+create table doc (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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 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 increment by 1;
+
+create table earray_bean (
+  id                            bigint generated by default as identity not null,
+  foo                           integer,
+  name                          varchar(255),
+  phone_numbers                 varchar[],
+  uids                          uuid[] not null,
+  other_ids                     bigint[],
+  doubs                         float[],
+  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)
+);
+
+create table earray_set_bean (
+  id                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  status                        varchar(1),
+  name                          varchar(127),
+  description                   varchar(255),
+  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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  description                   text,
+  last_update                   timestamptz not null,
+  constraint pk_ebasic_clob primary key (id)
+);
+
+create table ebasic_clob_fetch_eager (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  description                   text,
+  last_update                   timestamptz not null,
+  constraint pk_ebasic_clob_fetch_eager primary key (id)
+);
+
+create table ebasic_clob_no_ver (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  description                   text,
+  constraint pk_ebasic_clob_no_ver primary key (id)
+);
+
+create table e_basicenc (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   bytea,
+  dob                           bytea,
+  status                        bytea,
+  last_update                   timestamptz,
+  constraint pk_e_basicenc primary key (id)
+);
+
+create table e_basicenc_bin (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  data                          bytea,
+  some_time                     bytea,
+  last_update                   timestamptz not null,
+  constraint pk_e_basicenc_bin primary key (id)
+);
+
+create table e_basicenc_client (
+  id                            bigint generated by default as identity 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_basicenc_relate (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  other_id                      integer,
+  constraint pk_e_basicenc_relate 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)
+);
+
+create table e_basic_eni (
+  id                            integer generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  map                           hstore,
+  version                       bigint not null,
+  constraint pk_ebasic_hstore primary key (id)
+);
+
+create table ebasic_json_jackson (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map primary key (id)
+);
+
+create table ebasic_json_map_blob (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       bytea,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_blob primary key (id)
+);
+
+create table ebasic_json_map_clob (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       text,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_clob primary key (id)
+);
+
+create table ebasic_json_map_detail (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       jsonb,
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_json_b primary key (id)
+);
+
+create table ebasic_json_map_varchar (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       varchar(3000),
+  version                       bigint not null,
+  constraint pk_ebasic_json_map_varchar primary key (id)
+);
+
+create table ebasic_json_node (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node primary key (id)
+);
+
+create table ebasic_json_node_blob (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       bytea,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_blob primary key (id)
+);
+
+create table ebasic_json_node_json_b (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       jsonb,
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_json_b primary key (id)
+);
+
+create table ebasic_json_node_varchar (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       varchar(1000),
+  version                       bigint not null,
+  constraint pk_ebasic_json_node_varchar primary key (id)
+);
+
+create table ebasic_json_unmapped (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ebasic_json_unmapped primary key (id)
+);
+
+create table e_basic_ndc (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_e_basic_ndc primary key (id)
+);
+
+create table ebasic_no_sdchild (
+  id                            bigint generated by default as identity 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 generated by default as identity 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                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  other                         varchar(255),
+  last_update                   timestamptz not null,
+  constraint pk_e_basicver primary key (id)
+);
+
+create table e_basic_withlife (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  other                         varchar(255),
+  deleted                       boolean default false not null,
+  version                       bigint not null,
+  constraint pk_e_basic_withlife primary key (id)
+);
+
+create table e_basic_with_ex (
+  id                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(127),
+  other                         varchar(127),
+  other_one                     varchar(127),
+  description                   varchar(255),
+  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 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                            bigint generated by default as identity 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 edefault_prop (
+  id                            integer generated by default as identity 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 generated by default as identity not null,
+  nome_inner                    varchar(255),
+  outer_id                      integer,
+  update_count                  integer not null,
+  constraint pk_eemb_inner primary key (id)
+);
+
+create table eemb_outer (
+  id                            integer generated by default as identity not null,
+  nome_outer                    varchar(255),
+  date1                         timestamptz,
+  date2                         timestamptz,
+  update_count                  integer not null,
+  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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint 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)
+);
+
+create table eid_uid_bean (
+  id                            bigint generated by default as identity not null,
+  uuid                          uuid not null,
+  name                          varchar(255),
+  constraint uq_eid_uid_bean_uuid unique (uuid),
+  constraint pk_eid_uid_bean primary key (id)
+);
+
+create table einvoice (
+  id                            bigint generated by default as identity not null,
+  invoice_date                  timestamptz,
+  state                         integer,
+  person_id                     bigint,
+  ship_street                   varchar(255),
+  ship_suburb                   varchar(255),
+  ship_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_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 table e_main (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_e_main primary key (id)
+);
+
+create table enull_collection (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_enull_collection primary key (id)
+);
+
+create table enull_collection_detail (
+  id                            integer generated by default as identity not null,
+  enull_collection_id           integer not null,
+  something                     varchar(255),
+  constraint pk_enull_collection_detail primary key (id)
+);
+
+create table eopt_one_a (
+  id                            integer generated by default as identity not null,
+  name_for_a                    varchar(255),
+  b_id                          integer,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_a primary key (id)
+);
+
+create table eopt_one_b (
+  id                            integer generated by default as identity not null,
+  name_for_b                    varchar(255),
+  c_id                          integer not null,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_b primary key (id)
+);
+
+create table eopt_one_c (
+  id                            integer generated by default as identity not null,
+  name_for_c                    varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_eopt_one_c primary key (id)
+);
+
+create table eper_addr (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  notes                         varchar(255),
+  street                        varchar(255),
+  suburb                        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 generated by default as identity 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                    integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_esimple primary key (usertypeid)
+);
+
+create table esoft_del_book (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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 generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  money                         decimal(16,3),
+  constraint pk_esome_convert_type primary key (id)
+);
+
+create table esome_type (
+  id                            integer generated by default as identity not null,
+  currency                      varchar(3),
+  locale                        varchar(20),
+  time_zone                     varchar(20),
+  constraint pk_esome_type primary key (id)
+);
+
+create table etrans_many (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_etrans_many primary key (id)
+);
+
+create table rawinherit_uncle (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint not null,
+  version                       bigint not null,
+  constraint pk_rawinherit_uncle primary key (id)
+);
+
+create table euser_no_fk (
+  user_id                       integer generated by default as identity 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 generated by default as identity not null,
+  user_name                     varchar(255),
+  constraint pk_euser_no_fk_soft_del primary key (user_id)
+);
+
+create table evanilla_collection (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_evanilla_collection primary key (id)
+);
+
+create table evanilla_collection_detail (
+  id                            integer generated by default as identity not null,
+  evanilla_collection_id        integer not null,
+  something                     varchar(255),
+  constraint pk_evanilla_collection_detail primary key (id)
+);
+
+create table ewho_props (
+  id                            bigint generated by default as identity 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,
+  constraint pk_ewho_props primary key (id)
+);
+
+create table e_withinet (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  inet_address                  inet,
+  inet2                         inet,
+  cidr                          cidr,
+  version                       bigint not null,
+  constraint pk_e_withinet primary key (id)
+);
+
+create table ec_enum_person (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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 ec_top (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  person_id                     bigint,
+  version                       bigint not null,
+  constraint pk_ec_top primary key (id)
+);
+
+create table ec_top_ecs_person (
+  ec_top_id                     bigint not null,
+  ecs_person_id                 bigint not null,
+  constraint pk_ec_top_ecs_person primary key (ec_top_id,ecs_person_id)
+);
+
+create table ecbl_person (
+  id                            bigint generated by default as identity 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),
+  phnum                         varchar(20)
+);
+
+create table ecbm_person (
+  id                            bigint generated by default as identity 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),
+  phnum                         varchar(20)
+);
+
+create table ecm_person (
+  id                            bigint generated by default as identity 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,
+  phnum                         varchar(10) not null
+);
+
+create table ecmc_person (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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 ecsm_child (
+  one_id                        uuid not null,
+  ecsm_parent_id                bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_child primary key (one_id)
+);
+
+create table ecsm_values (
+  host_id                       uuid not null,
+  value                         varchar(255) not null
+);
+
+create table ecsm_one (
+  one_id                        uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_one primary key (one_id)
+);
+
+create table ecsm_parent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_parent primary key (id)
+);
+
+create table ecsm_two (
+  id                            uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_ecsm_two primary key (id)
+);
+
+create table td_child (
+  child_id                      integer generated by default as identity not null,
+  child_name                    varchar(255),
+  parent_id                     integer not null,
+  constraint pk_td_child primary key (child_id)
+);
+
+create table td_parent (
+  parent_type                   varchar(31) not null,
+  parent_id                     integer generated by default as identity not null,
+  parent_name                   varchar(255),
+  extended_name                 varchar(255),
+  constraint pk_td_parent primary key (parent_id)
+);
+
+create table element_bean (
+  id                            bigint generated by default as identity not null,
+  complex_bean_id               uuid not null,
+  value                         varchar(255) not null,
+  constraint pk_element_bean primary key (id)
+);
+
+create table empl (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  age                           integer,
+  default_address_id            bigint,
+  constraint pk_empl primary key (id)
+);
+
+create table esd_detail (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  constraint pk_feature_desc primary key (id)
+);
+
+create table f_first (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_f_first primary key (id)
+);
+
+create table foo (
+  foo_id                        integer generated by default as identity not null,
+  important_text                varchar(255),
+  version                       integer not null,
+  constraint pk_foo primary key (foo_id)
+);
+
+create table gen_key_identity (
+  id                            bigint generated by default as identity not null,
+  description                   varchar(255),
+  constraint pk_gen_key_identity primary key (id)
+);
+
+create table gen_key_sequence (
+  id                            bigint not null,
+  description                   varchar(255),
+  constraint pk_gen_key_sequence primary key (id)
+);
+create sequence SEQ_NAME increment by 1;
+
+create table grand_parent_person (
+  identifier                    integer generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  inactive                      boolean default false not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  constraint pk_c_group primary key (id)
+);
+
+create table he_doc (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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,
+  deleted                       boolean default false 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 generated by default as identity 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                            bigint generated by default as identity 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 hi_tone (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_iaf_segment_status primary key (id)
+);
+
+create table imrelated (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  owner_id                      bigint not null,
+  constraint pk_imrelated primary key (id)
+);
+
+create table imroot (
+  dtype                         varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  title                         varchar(255),
+  when_title                    timestamptz,
+  constraint pk_imroot primary key (id)
+);
+
+create table ixresource (
+  dtype                         varchar(255),
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_ixresource primary key (id)
+);
+
+create table info_company (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_info_company primary key (id)
+);
+
+create table info_contact (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  company_id                    bigint not null,
+  version                       bigint not null,
+  constraint pk_info_contact primary key (id)
+);
+
+create table info_customer (
+  id                            bigint generated by default as identity 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 table inner_report (
+  id                            bigint generated by default as identity 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 table drel_invoice (
+  id                            bigint not null,
+  booking                       bigint,
+  version                       integer not null,
+  constraint pk_drel_invoice primary key (id)
+);
+create sequence drel_invoice_seq increment by 1;
+
+create table item (
+  customer                      integer not null,
+  itemnumber                    varchar(127) not null,
+  description                   varchar(255),
+  units                         varchar(255),
+  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                           bigint generated by default as identity not null,
+  name                          varchar(255),
+  food_preference               varchar(255),
+  version                       bigint not null,
+  constraint pk_monkey primary key (mid)
+);
+
+create table mkeygroup (
+  pid                           bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_l2_cldf_reset_bean primary key (id)
+);
+
+create table l2_cldf_reset_bean_child (
+  id                            bigint generated by default as identity not null,
+  parent_id                     bigint,
+  constraint pk_l2_cldf_reset_bean_child primary key (id)
+);
+
+create table level1 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level1 primary key (id)
+);
+
+create table level1_level4 (
+  level1_id                     bigint not null,
+  level4_id                     bigint not null,
+  constraint pk_level1_level4 primary key (level1_id,level4_id)
+);
+
+create table level1_level2 (
+  level1_id                     bigint not null,
+  level2_id                     bigint not null,
+  constraint pk_level1_level2 primary key (level1_id,level2_id)
+);
+
+create table level2 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level2 primary key (id)
+);
+
+create table level2_level3 (
+  level2_id                     bigint not null,
+  level3_id                     bigint not null,
+  constraint pk_level2_level3 primary key (level2_id,level3_id)
+);
+
+create table level3 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level3 primary key (id)
+);
+
+create table level4 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_level4 primary key (id)
+);
+
+create table link (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_la_attr_value primary key (id)
+);
+
+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 looney (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mgroup primary key (id)
+);
+
+create table mmachine (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  url                           varchar(255),
+  note                          varchar(255),
+  constraint pk_mmedia primary key (id)
+);
+
+create table non_updateprop (
+  id                            integer generated by default as identity 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 pk_non_updateprop primary key (id)
+);
+
+create table mprinter (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  flags                         bigint not null,
+  current_state_id              bigint,
+  last_swap_cyan_id             bigint,
+  last_swap_magenta_id          bigint,
+  last_swap_yellow_id           bigint,
+  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_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 table mprinter_state (
+  id                            bigint generated by default as identity not null,
+  flags                         bigint not null,
+  printer_id                    bigint,
+  version                       bigint not null,
+  constraint pk_mprinter_state primary key (id)
+);
+
+create table mprofile (
+  id                            bigint generated by default as identity not null,
+  picture_id                    bigint,
+  name                          varchar(255),
+  constraint pk_mprofile primary key (id)
+);
+
+create table mprotected_construct_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mprotected_construct_bean primary key (id)
+);
+
+create table mrole (
+  roleid                        integer generated by default as identity not null,
+  role_name                     varchar(255),
+  constraint pk_mrole primary key (roleid)
+);
+
+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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_msome_other primary key (id)
+);
+
+create table muser (
+  userid                        integer generated by default as identity not null,
+  user_name                     varchar(255),
+  user_type_id                  integer,
+  constraint pk_muser primary key (userid)
+);
+
+create table muser_type (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_muser_type primary key (id)
+);
+
+create table mail_box (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mail_box primary key (id)
+);
+
+create table mail_user (
+  id                            bigint generated by default as identity 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 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  when_created                  timestamptz not null,
+  when_updated                  timestamptz not null,
+  constraint pk_map_super_actual primary key (id)
+);
+
+create table c_message (
+  id                            bigint generated by default as identity not null,
+  title                         varchar(255),
+  body                          varchar(255),
+  conversation_id               bigint,
+  user_id                       bigint,
+  version                       bigint not null,
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  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                       integer generated by default as identity not null,
+  role_name                     varchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_role primary key (role_id)
+);
+
+create table mnoc_user (
+  user_id                       integer generated by default as identity not null,
+  user_name                     varchar(255),
+  version                       integer not null,
+  constraint pk_mnoc_user primary key (user_id)
+);
+
+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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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 generated by default as identity not null,
+  mp_user_id                    bigint not null,
+  code                          varchar(255),
+  organization_id               bigint,
+  constraint pk_mp_role primary key (id)
+);
+
+create table mp_user (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mp_user primary key (id)
+);
+
+create table ms_many_a (
+  aid                           bigint generated by default as identity 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                           bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  my_count                      integer not null,
+  my_lob                        text,
+  constraint pk_my_lob_size primary key (id)
+);
+
+create table my_lob_size_join_many (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  other                         varchar(255),
+  parent_id                     integer,
+  constraint pk_my_lob_size_join_many primary key (id)
+);
+
+create table noidbean (
+  name                          varchar(255),
+  subject                       varchar(255),
+  when_created                  timestamptz not null
+);
+
+create table o_bean_child (
+  id                            bigint generated by default as identity not null,
+  cached_bean_id                bigint,
+  constraint pk_o_bean_child primary key (id)
+);
+
+create table ocached_app (
+  id                            bigint generated by default as identity not null,
+  app_name                      varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_app_name unique (app_name),
+  constraint pk_ocached_app primary key (id)
+);
+
+create table ocached_app_detail (
+  id                            bigint generated by default as identity not null,
+  app_id                        bigint not null,
+  detail                        varchar(255),
+  version                       bigint not null,
+  constraint uq_ocached_app_detail_app_id_detail unique (app_id,detail),
+  constraint pk_ocached_app_detail primary key (id)
+);
+
+create table o_cached_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_o_cached_bean primary key (id)
+);
+
+create table o_cached_bean_country (
+  o_cached_bean_id              bigint not null,
+  o_country_code                varchar(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                            bigint generated by default as identity not null,
+  cached_bean_id                bigint,
+  constraint pk_o_cached_bean_child primary key (id)
+);
+
+create table o_cached_inherit (
+  dtype                         varchar(31) not null,
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity 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 ocached_nkey_uid (
+  id                            bigint generated by default as identity not null,
+  cid                           uuid,
+  other                         varchar(255),
+  version                       bigint not null,
+  constraint pk_ocached_nkey_uid primary key (id)
+);
+
+create table ocar (
+  id                            integer generated by default as identity not null,
+  vin                           varchar(255),
+  name                          varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_ocar primary key (id)
+);
+
+create table ocompany (
+  id                            integer generated by default as identity 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                     uuid not null,
+  short_desc                    varchar(255),
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_oengine_car_id unique (car_id),
+  constraint pk_oengine primary key (engine_id)
+);
+
+create table ogear_box (
+  id                            uuid not null,
+  box_desc                      varchar(255),
+  box_size                      integer,
+  car_id                        integer,
+  version                       integer not null,
+  constraint uq_ogear_box_car_id unique (car_id),
+  constraint pk_ogear_box primary key (id)
+);
+
+create table omvertex (
+  id                            uuid not null,
+  constraint pk_omvertex primary key (id)
+);
+
+create table omvertex_other (
+  id                            uuid not null,
+  omvertex_id                   uuid not null,
+  name                          varchar(255),
+  constraint pk_omvertex_other primary key (id)
+);
+
+create table oroad_show_msg (
+  id                            integer generated by default as identity 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_account_child_dbo (
+  id                            bigint generated by default as identity not null,
+  description                   varchar(255),
+  banana_rama_id                bigint,
+  constraint pk_om_account_child_dbo primary key (id)
+);
+
+create table om_account_dbo (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_om_account_dbo primary key (id)
+);
+
+create table om_basic_child (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_om_basic_child primary key (id)
+);
+
+create table om_basic_parent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_basic_parent primary key (id)
+);
+
+create table om_ordered_detail (
+  id                            bigint generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_om_ordered_master primary key (id)
+);
+
+create table oml_bar (
+  id                            bigint generated by default as identity not null,
+  constraint pk_oml_bar primary key (id)
+);
+
+create table oml_baz (
+  id                            bigint generated by default as identity not null,
+  foo_id                        bigint not null,
+  constraint pk_oml_baz primary key (id)
+);
+
+create table oml_foo (
+  id                            bigint generated by default as identity not null,
+  bar_id                        bigint not null,
+  constraint pk_oml_foo primary key (id)
+);
+
+create table only_id_entity (
+  id                            bigint generated by default as identity not null,
+  constraint pk_only_id_entity primary key (id)
+);
+
+create table o_order (
+  id                            integer generated by default as identity not null,
+  status                        integer,
+  order_date                    date,
+  ship_date                     date,
+  kcustomer_id                  integer not null,
+  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                            integer generated by default as identity not null,
+  order_id                      integer not null,
+  order_qty                     integer,
+  ship_qty                      integer,
+  unit_price                    float,
+  product_id                    integer,
+  cretime                       timestamptz,
+  updtime                       timestamptz not null,
+  constraint pk_o_order_detail primary key (id)
+);
+
+create table s_orders (
+  uuid                          varchar(40) not null,
+  constraint pk_s_orders primary key (uuid)
+);
+
+create table s_order_items (
+  uuid                          varchar(40) not null,
+  product_variant_uuid          varchar(255),
+  order_uuid                    varchar(40),
+  quantity                      integer not null,
+  amount                        decimal(16,3),
+  constraint pk_s_order_items primary key (uuid)
+);
+
+create table order_master (
+  id                            bigint generated by default as identity not null,
+  constraint pk_order_master primary key (id)
+);
+
+create table order_master_inheritance (
+  id                            integer generated by default as identity not null,
+  constraint pk_order_master_inheritance primary key (id)
+);
+
+create table order_referenced_parent (
+  type                          varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  child_name                    varchar(255),
+  master_id                     bigint,
+  sort_order                    integer,
+  constraint pk_order_referenced_parent primary key (id)
+);
+
+create table or_order_ship (
+  id                            integer generated by default as identity not null,
+  order_id                      integer,
+  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 order_toy (
+  id                            integer generated by default as identity not null,
+  title                         varchar(255),
+  child_id                      bigint,
+  sort_order                    integer,
+  constraint pk_order_toy primary key (id)
+);
+
+create table ordered_parent (
+  dtype                         varchar(31) not null,
+  id                            integer generated by default as identity not null,
+  order_master_inheritance_id   integer not null,
+  common_name                   varchar(255),
+  sort_order                    integer,
+  ordered_aname                 varchar(255),
+  ordered_bname                 varchar(255),
+  constraint pk_ordered_parent primary key (id)
+);
+
+create table organisation (
+  id                            bigint generated by default as identity 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 organization_node (
+  kind                          varchar(31) not null,
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  child                         varchar(255),
+  constraint pk_oto_bchild primary key (master_id)
+);
+
+create table oto_bmaster (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_oto_bmaster primary key (id)
+);
+
+create table oto_child (
+  id                            integer generated by default as identity 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 table oto_cust (
+  cid                           bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_cust primary key (cid)
+);
+
+create table oto_cust_address (
+  aid                           bigint generated by default as identity 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_level_a (
+  id                            bigint generated by default as identity 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 generated by default as identity 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 generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_oto_level_c primary key (id)
+);
+
+create table oto_master (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_oto_master primary key (id)
+);
+
+create table oto_prime (
+  pid                           bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime primary key (pid)
+);
+
+create table oto_prime_extra (
+  eid                           bigint generated by default as identity not null,
+  extra                         varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_prime_extra primary key (eid)
+);
+
+create table oto_sd_child (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_oto_sd_master primary key (id)
+);
+
+create table oto_th_many (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            bigint generated by default as identity 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 oto_user_model (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  file_content_id               integer,
+  file_content2_id              integer,
+  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),
+  constraint pk_pfile primary key (id)
+);
+
+create table pfile_content (
+  id                            integer generated by default as identity not null,
+  content                       bytea,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_pfile_content primary key (id)
+);
+
+create table paggview (
+  pview_id                      uuid,
+  amount                        integer not null,
+  constraint uq_paggview_pview_id unique (pview_id)
+);
+
+create table pallet_location (
+  type                          varchar(31) not null,
+  id                            integer generated by default as identity not null,
+  zone_sid                      integer not null,
+  attribute                     varchar(255),
+  constraint pk_pallet_location primary key (id)
+);
+
+create table parcel (
+  parcelid                      bigint generated by default as identity not null,
+  description                   varchar(255),
+  constraint pk_parcel primary key (parcelid)
+);
+
+create table parcel_location (
+  parcellocid                   bigint generated by default as identity not null,
+  location                      varchar(255),
+  parcelid                      bigint,
+  constraint uq_parcel_location_parcelid unique (parcelid),
+  constraint pk_parcel_location primary key (parcellocid)
+);
+
+create table rawinherit_parent (
+  type                          varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  val                           integer,
+  more                          varchar(255),
+  constraint pk_rawinherit_parent primary key (id)
+);
+
+create table rawinherit_parent_rawinherit_data (
+  rawinherit_parent_id          bigint not null,
+  rawinherit_data_id            bigint not null,
+  constraint pk_rawinherit_parent_rawinherit_data primary key (rawinherit_parent_id,rawinherit_data_id)
+);
+
+create table e_save_test_c (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_c primary key (id)
+);
+
+create table parent_person (
+  identifier                    integer generated by default as identity 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 generated by default as identity not null,
+  rating                        integer,
+  type                          integer,
+  conversation_id               bigint not null,
+  user_id                       bigint not null,
+  version                       bigint not null,
+  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 password_store_model (
+  id                            bigint generated by default as identity 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 pcf_calendar (
+  id                            bigint generated by default as identity not null,
+  pcf_person_id                 bigint not null,
+  version                       bigint not null,
+  constraint pk_pcf_calendar primary key (id)
+);
+
+create table pcf_city (
+  id                            bigint generated by default as identity not null,
+  pcf_country_id                bigint not null,
+  name                          varchar(255),
+  mayor_id                      bigint not null,
+  vice_mayor_id                 bigint not null,
+  version                       bigint not null,
+  constraint uq_pcf_city_mayor_id unique (mayor_id),
+  constraint uq_pcf_city_vice_mayor_id unique (vice_mayor_id),
+  constraint pk_pcf_city primary key (id)
+);
+
+create table pcf_country (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_pcf_country primary key (id)
+);
+
+create table pcf_event (
+  id                            bigint generated by default as identity not null,
+  pcf_calendar_id               bigint not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_event primary key (id)
+);
+
+create table pcf_person (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_pcf_person primary key (id)
+);
+
+create table mt_permission (
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_mt_permission primary key (id)
+);
+
+create table persistent_file (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_persistent_file primary key (id)
+);
+
+create table persistent_file_content (
+  id                            integer generated by default as identity not null,
+  persistent_file_id            integer,
+  content                       bytea,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint uq_persistent_file_content_persistent_file_id unique (persistent_file_id),
+  constraint pk_persistent_file_content primary key (id)
+);
+
+create table person (
+  oid                           bigint generated by default as identity not null,
+  default_address_oid           bigint,
+  version                       integer not null,
+  constraint pk_person primary key (oid)
+);
+
+create table persons (
+  id                            bigint generated by default as identity (start with 1000 increment by 40) not null,
+  surname                       varchar(64) not null,
+  name                          varchar(64) not null,
+  constraint pk_persons primary key (id)
+);
+
+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 (
+  id                            bigint generated by default as identity 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 table e_position (
+  id                            bigint generated by default as identity 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,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_primary_revision primary key (id,revision)
+);
+
+create table o_product (
+  id                            integer generated by default as identity not null,
+  sku                           varchar(20),
+  name                          varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  constraint pk_o_product primary key (id)
+);
+
+create table pp (
+  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                         uuid not null,
+  ww_id                         uuid not null,
+  constraint pk_pp_to_ww primary key (pp_id,ww_id)
+);
+
+create table question (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  groupobjectid                 bigint,
+  sequence_number               integer not null,
+  constraint pk_question primary key (id)
+);
+
+create table rcustomer (
+  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(127) not null,
+  order_number                  integer not null,
+  customername                  varchar(127),
+  item                          varchar(255),
+  constraint pk_r_orders primary key (company,order_number)
+);
+
+create table referenced_defaults_model (
+  id                            integer generated by default as identity not null,
+  defaults_model_id             integer not null,
+  name                          varchar(255),
+  constraint pk_referenced_defaults_model primary key (id)
+);
+
+create table referenced_defaults_model_draft (
+  id                            integer generated by default as identity not null,
+  defaults_model_id             integer not null,
+  name                          varchar(255),
+  constraint pk_referenced_defaults_model_draft primary key (id)
+);
+
+create table referencing_bean (
+  id                            uuid not null,
+  constraint pk_referencing_bean primary key (id)
+);
+
+create table region (
+  customer                      integer not null,
+  type                          integer not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_region primary key (customer,type)
+);
+
+create table rel_detail (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_rel_detail primary key (id)
+);
+
+create table rel_master (
+  id                            bigint generated by default as identity 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),
+  name                          varchar(128) not null,
+  constraint pk_resourcefile 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 em_role (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_em_role primary key (id)
+);
+
+create table root_bean (
+  dtype                         varchar(31) not null,
+  id                            uuid not null,
+  referencing_bean_id           uuid not null,
+  value                         varchar(255),
+  constraint pk_root_bean primary key (id)
+);
+
+create table f_second (
+  id                            bigint generated by default as identity 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 table section (
+  id                            integer generated by default as identity not null,
+  article_id                    integer,
+  type                          integer,
+  content                       text,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint ck_section_type check ( type in (0,1)),
+  constraint pk_section primary key (id)
+);
+
+create table self_parent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_self_parent primary key (id)
+);
+
+create table self_ref_customer (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  referred_by_id                bigint,
+  constraint pk_self_ref_customer primary key (id)
+);
+
+create table self_ref_example (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255) not null,
+  parent_id                     bigint,
+  constraint pk_self_ref_example primary key (id)
+);
+
+create table e_save_test_a (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_e_save_test_a primary key (id)
+);
+
+create table e_save_test_b (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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)
+);
+
+create table some_file_bean (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  content                       bytea,
+  version                       bigint not null,
+  constraint pk_some_file_bean primary key (id)
+);
+
+create table some_new_types_bean (
+  id                            bigint generated by default as identity not null,
+  dow                           integer,
+  mth                           integer,
+  yr                            integer,
+  yr_mth                        date,
+  month_day                     date,
+  sql_date                      date,
+  sql_time                      time,
+  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)),
+  constraint pk_some_new_types_bean primary key (id)
+);
+
+create table some_period_bean (
+  id                            bigint generated by default as identity not null,
+  anniversary                   date,
+  version                       bigint not null,
+  constraint pk_some_period_bean primary key (id)
+);
+
+create table source_base (
+  dtype                         varchar(31) not null,
+  id                            uuid not null,
+  name                          varchar(255),
+  pos                           integer not null,
+  target_id                     uuid,
+  constraint pk_source_base primary key (id)
+);
+
+create table stockforecast (
+  type                          varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  inner_report_id               bigint,
+  constraint pk_stockforecast primary key (id)
+);
+
+create table sub_section (
+  id                            integer generated by default as identity not null,
+  section_id                    integer,
+  title                         varchar(255),
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_sub_section primary key (id)
+);
+
+create table sub_type (
+  sub_type_id                   integer generated by default as identity not null,
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_sub_type primary key (sub_type_id)
+);
+
+create table survey (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_survey primary key (id)
+);
+
+create table tbytes_only (
+  id                            integer generated by default as identity not null,
+  content                       bytea,
+  constraint pk_tbytes_only primary key (id)
+);
+
+create table tcar (
+  type                          varchar(31) not null,
+  plate_no                      varchar(32) not null,
+  truckload                     bigint,
+  constraint pk_tcar primary key (plate_no)
+);
+
+create table tevent (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_tevent primary key (id)
+);
+
+create table tevent_many (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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                            integer generated by default as identity not null,
+  name                          varchar(255),
+  child_property                varchar(255),
+  constraint pk_tint_root primary key (id)
+);
+
+create table tjoda_entity (
+  id                            integer generated by default as identity not null,
+  local_time                    time,
+  constraint pk_tjoda_entity primary key (id)
+);
+
+create table t_mapsuper1 (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_t_mapsuper1 primary key (id)
+);
+
+create table t_oneb (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        boolean default false not null,
+  constraint pk_t_oneb primary key (id)
+);
+
+create table t_detail_with_other_namexxxyy (
+  id                            integer not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  some_unique_value             varchar(127),
+  active                        boolean default false 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)
+);
+create sequence t_atable_detail_seq increment by 1;
+
+create table t_atable_thatisrelatively (
+  id                            integer not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  active                        boolean default false not null,
+  constraint pk_t_atable_thatisrelatively primary key (id)
+);
+create sequence t_atable_master_seq increment by 1;
+
+create table ttruck_holder (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  truck_plate_no                varchar(32) not null,
+  basic_id                      integer,
+  version                       bigint not null,
+  constraint pk_ttruck_holder primary key (id)
+);
+
+create table ttruck_holder_item (
+  id                            bigint generated by default as identity not null,
+  some_uid                      uuid,
+  foo                           varchar(255),
+  owner_id                      bigint not null,
+  constraint pk_ttruck_holder_item primary key (id)
+);
+
+create table tuuid_entity (
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_tuuid_entity primary key (id)
+);
+
+create table twheel (
+  id                            bigint generated by default as identity not null,
+  owner_plate_no                varchar(32) not null,
+  constraint pk_twheel primary key (id)
+);
+
+create table twith_pre_insert (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255) not null,
+  title                         varchar(255),
+  constraint pk_twith_pre_insert primary key (id)
+);
+
+create table target_base (
+  dtype                         varchar(31) not null,
+  id                            uuid not null,
+  name                          varchar(255),
+  constraint pk_target_base primary key (id)
+);
+
+create table mt_tenant (
+  id                            uuid not null,
+  name                          varchar(255),
+  version                       bigint not null,
+  constraint pk_mt_tenant 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 (
+  id                            bigint not null,
+  wheel                         bigint,
+  version                       integer not null,
+  constraint uq_tire_wheel unique (wheel),
+  constraint pk_tire primary key (id)
+);
+create sequence tire_seq increment by 1;
+
+create table sa_tire (
+  id                            bigint not null,
+  version                       integer not null,
+  constraint pk_sa_tire primary key (id)
+);
+create sequence sa_tire_seq increment by 1;
+
+create table tree_entity (
+  id                            integer generated by default as identity not null,
+  text                          varchar(255),
+  parent_id                     integer,
+  constraint pk_tree_entity primary key (id)
+);
+
+create table trip (
+  id                            integer generated by default as identity not null,
+  vehicle_driver_id             integer,
+  destination                   varchar(255),
+  address_id                    integer,
+  star_date                     timestamptz,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_trip primary key (id)
+);
+
+create table truck_ref (
+  id                            integer generated by default as identity not null,
+  something                     varchar(255),
+  constraint pk_truck_ref primary key (id)
+);
+
+create table tune (
+  id                            bigint generated by default as identity 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),
+  sub_type_id                   integer,
+  version                       bigint not null,
+  constraint pk_type primary key (customer,type)
+);
+
+create table tz_bean (
+  id                            bigint generated by default as identity not null,
+  moda                          varchar(255),
+  ts                            timestamptz,
+  tstz                          timestamptz,
+  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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  deleted                       boolean default false not null,
+  constraint pk_usib_parent primary key (id)
+);
+
+create table ut_detail (
+  id                            integer generated by default as identity not null,
+  utmaster_id                   integer not null,
+  name                          varchar(255),
+  qty                           integer,
+  amount                        float,
+  version                       integer not null,
+  constraint pk_ut_detail primary key (id)
+);
+
+create table ut_master (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  event_date                    date,
+  version                       integer not null,
+  constraint pk_ut_master primary key (id)
+);
+
+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                            bigint generated by default as identity 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                            bigint generated by default as identity not null,
+  inactive                      boolean default false not null,
+  name                          varchar(255),
+  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 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_tx_user primary key (id)
+);
+
+create table g_user (
+  id                            bigint generated by default as identity not null,
+  username                      varchar(255),
+  version                       bigint not null,
+  constraint pk_g_user primary key (id)
+);
+
+create table em_user (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_em_user primary key (id)
+);
+
+create table user_interest_live (
+  user_id                       bigint not null,
+  live_id                       bigint not null,
+  created_at                    timestamptz not null,
+  constraint pk_user_interest_live primary key (user_id,live_id)
+);
+
+create table em_user_role (
+  user_id                       bigint not null,
+  role_id                       bigint not null,
+  constraint pk_em_user_role primary key (user_id,role_id)
+);
+
+create table vehicle (
+  dtype                         varchar(3) not null,
+  id                            integer generated by default as identity 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(3),
+  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)
+);
+
+create table vehicle_driver (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  vehicle_id                    integer,
+  address_id                    integer,
+  license_issued_on             timestamptz,
+  cretime                       timestamptz not null,
+  updtime                       timestamptz not null,
+  version                       bigint not null,
+  constraint pk_vehicle_driver primary key (id)
+);
+
+create table vehicle_lease (
+  dtype                         varchar(31) not null,
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  active_start                  date,
+  active_end                    date,
+  version                       bigint not null,
+  bond                          decimal(16,3),
+  min_duration                  integer not null,
+  day_rate                      decimal(16,3),
+  max_days                      integer,
+  constraint pk_vehicle_lease primary key (id)
+);
+
+create table version_child (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_child primary key (id)
+);
+
+create table version_parent (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_version_parent primary key (id)
+);
+
+create table version_toy (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  child_id                      integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_toy primary key (id)
+);
+
+create table warehouses (
+  id                            integer generated by default as identity not null,
+  officezoneid                  integer,
+  constraint pk_warehouses primary key (id)
+);
+
+create table warehousesshippingzones (
+  warehouseid                   integer not null,
+  shippingzoneid                integer not null,
+  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 increment by 1;
+
+create table sa_wheel (
+  id                            bigint not null,
+  tire                          bigint,
+  car                           bigint,
+  version                       integer not null,
+  constraint pk_sa_wheel primary key (id)
+);
+create sequence sa_wheel_seq increment by 1;
+
+create table sp_car_wheel (
+  id                            bigint not null,
+  name                          varchar(255),
+  version                       integer not null,
+  constraint pk_sp_car_wheel primary key (id)
+);
+create sequence sp_car_wheel_seq increment by 1;
+
+create table g_who_props_otm (
+  id                            bigint generated by default as identity 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                            bigint generated by default as identity 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 table parent (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_parent primary key (id)
+);
+
+create table wview (
+  id                            uuid 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 generated by default as identity not null,
+  attribute                     varchar(255),
+  constraint pk_zones primary key (id)
+);
+
+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_ecsm_values_host_id on ecsm_values (host_id);
+create index ix_order_referenced_parent_type on order_referenced_parent (type);
+create index ix_organization_node_kind on organization_node (kind);
+create unique index concurrently ix_t_detail_with_other_namexxxyy_lowername on t_detail_with_other_namexxxyy (lower(name));
+create index ix_t_detail_with_other_namexxxyy_defn on t_detail_with_other_namexxxyy using hash (lower(name)) where lower(name) like 'r%';
+create index ano_3 on test_annotation_base_entity (direct);
+create index ano_1 on test_annotation_base_entity (direct);
+create index ano_2 on test_annotation_base_entity (direct);
+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;
+
+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 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;
+
+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;
+
+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_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_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;
+
+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;
+
+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_ciaddress_street_id on ciaddress (street_id);
+alter table ciaddress add constraint fk_ciaddress_street_id foreign key (street_id) references cistreet_parent (id) on delete restrict on update restrict;
+
+create index ix_cicustomer_parent_address_id on cicustomer_parent (address_id);
+alter table cicustomer_parent add constraint fk_cicustomer_parent_address_id foreign key (address_id) references ciaddress (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;
+
+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;
+
+create index ix_coone_many_coone_id on coone_many (coone_id);
+alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_id) references coone (id) on delete restrict on update restrict;
+
+alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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;
+
+alter table defaults_model add constraint fk_defaults_model_id foreign key (id) references defaults_model_draft (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_e_basicenc_relate_other_id on e_basicenc_relate (other_id);
+alter table e_basicenc_relate add constraint fk_e_basicenc_relate_other_id foreign key (other_id) references e_basicenc (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_ec_top_person_id on ec_top (person_id);
+alter table ec_top add constraint fk_ec_top_person_id foreign key (person_id) references ecs_person (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person (ec_top_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ec_top foreign key (ec_top_id) references ec_top (id) on delete restrict on update restrict;
+
+create index ix_ec_top_ecs_person_ecs_person on ec_top_ecs_person (ecs_person_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ecs_person foreign key (ecs_person_id) references ecs_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_ecsm_child_ecsm_parent_id on ecsm_child (ecsm_parent_id);
+alter table ecsm_child add constraint fk_ecsm_child_ecsm_parent_id foreign key (ecsm_parent_id) references ecsm_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_element_bean_complex_bean_id on element_bean (complex_bean_id);
+alter table element_bean add constraint fk_element_bean_complex_bean_id foreign key (complex_bean_id) references root_bean (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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_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_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_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_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_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;
+
+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_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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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_bean_child_cached_bean_id on o_bean_child (cached_bean_id);
+alter table o_bean_child add constraint fk_o_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id) on delete restrict on update restrict;
+
+create index ix_ocached_app_detail_app_id on ocached_app_detail (app_id);
+alter table ocached_app_detail add constraint fk_ocached_app_detail_app_id foreign key (app_id) references ocached_app (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;
+
+create index ix_omvertex_other_omvertex_id on omvertex_other (omvertex_id);
+alter table omvertex_other add constraint fk_omvertex_other_omvertex_id foreign key (omvertex_id) references omvertex (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_account_child_dbo_banana_rama_id on om_account_child_dbo (banana_rama_id);
+alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_rama_id foreign key (banana_rama_id) references om_account_dbo (id) on delete restrict on update restrict;
+
+create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
+alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (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_oml_baz_foo_id on oml_baz (foo_id);
+alter table oml_baz add constraint fk_oml_baz_foo_id foreign key (foo_id) references oml_foo (id) on delete restrict on update restrict;
+
+create index ix_oml_foo_bar_id on oml_foo (bar_id);
+alter table oml_foo add constraint fk_oml_foo_bar_id foreign key (bar_id) references oml_bar (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;
+
+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;
+
+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;
+
+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;
+
+create index ix_order_referenced_parent_master_id on order_referenced_parent (master_id);
+alter table order_referenced_parent add constraint fk_order_referenced_parent_master_id foreign key (master_id) references order_master (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;
+
+create index ix_order_toy_child_id on order_toy (child_id);
+alter table order_toy add constraint fk_order_toy_child_id foreign key (child_id) references order_referenced_parent (id) on delete restrict on update restrict;
+
+create index ix_ordered_parent_order_master_inheritance_id on ordered_parent (order_master_inheritance_id);
+alter table ordered_parent add constraint fk_ordered_parent_order_master_inheritance_id foreign key (order_master_inheritance_id) references order_master_inheritance (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;
+
+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_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;
+
+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;
+
+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_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_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;
+
+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;
+
+create index ix_pcf_calendar_pcf_person_id on pcf_calendar (pcf_person_id);
+alter table pcf_calendar add constraint fk_pcf_calendar_pcf_person_id foreign key (pcf_person_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_city_pcf_country_id on pcf_city (pcf_country_id);
+alter table pcf_city add constraint fk_pcf_city_pcf_country_id foreign key (pcf_country_id) references pcf_country (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_mayor_id foreign key (mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+alter table pcf_city add constraint fk_pcf_city_vice_mayor_id foreign key (vice_mayor_id) references pcf_person (id) on delete restrict on update restrict;
+
+create index ix_pcf_event_pcf_calendar_id on pcf_event (pcf_calendar_id);
+alter table pcf_event add constraint fk_pcf_event_pcf_calendar_id foreign key (pcf_calendar_id) references pcf_calendar (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;
+
+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;
+
+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_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 referenced_defaults_model add constraint fk_referenced_defaults_model_id foreign key (id) references referenced_defaults_model_draft (id) on delete restrict on update restrict;
+
+create index ix_referenced_defaults_model_defaults_model_id on referenced_defaults_model (defaults_model_id);
+alter table referenced_defaults_model add constraint fk_referenced_defaults_model_defaults_model_id foreign key (defaults_model_id) references defaults_model (id) on delete restrict on update restrict;
+
+create index ix_referenced_defaults_model_draft_defaults_model_id on referenced_defaults_model_draft (defaults_model_id);
+alter table referenced_defaults_model_draft add constraint fk_referenced_defaults_model_draft_defaults_model_id foreign key (defaults_model_id) references defaults_model_draft (id) 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;
+
+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_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_root_bean_referencing_bean_id on root_bean (referencing_bean_id);
+alter table root_bean add constraint fk_root_bean_referencing_bean_id foreign key (referencing_bean_id) references referencing_bean (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;
+
+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;
+
+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;
+
+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;
+
+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_source_base_target_id on source_base (target_id);
+alter table source_base add constraint fk_source_base_target_id foreign key (target_id) references target_base (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;
+
+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;
+
+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;
+
+create index ix_ttruck_holder_truck_plate_no on ttruck_holder (truck_plate_no);
+alter table ttruck_holder add constraint fk_ttruck_holder_truck_plate_no foreign key (truck_plate_no) references tcar (plate_no) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_basic_id on ttruck_holder (basic_id);
+alter table ttruck_holder add constraint fk_ttruck_holder_basic_id foreign key (basic_id) references e_basic (id) on delete restrict on update restrict;
+
+create index ix_ttruck_holder_item_owner_id on ttruck_holder_item (owner_id);
+alter table ttruck_holder_item add constraint fk_ttruck_holder_item_owner_id foreign key (owner_id) references ttruck_holder (id) 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;
+
+create index ix_tree_entity_parent_id on tree_entity (parent_id);
+alter table tree_entity add constraint fk_tree_entity_parent_id foreign key (parent_id) references tree_entity (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;
+
+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_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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+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;
+
+create index ix_version_child_parent_id on version_child (parent_id);
+alter table version_child add constraint fk_version_child_parent_id foreign key (parent_id) references version_parent (id) on delete restrict on update restrict;
+
+create index ix_version_toy_child_id on version_toy (child_id);
+alter table version_toy add constraint fk_version_toy_child_id foreign key (child_id) references version_child (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_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_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;
+
+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;
+
+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;
+
+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, 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, 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;
+$$ LANGUAGE plpgsql;
+
+create trigger hx_link_history_upd
+  before update or delete on hx_link
+  for each row execute procedure hx_link_history_version();
+
+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(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(lowerTs,upperTs), 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();
+
+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(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(lowerTs,upperTs), 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();
+
+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 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 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;
+$$ LANGUAGE plpgsql;
+
+create trigger link_history_upd
+  before update or delete on link
+  for each row execute procedure link_history_version();
+
+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(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(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;
+$$ 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/ebean-core/src/test/ddl-review/pg-drop-all.sql b/ebean-core/src/test/ddl-review/pg-drop-all.sql
new file mode 100644
index 000000000..e3fbd4432
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/pg-drop-all.sql
@@ -0,0 +1,1957 @@
+-- Generated by ebean unknown at 2020-08-24T21:02:32.420817Z
+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;
+
+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 if exists album drop constraint if exists fk_album_cover_id;
+
+alter table if exists animal drop constraint if exists fk_animal_shelter_id;
+drop index if exists ix_animal_shelter_id;
+
+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 if exists bbookmark drop constraint if exists fk_bbookmark_user_id;
+drop index if exists ix_bbookmark_user_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_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;
+
+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 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 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 ciaddress drop constraint if exists fk_ciaddress_street_id;
+drop index if exists ix_ciaddress_street_id;
+
+alter table if exists cicustomer_parent drop constraint if exists fk_cicustomer_parent_address_id;
+drop index if exists ix_cicustomer_parent_address_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;
+
+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 if exists coone_many drop constraint if exists fk_coone_many_coone_id;
+drop index if exists ix_coone_many_coone_id;
+
+alter table if exists coroot drop constraint if exists fk_coroot_one_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 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 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 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;
+
+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 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;
+
+alter table if exists contact drop constraint if exists fk_contact_customer_id;
+drop index if exists ix_contact_customer_id;
+
+alter table if exists contact drop constraint if exists fk_contact_group_id;
+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;
+
+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 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 if exists dcredit_drol drop constraint if exists fk_dcredit_drol_dcredit;
+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 defaults_model drop constraint if exists fk_defaults_model_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 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 if exists doc drop constraint if exists fk_doc_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 if exists doc_link drop constraint if exists fk_doc_link_link;
+drop index if exists ix_doc_link_link;
+
+alter table if exists document drop constraint if exists fk_document_id;
+
+alter table if exists document drop constraint if exists fk_document_organisation_id;
+drop index if exists ix_document_organisation_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 if exists document_media drop constraint if exists fk_document_media_document_id;
+drop index if exists ix_document_media_document_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 if exists e_basicenc_relate drop constraint if exists fk_e_basicenc_relate_other_id;
+drop index if exists ix_e_basicenc_relate_other_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 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 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;
+
+alter table if exists einvoice drop constraint if exists fk_einvoice_person_id;
+drop index if exists ix_einvoice_person_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 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 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;
+
+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 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 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 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 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 if exists esoft_del_one_a drop constraint if exists fk_esoft_del_one_a_oneb_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 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 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 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 if exists rawinherit_uncle drop constraint if exists fk_rawinherit_uncle_parent_id;
+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 ec_top drop constraint if exists fk_ec_top_person_id;
+drop index if exists ix_ec_top_person_id;
+
+alter table if exists ec_top_ecs_person drop constraint if exists fk_ec_top_ecs_person_ec_top;
+drop index if exists ix_ec_top_ecs_person_ec_top;
+
+alter table if exists ec_top_ecs_person drop constraint if exists fk_ec_top_ecs_person_ecs_person;
+drop index if exists ix_ec_top_ecs_person_ecs_person;
+
+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 ecsm_child drop constraint if exists fk_ecsm_child_ecsm_parent_id;
+drop index if exists ix_ecsm_child_ecsm_parent_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 element_bean drop constraint if exists fk_element_bean_complex_bean_id;
+drop index if exists ix_element_bean_complex_bean_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;
+
+alter table if exists survey_group drop constraint if exists fk_survey_group_categoryobjectid;
+drop index if exists ix_survey_group_categoryobjectid;
+
+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 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 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 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;
+
+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 if exists info_customer drop constraint if exists fk_info_customer_company_id;
+
+alter table if exists inner_report drop constraint if exists fk_inner_report_forecast_id;
+
+alter table if exists drel_invoice drop constraint if exists fk_drel_invoice_booking;
+drop index if exists ix_drel_invoice_booking;
+
+alter table if exists item drop constraint if exists fk_item_etype;
+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;
+
+alter table if exists troop_monkey drop constraint if exists fk_troop_monkey_troop;
+
+alter table if exists troop_monkey drop constraint if exists fk_troop_monkey_monkey;
+
+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 if exists level1_level4 drop constraint if exists fk_level1_level4_level1;
+drop index if exists ix_level1_level4_level1;
+
+alter table if exists level1_level4 drop constraint if exists fk_level1_level4_level4;
+drop index if exists ix_level1_level4_level4;
+
+alter table if exists level1_level2 drop constraint if exists fk_level1_level2_level1;
+drop index if exists ix_level1_level2_level1;
+
+alter table if exists level1_level2 drop constraint if exists fk_level1_level2_level2;
+drop index if exists ix_level1_level2_level2;
+
+alter table if exists level2_level3 drop constraint if exists fk_level2_level3_level2;
+drop index if exists ix_level2_level3_level2;
+
+alter table if exists level2_level3 drop constraint if exists fk_level2_level3_level3;
+drop index if exists ix_level2_level3_level3;
+
+alter table if exists link drop constraint if exists fk_link_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 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;
+
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_cyan_id;
+
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_magenta_id;
+
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_yellow_id;
+
+alter table if exists mprinter drop constraint if exists fk_mprinter_last_swap_black_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 if exists mprofile drop constraint if exists fk_mprofile_picture_id;
+drop index if exists ix_mprofile_picture_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 if exists mrole_muser drop constraint if exists fk_mrole_muser_muser;
+drop index if exists ix_mrole_muser_muser;
+
+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 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 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 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 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 if exists c_message drop constraint if exists fk_c_message_conversation_id;
+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;
+
+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 if exists mny_b drop constraint if exists fk_mny_b_a_id;
+drop index if exists ix_mny_b_a_id;
+
+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 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 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_bean_child drop constraint if exists fk_o_bean_child_cached_bean_id;
+drop index if exists ix_o_bean_child_cached_bean_id;
+
+alter table if exists ocached_app_detail drop constraint if exists fk_ocached_app_detail_app_id;
+drop index if exists ix_ocached_app_detail_app_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 omvertex_other drop constraint if exists fk_omvertex_other_omvertex_id;
+drop index if exists ix_omvertex_other_omvertex_id;
+
+alter table if exists oroad_show_msg drop constraint if exists fk_oroad_show_msg_company_id;
+
+alter table if exists om_account_child_dbo drop constraint if exists fk_om_account_child_dbo_banana_rama_id;
+drop index if exists ix_om_account_child_dbo_banana_rama_id;
+
+alter table if exists om_basic_child drop constraint if exists fk_om_basic_child_parent_id;
+drop index if exists ix_om_basic_child_parent_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 oml_baz drop constraint if exists fk_oml_baz_foo_id;
+drop index if exists ix_oml_baz_foo_id;
+
+alter table if exists oml_foo drop constraint if exists fk_oml_foo_bar_id;
+drop index if exists ix_oml_foo_bar_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 order_referenced_parent drop constraint if exists fk_order_referenced_parent_master_id;
+drop index if exists ix_order_referenced_parent_master_id;
+
+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 order_toy drop constraint if exists fk_order_toy_child_id;
+drop index if exists ix_order_toy_child_id;
+
+alter table if exists ordered_parent drop constraint if exists fk_ordered_parent_order_master_inheritance_id;
+drop index if exists ix_ordered_parent_order_master_inheritance_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;
+
+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_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;
+
+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 pcf_calendar drop constraint if exists fk_pcf_calendar_pcf_person_id;
+drop index if exists ix_pcf_calendar_pcf_person_id;
+
+alter table if exists pcf_city drop constraint if exists fk_pcf_city_pcf_country_id;
+drop index if exists ix_pcf_city_pcf_country_id;
+
+alter table if exists pcf_city drop constraint if exists fk_pcf_city_mayor_id;
+
+alter table if exists pcf_city drop constraint if exists fk_pcf_city_vice_mayor_id;
+
+alter table if exists pcf_event drop constraint if exists fk_pcf_event_pcf_calendar_id;
+drop index if exists ix_pcf_event_pcf_calendar_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 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;
+
+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 referenced_defaults_model drop constraint if exists fk_referenced_defaults_model_id;
+
+alter table if exists referenced_defaults_model drop constraint if exists fk_referenced_defaults_model_defaults_model_id;
+drop index if exists ix_referenced_defaults_model_defaults_model_id;
+
+alter table if exists referenced_defaults_model_draft drop constraint if exists fk_referenced_defaults_model_draft_defaults_model_id;
+drop index if exists ix_referenced_defaults_model_draft_defaults_model_id;
+
+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;
+
+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 root_bean drop constraint if exists fk_root_bean_referencing_bean_id;
+drop index if exists ix_root_bean_referencing_bean_id;
+
+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 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 source_base drop constraint if exists fk_source_base_target_id;
+drop index if exists ix_source_base_target_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 ttruck_holder drop constraint if exists fk_ttruck_holder_truck_plate_no;
+drop index if exists ix_ttruck_holder_truck_plate_no;
+
+alter table if exists ttruck_holder drop constraint if exists fk_ttruck_holder_basic_id;
+drop index if exists ix_ttruck_holder_basic_id;
+
+alter table if exists ttruck_holder_item drop constraint if exists fk_ttruck_holder_item_owner_id;
+drop index if exists ix_ttruck_holder_item_owner_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 tree_entity drop constraint if exists fk_tree_entity_parent_id;
+drop index if exists ix_tree_entity_parent_id;
+
+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 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 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;
+
+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 version_child drop constraint if exists fk_version_child_parent_id;
+drop index if exists ix_version_child_parent_id;
+
+alter table if exists version_toy drop constraint if exists fk_version_toy_child_id;
+drop index if exists ix_version_toy_child_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;
+
+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;
+
+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;
+
+drop table if exists article cascade;
+
+drop table if exists attribute cascade;
+
+drop table if exists attribute_holder cascade;
+
+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_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;
+
+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 ciaddress cascade;
+
+drop table if exists cicustomer_parent cascade;
+
+drop table if exists cistreet_parent cascade;
+
+drop table if exists cinh_ref cascade;
+
+drop table if exists cinh_root cascade;
+
+drop table if exists ckey_assoc cascade;
+
+drop table if exists ckey_detail cascade;
+
+drop table if exists ckey_parent cascade;
+
+drop table if exists coone cascade;
+
+drop table if exists coone_many cascade;
+
+drop table if exists coroot cascade;
+
+drop table if exists calculation_result cascade;
+
+drop table if exists cao_bean cascade;
+
+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;
+
+drop table if exists contact cascade;
+
+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;
+
+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 dint_parent 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;
+
+drop table if exists drot cascade;
+
+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 defaults_model cascade;
+
+drop table if exists defaults_model_draft 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_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;
+
+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 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;
+
+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;
+
+drop table if exists ebasic_clob_no_ver cascade;
+
+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_basicenc_relate 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;
+
+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;
+
+drop table if exists ebasic_json_node cascade;
+
+drop table if exists ebasic_json_node_blob cascade;
+
+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_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 eid_uid_bean cascade;
+
+drop table if exists einvoice cascade;
+
+drop table if exists e_main cascade;
+
+drop table if exists enull_collection cascade;
+
+drop table if exists enull_collection_detail cascade;
+
+drop table if exists eopt_one_a cascade;
+
+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;
+
+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 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;
+
+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 ec_top cascade;
+
+drop table if exists ec_top_ecs_person 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 ecsm_child cascade;
+
+drop table if exists ecsm_values cascade;
+
+drop table if exists ecsm_one cascade;
+
+drop table if exists ecsm_parent cascade;
+
+drop table if exists ecsm_two cascade;
+
+drop table if exists td_child cascade;
+
+drop table if exists td_parent cascade;
+
+drop table if exists element_bean 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;
+
+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_NAME;
+
+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 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;
+
+drop table if exists ixresource cascade;
+
+drop table if exists info_company cascade;
+
+drop table if exists info_contact cascade;
+
+drop table if exists info_customer cascade;
+
+drop table if exists inner_report cascade;
+
+drop table if exists drel_invoice cascade;
+drop sequence if exists drel_invoice_seq;
+
+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;
+
+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;
+
+drop table if exists level1_level2 cascade;
+
+drop table if exists level2 cascade;
+
+drop table if exists level2_level3 cascade;
+
+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;
+
+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;
+
+drop table if exists mprinter cascade;
+
+drop table if exists mprinter_state cascade;
+
+drop table if exists mprofile cascade;
+
+drop table if exists mprotected_construct_bean cascade;
+
+drop table if exists mrole cascade;
+
+drop table if exists mrole_muser cascade;
+
+drop table if exists msome_other cascade;
+
+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 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;
+
+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;
+
+drop table if exists noidbean cascade;
+
+drop table if exists o_bean_child cascade;
+
+drop table if exists ocached_app cascade;
+
+drop table if exists ocached_app_detail cascade;
+
+drop table if exists o_cached_bean cascade;
+
+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;
+
+drop table if exists ocached_nkey_uid 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 omvertex cascade;
+
+drop table if exists omvertex_other cascade;
+
+drop table if exists oroad_show_msg cascade;
+
+drop table if exists om_account_child_dbo cascade;
+
+drop table if exists om_account_dbo cascade;
+
+drop table if exists om_basic_child cascade;
+
+drop table if exists om_basic_parent cascade;
+
+drop table if exists om_ordered_detail cascade;
+
+drop table if exists om_ordered_master cascade;
+
+drop table if exists oml_bar cascade;
+
+drop table if exists oml_baz cascade;
+
+drop table if exists oml_foo cascade;
+
+drop table if exists only_id_entity cascade;
+
+drop table if exists o_order cascade;
+
+drop table if exists o_order_detail cascade;
+
+drop table if exists s_orders cascade;
+
+drop table if exists s_order_items cascade;
+
+drop table if exists order_master cascade;
+
+drop table if exists order_master_inheritance cascade;
+
+drop table if exists order_referenced_parent cascade;
+
+drop table if exists or_order_ship cascade;
+
+drop table if exists order_toy cascade;
+
+drop table if exists ordered_parent 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;
+
+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_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;
+
+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 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;
+
+drop table if exists paggview cascade;
+
+drop table if exists pallet_location cascade;
+
+drop table if exists parcel cascade;
+
+drop table if exists parcel_location cascade;
+
+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 pcf_calendar cascade;
+
+drop table if exists pcf_city cascade;
+
+drop table if exists pcf_country cascade;
+
+drop table if exists pcf_event cascade;
+
+drop table if exists pcf_person 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 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;
+
+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;
+
+drop table if exists referenced_defaults_model cascade;
+
+drop table if exists referenced_defaults_model_draft cascade;
+
+drop table if exists referencing_bean cascade;
+
+drop table if exists region cascade;
+
+drop table if exists rel_detail 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 root_bean cascade;
+
+drop table if exists f_second cascade;
+
+drop table if exists section cascade;
+
+drop table if exists self_parent cascade;
+
+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;
+
+drop table if exists some_new_types_bean cascade;
+
+drop table if exists some_period_bean cascade;
+
+drop table if exists source_base cascade;
+
+drop table if exists stockforecast cascade;
+
+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;
+
+drop table if exists t_mapsuper1 cascade;
+
+drop table if exists t_oneb cascade;
+
+drop table if exists t_detail_with_other_namexxxyy cascade;
+drop sequence if exists t_atable_detail_seq;
+
+drop table if exists t_atable_thatisrelatively cascade;
+drop sequence if exists t_atable_master_seq;
+
+drop table if exists ttruck_holder cascade;
+
+drop table if exists ttruck_holder_item cascade;
+
+drop table if exists tuuid_entity cascade;
+
+drop table if exists twheel cascade;
+
+drop table if exists twith_pre_insert cascade;
+
+drop table if exists target_base cascade;
+
+drop table if exists mt_tenant cascade;
+
+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 tree_entity cascade;
+
+drop table if exists trip cascade;
+
+drop table if exists truck_ref 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;
+
+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();
+
+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 g_user cascade;
+
+drop table if exists em_user cascade;
+
+drop table if exists user_interest_live 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 version_child cascade;
+
+drop table if exists version_parent cascade;
+
+drop table if exists version_toy cascade;
+
+drop table if exists warehouses cascade;
+
+drop table if exists warehousesshippingzones cascade;
+
+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;
+
+drop table if exists g_who_props_otm cascade;
+
+drop table if exists with_zero cascade;
+
+drop table if exists parent cascade;
+
+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;
+drop index if exists ix_efile2_no_fk_owner_id;
+drop index if exists ix_ecsm_values_host_id;
+drop index if exists ix_order_referenced_parent_type;
+drop index if exists ix_organization_node_kind;
+drop index concurrently if exists ix_t_detail_with_other_namexxxyy_lowername;
+drop index if exists ix_t_detail_with_other_namexxxyy_defn;
+drop index if exists ano_3;
+drop index if exists ano_1;
+drop index if exists ano_2;
diff --git a/ebean-core/src/test/ddl-review/sqlserver-create-all.sql b/ebean-core/src/test/ddl-review/sqlserver-create-all.sql
new file mode 100644
index 000000000..40e48e28e
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/sqlserver-create-all.sql
@@ -0,0 +1,5308 @@
+-- Generated by ebean unknown at 2020-03-04T08:21:26.827349Z
+-- 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),
+  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 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),
+  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 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),
+  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                            integer 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 1000 increment by 50 cache 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_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;
+
+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                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  constraint pk_bsite primary key (id)
+);
+
+create table bsite_user_a (
+  site_id                       uniqueidentifier not null,
+  user_id                       uniqueidentifier not null,
+  access_level                  integer,
+  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 (
+  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                      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 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),
+  constraint pk_buser primary key (id)
+);
+
+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 increment by 50;
+
+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,
+  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 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,
+  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 coone (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_coone primary key (id)
+);
+create sequence coone_seq as bigint start with 1 increment by 50;
+
+create table coone_many (
+  id                            numeric(19) not null,
+  coone_id                      numeric(19) not null,
+  name                          nvarchar(255),
+  deleted                       integer default 0 not null,
+  constraint pk_coone_many primary key (id)
+);
+create sequence coone_many_seq as bigint start with 1 increment by 50;
+
+create table coroot (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  one_id                        numeric(19),
+  constraint pk_coroot primary key (id)
+);
+create unique nonclustered index uq_coroot_one_id on coroot(one_id) where one_id is not null;
+create sequence coroot_seq as bigint start with 1 increment by 50;
+
+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 sp_car_car (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  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 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,
+  brand                         nvarchar(255),
+  sold                          integer 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),
+  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 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),
+  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 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,
+  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),
+  is_member                     integer default 0 not null,
+  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 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),
+  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,
+  s3_url                        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            integer,
+  shipping_address_id           integer,
+  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 dint_parent (
+  type                          integer not null,
+  id                            numeric(19) not null,
+  val                           integer,
+  more                          nvarchar(255),
+  constraint pk_dint_parent primary key (id)
+);
+create sequence dint_parent_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),
+  edate                         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,
+  edate                         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,
+  edate                         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),
+  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 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),
+  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_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),
+  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 increment by 50;
+
+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 increment by 50;
+
+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 increment by 50;
+
+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) not null,
+  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;
+
+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_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_basicenc_relate (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  other_id                      integer,
+  constraint pk_e_basicenc_relate primary key (id)
+);
+create sequence e_basicenc_relate_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_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),
+  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),
+  other                         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_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),
+  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 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),
+  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 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),
+  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 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),
+  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 eid_uid_bean (
+  id                            numeric(19) not null,
+  uuid                          uniqueidentifier not null,
+  name                          nvarchar(255),
+  constraint uq_eid_uid_bean_uuid unique (uuid),
+  constraint pk_eid_uid_bean primary key (id)
+);
+create sequence eid_uid_bean_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 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),
+  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 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),
+  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),
+  inet2                         nvarchar(255),
+  cidr                          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 ec_top (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  person_id                     numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_ec_top primary key (id)
+);
+create sequence ec_top_seq as bigint start with 1 increment by 50;
+
+create table ec_top_ecs_person (
+  ec_top_id                     numeric(19) not null,
+  ecs_person_id                 numeric(19) not null,
+  constraint pk_ec_top_ecs_person primary key (ec_top_id,ecs_person_id)
+);
+
+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),
+  phnum                         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),
+  phnum                         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,
+  phnum                         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 ecsm_child (
+  one_id                        uniqueidentifier not null,
+  ecsm_parent_id                numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecsm_child primary key (one_id)
+);
+
+create table ecsm_values (
+  host_id                       uniqueidentifier not null,
+  value                         nvarchar(255) not null
+);
+
+create table ecsm_one (
+  one_id                        uniqueidentifier not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecsm_one primary key (one_id)
+);
+
+create table ecsm_parent (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecsm_parent primary key (id)
+);
+create sequence ecsm_parent_seq as bigint start with 1 increment by 50;
+
+create table ecsm_two (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ecsm_two primary key (id)
+);
+
+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 element_bean (
+  id                            numeric(19) not null,
+  complex_bean_id               uniqueidentifier not null,
+  value                         nvarchar(255) not null,
+  constraint pk_element_bean primary key (id)
+);
+create sequence element_bean_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 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),
+  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 gen_key_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,
+  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;
+
+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 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),
+  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                            uniqueidentifier 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 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),
+  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 increment by 50;
+
+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 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,
+  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 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),
+  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 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),
+  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_bean_child (
+  id                            numeric(19) not null,
+  cached_bean_id                numeric(19),
+  constraint pk_o_bean_child primary key (id)
+);
+create sequence o_bean_child_seq as bigint start with 1 increment by 50;
+
+create table ocached_app (
+  id                            numeric(19) not null,
+  app_name                      nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ocached_app primary key (id)
+);
+create unique nonclustered index uq_ocached_app_app_name on ocached_app(app_name) where app_name is not null;
+create sequence ocached_app_seq as bigint start with 1 increment by 50;
+
+create table ocached_app_detail (
+  id                            numeric(19) not null,
+  app_id                        numeric(19) not null,
+  detail                        nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ocached_app_detail primary key (id)
+);
+create unique nonclustered index uq_ocached_app_detail_app_id_detail on ocached_app_detail(app_id,detail) where detail is not null;
+create sequence ocached_app_detail_seq as bigint start with 1 increment by 50;
+
+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_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),
+  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 ocached_nkey_uid (
+  id                            numeric(19) not null,
+  cid                           uniqueidentifier,
+  other                         nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_ocached_nkey_uid primary key (id)
+);
+create sequence ocached_nkey_uid_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                     uniqueidentifier 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                            uniqueidentifier 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 omvertex (
+  id                            uniqueidentifier not null,
+  constraint pk_omvertex primary key (id)
+);
+
+create table omvertex_other (
+  id                            uniqueidentifier not null,
+  omvertex_id                   uniqueidentifier not null,
+  name                          nvarchar(255),
+  constraint pk_omvertex_other primary key (id)
+);
+
+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_account_child_dbo (
+  id                            numeric(19) not null,
+  description                   nvarchar(255),
+  banana_rama_id                numeric(19),
+  constraint pk_om_account_child_dbo primary key (id)
+);
+create sequence om_account_child_dbo_seq as bigint start with 1 increment by 50;
+
+create table om_account_dbo (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_om_account_dbo primary key (id)
+);
+create sequence om_account_dbo_seq as bigint start with 1 increment by 50;
+
+create table om_basic_child (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  parent_id                     numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_om_basic_child primary key (id)
+);
+create sequence om_basic_child_seq as bigint start with 1 increment by 50;
+
+create table om_basic_parent (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_om_basic_parent primary key (id)
+);
+create sequence om_basic_parent_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 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,
+  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 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,
+  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_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),
+  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 sequence oto_prime_extra_seq as bigint start with 1 increment by 50;
+
+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,
+  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                           uniqueidentifier not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_ubprime primary key (pid)
+);
+
+create table oto_ubprime_extra (
+  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                           uniqueidentifier not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_oto_uprime primary key (pid)
+);
+
+create table oto_uprime_extra (
+  eid                           uniqueidentifier not null,
+  extra                         nvarchar(255),
+  version                       numeric(19) not null,
+  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),
+  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                      uniqueidentifier,
+  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 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),
+  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 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 pcf_calendar (
+  id                            numeric(19) not null,
+  pcf_person_id                 numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_pcf_calendar primary key (id)
+);
+create sequence pcf_calendar_seq as bigint start with 1 increment by 50;
+
+create table pcf_city (
+  id                            numeric(19) not null,
+  pcf_country_id                numeric(19) not null,
+  name                          nvarchar(255),
+  mayor_id                      numeric(19) not null,
+  vice_mayor_id                 numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint uq_pcf_city_mayor_id unique (mayor_id),
+  constraint uq_pcf_city_vice_mayor_id unique (vice_mayor_id),
+  constraint pk_pcf_city primary key (id)
+);
+create sequence pcf_city_seq as bigint start with 1 increment by 50;
+
+create table pcf_country (
+  id                            numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_pcf_country primary key (id)
+);
+create sequence pcf_country_seq as bigint start with 1 increment by 50;
+
+create table pcf_event (
+  id                            numeric(19) not null,
+  pcf_calendar_id               numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_pcf_event primary key (id)
+);
+create sequence pcf_event_seq as bigint start with 1 increment by 50;
+
+create table pcf_person (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_pcf_person primary key (id)
+);
+create sequence pcf_person_seq as bigint start with 1 increment by 50;
+
+create table mt_permission (
+  id                            uniqueidentifier 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 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,
+  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_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 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 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,
+  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                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  value                         nvarchar(100) not null,
+  constraint pk_pp primary key (id)
+);
+
+create table pp_to_ww (
+  pp_id                         uniqueidentifier not null,
+  ww_id                         uniqueidentifier 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 referencing_bean (
+  id                            uniqueidentifier not null,
+  constraint pk_referencing_bean primary key (id)
+);
+
+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 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),
+  name                          nvarchar(128) not null,
+  constraint pk_resourcefile primary key (id)
+);
+
+create table mt_role (
+  id                            uniqueidentifier not null,
+  name                          nvarchar(50),
+  tenant_id                     uniqueidentifier,
+  version                       numeric(19) not null,
+  constraint pk_mt_role primary key (id)
+);
+
+create table mt_role_permission (
+  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)
+);
+
+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 root_bean (
+  dtype                         nvarchar(31) not null,
+  id                            uniqueidentifier not null,
+  referencing_bean_id           uniqueidentifier not null,
+  value                         nvarchar(255),
+  constraint pk_root_bean primary key (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 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,
+  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,
+  month_day                     date,
+  sql_date                      date,
+  sql_time                      time,
+  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)),
+  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 source_base (
+  dtype                         nvarchar(31) not null,
+  id                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  pos                           integer not null,
+  target_id                     uniqueidentifier,
+  constraint pk_source_base primary key (id)
+);
+
+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_detail_with_other_namexxxyy_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_thatisrelatively_seq as bigint start with 1 increment by 50;
+
+create table ttruck_holder (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  truck_plate_no                nvarchar(32) not null,
+  basic_id                      integer,
+  version                       numeric(19) not null,
+  constraint pk_ttruck_holder primary key (id)
+);
+create sequence ttruck_holder_seq as bigint start with 1 increment by 50;
+
+create table ttruck_holder_item (
+  id                            numeric(19) not null,
+  some_uid                      uniqueidentifier,
+  foo                           nvarchar(255),
+  owner_id                      numeric(19) not null,
+  constraint pk_ttruck_holder_item primary key (id)
+);
+create sequence ttruck_holder_item_seq as bigint start with 1 increment by 50;
+
+create table tuuid_entity (
+  id                            uniqueidentifier 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 target_base (
+  dtype                         nvarchar(31) not null,
+  id                            uniqueidentifier not null,
+  name                          nvarchar(255),
+  constraint pk_target_base primary key (id)
+);
+
+create table mt_tenant (
+  id                            uniqueidentifier 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 tree_entity (
+  id                            integer not null,
+  text                          nvarchar(255),
+  parent_id                     integer,
+  constraint pk_tree_entity primary key (id)
+);
+create sequence tree_entity_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                    integer,
+  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 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),
+  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 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,
+  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),
+  event_date                    date,
+  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                            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,
+  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 user_interest_live (
+  user_id                       numeric(19) not null,
+  live_id                       numeric(19) not null,
+  created_at                    datetime2 not null,
+  constraint pk_user_interest_live primary key (user_id,live_id)
+);
+
+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,
+  lease_id                      numeric(19),
+  cretime                       datetime2 not null,
+  updtime                       datetime2 not null,
+  version                       numeric(19) not null,
+  siz                           nvarchar(3),
+  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                    integer,
+  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 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,
+  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 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),
+  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 sp_car_wheel (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  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                            uniqueidentifier 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_efile2_no_fk_owner_id on efile2_no_fk (owner_id);
+create index ix_ecsm_values_host_id on ecsm_values (host_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);
+
+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_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_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);
+
+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);
+
+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);
+
+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_coone_many_coone_id on coone_many (coone_id);
+alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_id) references coone (id);
+
+alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (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_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);
+
+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);
+
+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);
+
+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_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);
+
+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_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;
+
+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_e_basicenc_relate_other_id on e_basicenc_relate (other_id);
+alter table e_basicenc_relate add constraint fk_e_basicenc_relate_other_id foreign key (other_id) references e_basicenc (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_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);
+
+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_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);
+
+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_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_ec_top_person_id on ec_top (person_id);
+alter table ec_top add constraint fk_ec_top_person_id foreign key (person_id) references ecs_person (id);
+
+create index ix_ec_top_ecs_person_ec_top on ec_top_ecs_person (ec_top_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ec_top foreign key (ec_top_id) references ec_top (id);
+
+create index ix_ec_top_ecs_person_ecs_person on ec_top_ecs_person (ecs_person_id);
+alter table ec_top_ecs_person add constraint fk_ec_top_ecs_person_ecs_person foreign key (ecs_person_id) references ecs_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_ecsm_child_ecsm_parent_id on ecsm_child (ecsm_parent_id);
+alter table ecsm_child add constraint fk_ecsm_child_ecsm_parent_id foreign key (ecsm_parent_id) references ecsm_parent (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_element_bean_complex_bean_id on element_bean (complex_bean_id);
+alter table element_bean add constraint fk_element_bean_complex_bean_id foreign key (complex_bean_id) references root_bean (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);
+
+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_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);
+
+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 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);
+
+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_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);
+
+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);
+
+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);
+
+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_bean_child_cached_bean_id on o_bean_child (cached_bean_id);
+alter table o_bean_child add constraint fk_o_bean_child_cached_bean_id foreign key (cached_bean_id) references o_cached_bean (id);
+
+create index ix_ocached_app_detail_app_id on ocached_app_detail (app_id);
+alter table ocached_app_detail add constraint fk_ocached_app_detail_app_id foreign key (app_id) references ocached_app (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);
+
+create index ix_omvertex_other_omvertex_id on omvertex_other (omvertex_id);
+alter table omvertex_other add constraint fk_omvertex_other_omvertex_id foreign key (omvertex_id) references omvertex (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_account_child_dbo_banana_rama_id on om_account_child_dbo (banana_rama_id);
+alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_rama_id foreign key (banana_rama_id) references om_account_dbo (id);
+
+create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
+alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (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 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);
+
+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_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);
+
+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);
+
+create index ix_pcf_calendar_pcf_person_id on pcf_calendar (pcf_person_id);
+alter table pcf_calendar add constraint fk_pcf_calendar_pcf_person_id foreign key (pcf_person_id) references pcf_person (id);
+
+create index ix_pcf_city_pcf_country_id on pcf_city (pcf_country_id);
+alter table pcf_city add constraint fk_pcf_city_pcf_country_id foreign key (pcf_country_id) references pcf_country (id);
+
+alter table pcf_city add constraint fk_pcf_city_mayor_id foreign key (mayor_id) references pcf_person (id);
+
+alter table pcf_city add constraint fk_pcf_city_vice_mayor_id foreign key (vice_mayor_id) references pcf_person (id);
+
+create index ix_pcf_event_pcf_calendar_id on pcf_event (pcf_calendar_id);
+alter table pcf_event add constraint fk_pcf_event_pcf_calendar_id foreign key (pcf_calendar_id) references pcf_calendar (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_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);
+
+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_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);
+
+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);
+
+create index ix_root_bean_referencing_bean_id on root_bean (referencing_bean_id);
+alter table root_bean add constraint fk_root_bean_referencing_bean_id foreign key (referencing_bean_id) references referencing_bean (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);
+
+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_source_base_target_id on source_base (target_id);
+alter table source_base add constraint fk_source_base_target_id foreign key (target_id) references target_base (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_ttruck_holder_truck_plate_no on ttruck_holder (truck_plate_no);
+alter table ttruck_holder add constraint fk_ttruck_holder_truck_plate_no foreign key (truck_plate_no) references tcar (plate_no);
+
+create index ix_ttruck_holder_basic_id on ttruck_holder (basic_id);
+alter table ttruck_holder add constraint fk_ttruck_holder_basic_id foreign key (basic_id) references e_basic (id);
+
+create index ix_ttruck_holder_item_owner_id on ttruck_holder_item (owner_id);
+alter table ttruck_holder_item add constraint fk_ttruck_holder_item_owner_id foreign key (owner_id) references ttruck_holder (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_tree_entity_parent_id on tree_entity (parent_id);
+alter table tree_entity add constraint fk_tree_entity_parent_id foreign key (parent_id) references tree_entity (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_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);
+
+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);
+
+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);
+
+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 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',
+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/ebean-core/src/test/ddl-review/sqlserver-drop-all.sql b/ebean-core/src/test/ddl-review/sqlserver-drop-all.sql
new file mode 100644
index 000000000..867ef2963
--- /dev/null
+++ b/ebean-core/src/test/ddl-review/sqlserver-drop-all.sql
@@ -0,0 +1,2234 @@
+-- Generated by ebean unknown at 2020-03-04T08:21:26.827349Z
+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;
+
+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_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_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;
+
+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 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;
+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_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;
+
+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_coone_many_coone_id', 'F') IS NOT NULL alter table coone_many drop constraint fk_coone_many_coone_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('coone_many','U') AND name = 'ix_coone_many_coone_id') drop index ix_coone_many_coone_id ON coone_many;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('coroot','U') AND name = 'uq_coroot_one_id') drop index uq_coroot_one_id ON coroot;
+IF OBJECT_ID('fk_coroot_one_id', 'F') IS NOT NULL alter table coroot drop constraint fk_coroot_one_id;
+
+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_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;
+
+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 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;
+
+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_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;
+
+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_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;
+
+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_e_basicenc_relate_other_id', 'F') IS NOT NULL alter table e_basicenc_relate drop constraint fk_e_basicenc_relate_other_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('e_basicenc_relate','U') AND name = 'ix_e_basicenc_relate_other_id') drop index ix_e_basicenc_relate_other_id ON e_basicenc_relate;
+
+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_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;
+
+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 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;
+
+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_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_ec_top_person_id', 'F') IS NOT NULL alter table ec_top drop constraint fk_ec_top_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ec_top','U') AND name = 'ix_ec_top_person_id') drop index ix_ec_top_person_id ON ec_top;
+
+IF OBJECT_ID('fk_ec_top_ecs_person_ec_top', 'F') IS NOT NULL alter table ec_top_ecs_person drop constraint fk_ec_top_ecs_person_ec_top;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ec_top_ecs_person','U') AND name = 'ix_ec_top_ecs_person_ec_top') drop index ix_ec_top_ecs_person_ec_top ON ec_top_ecs_person;
+
+IF OBJECT_ID('fk_ec_top_ecs_person_ecs_person', 'F') IS NOT NULL alter table ec_top_ecs_person drop constraint fk_ec_top_ecs_person_ecs_person;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ec_top_ecs_person','U') AND name = 'ix_ec_top_ecs_person_ecs_person') drop index ix_ec_top_ecs_person_ecs_person ON ec_top_ecs_person;
+
+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_ecsm_child_ecsm_parent_id', 'F') IS NOT NULL alter table ecsm_child drop constraint fk_ecsm_child_ecsm_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ecsm_child','U') AND name = 'ix_ecsm_child_ecsm_parent_id') drop index ix_ecsm_child_ecsm_parent_id ON ecsm_child;
+
+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_element_bean_complex_bean_id', 'F') IS NOT NULL alter table element_bean drop constraint fk_element_bean_complex_bean_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('element_bean','U') AND name = 'ix_element_bean_complex_bean_id') drop index ix_element_bean_complex_bean_id ON element_bean;
+
+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;
+
+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_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;
+
+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_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;
+
+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 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;
+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_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;
+
+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_bean_child_cached_bean_id', 'F') IS NOT NULL alter table o_bean_child drop constraint fk_o_bean_child_cached_bean_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_bean_child','U') AND name = 'ix_o_bean_child_cached_bean_id') drop index ix_o_bean_child_cached_bean_id ON o_bean_child;
+
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ocached_app','U') AND name = 'uq_ocached_app_app_name') drop index uq_ocached_app_app_name ON ocached_app;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ocached_app_detail','U') AND name = 'uq_ocached_app_detail_app_id_detail') drop index uq_ocached_app_detail_app_id_detail ON ocached_app_detail;
+IF OBJECT_ID('fk_ocached_app_detail_app_id', 'F') IS NOT NULL alter table ocached_app_detail drop constraint fk_ocached_app_detail_app_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ocached_app_detail','U') AND name = 'ix_ocached_app_detail_app_id') drop index ix_ocached_app_detail_app_id ON ocached_app_detail;
+
+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_omvertex_other_omvertex_id', 'F') IS NOT NULL alter table omvertex_other drop constraint fk_omvertex_other_omvertex_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('omvertex_other','U') AND name = 'ix_omvertex_other_omvertex_id') drop index ix_omvertex_other_omvertex_id ON omvertex_other;
+
+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_account_child_dbo_banana_rama_id', 'F') IS NOT NULL alter table om_account_child_dbo drop constraint fk_om_account_child_dbo_banana_rama_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('om_account_child_dbo','U') AND name = 'ix_om_account_child_dbo_banana_rama_id') drop index ix_om_account_child_dbo_banana_rama_id ON om_account_child_dbo;
+
+IF OBJECT_ID('fk_om_basic_child_parent_id', 'F') IS NOT NULL alter table om_basic_child drop constraint fk_om_basic_child_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('om_basic_child','U') AND name = 'ix_om_basic_child_parent_id') drop index ix_om_basic_child_parent_id ON om_basic_child;
+
+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_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;
+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 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;
+
+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 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;
+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 OBJECT_ID('fk_pcf_calendar_pcf_person_id', 'F') IS NOT NULL alter table pcf_calendar drop constraint fk_pcf_calendar_pcf_person_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pcf_calendar','U') AND name = 'ix_pcf_calendar_pcf_person_id') drop index ix_pcf_calendar_pcf_person_id ON pcf_calendar;
+
+IF OBJECT_ID('fk_pcf_city_pcf_country_id', 'F') IS NOT NULL alter table pcf_city drop constraint fk_pcf_city_pcf_country_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pcf_city','U') AND name = 'ix_pcf_city_pcf_country_id') drop index ix_pcf_city_pcf_country_id ON pcf_city;
+
+IF OBJECT_ID('fk_pcf_city_mayor_id', 'F') IS NOT NULL alter table pcf_city drop constraint fk_pcf_city_mayor_id;
+
+IF OBJECT_ID('fk_pcf_city_vice_mayor_id', 'F') IS NOT NULL alter table pcf_city drop constraint fk_pcf_city_vice_mayor_id;
+
+IF OBJECT_ID('fk_pcf_event_pcf_calendar_id', 'F') IS NOT NULL alter table pcf_event drop constraint fk_pcf_event_pcf_calendar_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('pcf_event','U') AND name = 'ix_pcf_event_pcf_calendar_id') drop index ix_pcf_event_pcf_calendar_id ON pcf_event;
+
+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_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;
+
+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_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;
+
+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 OBJECT_ID('fk_root_bean_referencing_bean_id', 'F') IS NOT NULL alter table root_bean drop constraint fk_root_bean_referencing_bean_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('root_bean','U') AND name = 'ix_root_bean_referencing_bean_id') drop index ix_root_bean_referencing_bean_id ON root_bean;
+
+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 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_source_base_target_id', 'F') IS NOT NULL alter table source_base drop constraint fk_source_base_target_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('source_base','U') AND name = 'ix_source_base_target_id') drop index ix_source_base_target_id ON source_base;
+
+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_ttruck_holder_truck_plate_no', 'F') IS NOT NULL alter table ttruck_holder drop constraint fk_ttruck_holder_truck_plate_no;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ttruck_holder','U') AND name = 'ix_ttruck_holder_truck_plate_no') drop index ix_ttruck_holder_truck_plate_no ON ttruck_holder;
+
+IF OBJECT_ID('fk_ttruck_holder_basic_id', 'F') IS NOT NULL alter table ttruck_holder drop constraint fk_ttruck_holder_basic_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ttruck_holder','U') AND name = 'ix_ttruck_holder_basic_id') drop index ix_ttruck_holder_basic_id ON ttruck_holder;
+
+IF OBJECT_ID('fk_ttruck_holder_item_owner_id', 'F') IS NOT NULL alter table ttruck_holder_item drop constraint fk_ttruck_holder_item_owner_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ttruck_holder_item','U') AND name = 'ix_ttruck_holder_item_owner_id') drop index ix_ttruck_holder_item_owner_id ON ttruck_holder_item;
+
+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_tree_entity_parent_id', 'F') IS NOT NULL alter table tree_entity drop constraint fk_tree_entity_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('tree_entity','U') AND name = 'ix_tree_entity_parent_id') drop index ix_tree_entity_parent_id ON tree_entity;
+
+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_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;
+
+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_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;
+
+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 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;
+
+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_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;
+
+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_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;
+
+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('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;
+
+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('coone', 'U') IS NOT NULL drop table coone;
+IF OBJECT_ID('coone_seq', 'SO') IS NOT NULL drop sequence coone_seq;
+
+IF OBJECT_ID('coone_many', 'U') IS NOT NULL drop table coone_many;
+IF OBJECT_ID('coone_many_seq', 'SO') IS NOT NULL drop sequence coone_many_seq;
+
+IF OBJECT_ID('coroot', 'U') IS NOT NULL drop table coroot;
+IF OBJECT_ID('coroot_seq', 'SO') IS NOT NULL drop sequence coroot_seq;
+
+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('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;
+
+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('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;
+
+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('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;
+
+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('dint_parent', 'U') IS NOT NULL drop table dint_parent;
+IF OBJECT_ID('dint_parent_seq', 'SO') IS NOT NULL drop sequence dint_parent_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;
+
+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('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;
+
+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_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;
+
+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('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;
+
+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_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_basicenc_relate', 'U') IS NOT NULL drop table e_basicenc_relate;
+IF OBJECT_ID('e_basicenc_relate_seq', 'SO') IS NOT NULL drop sequence e_basicenc_relate_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_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;
+
+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_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;
+
+IF OBJECT_ID('eid_uid_bean', 'U') IS NOT NULL drop table eid_uid_bean;
+IF OBJECT_ID('eid_uid_bean_seq', 'SO') IS NOT NULL drop sequence eid_uid_bean_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('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;
+
+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('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;
+
+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('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('ec_top', 'U') IS NOT NULL drop table ec_top;
+IF OBJECT_ID('ec_top_seq', 'SO') IS NOT NULL drop sequence ec_top_seq;
+
+IF OBJECT_ID('ec_top_ecs_person', 'U') IS NOT NULL drop table ec_top_ecs_person;
+
+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('ecsm_child', 'U') IS NOT NULL drop table ecsm_child;
+
+IF OBJECT_ID('ecsm_values', 'U') IS NOT NULL drop table ecsm_values;
+
+IF OBJECT_ID('ecsm_one', 'U') IS NOT NULL drop table ecsm_one;
+
+IF OBJECT_ID('ecsm_parent', 'U') IS NOT NULL drop table ecsm_parent;
+IF OBJECT_ID('ecsm_parent_seq', 'SO') IS NOT NULL drop sequence ecsm_parent_seq;
+
+IF OBJECT_ID('ecsm_two', 'U') IS NOT NULL drop table ecsm_two;
+
+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('element_bean', 'U') IS NOT NULL drop table element_bean;
+IF OBJECT_ID('element_bean_seq', 'SO') IS NOT NULL drop sequence element_bean_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;
+
+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('gen_key_sequence_seq', 'SO') IS NOT NULL drop sequence gen_key_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('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;
+
+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('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;
+
+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('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;
+
+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('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;
+
+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_bean_child', 'U') IS NOT NULL drop table o_bean_child;
+IF OBJECT_ID('o_bean_child_seq', 'SO') IS NOT NULL drop sequence o_bean_child_seq;
+
+IF OBJECT_ID('ocached_app', 'U') IS NOT NULL drop table ocached_app;
+IF OBJECT_ID('ocached_app_seq', 'SO') IS NOT NULL drop sequence ocached_app_seq;
+
+IF OBJECT_ID('ocached_app_detail', 'U') IS NOT NULL drop table ocached_app_detail;
+IF OBJECT_ID('ocached_app_detail_seq', 'SO') IS NOT NULL drop sequence ocached_app_detail_seq;
+
+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_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;
+
+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('ocached_nkey_uid', 'U') IS NOT NULL drop table ocached_nkey_uid;
+IF OBJECT_ID('ocached_nkey_uid_seq', 'SO') IS NOT NULL drop sequence ocached_nkey_uid_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('omvertex', 'U') IS NOT NULL drop table omvertex;
+
+IF OBJECT_ID('omvertex_other', 'U') IS NOT NULL drop table omvertex_other;
+
+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_account_child_dbo', 'U') IS NOT NULL drop table om_account_child_dbo;
+IF OBJECT_ID('om_account_child_dbo_seq', 'SO') IS NOT NULL drop sequence om_account_child_dbo_seq;
+
+IF OBJECT_ID('om_account_dbo', 'U') IS NOT NULL drop table om_account_dbo;
+IF OBJECT_ID('om_account_dbo_seq', 'SO') IS NOT NULL drop sequence om_account_dbo_seq;
+
+IF OBJECT_ID('om_basic_child', 'U') IS NOT NULL drop table om_basic_child;
+IF OBJECT_ID('om_basic_child_seq', 'SO') IS NOT NULL drop sequence om_basic_child_seq;
+
+IF OBJECT_ID('om_basic_parent', 'U') IS NOT NULL drop table om_basic_parent;
+IF OBJECT_ID('om_basic_parent_seq', 'SO') IS NOT NULL drop sequence om_basic_parent_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('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;
+
+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('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;
+
+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_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;
+
+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_prime_extra_seq', 'SO') IS NOT NULL drop sequence oto_prime_extra_seq;
+
+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;
+
+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('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;
+
+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('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('pcf_calendar', 'U') IS NOT NULL drop table pcf_calendar;
+IF OBJECT_ID('pcf_calendar_seq', 'SO') IS NOT NULL drop sequence pcf_calendar_seq;
+
+IF OBJECT_ID('pcf_city', 'U') IS NOT NULL drop table pcf_city;
+IF OBJECT_ID('pcf_city_seq', 'SO') IS NOT NULL drop sequence pcf_city_seq;
+
+IF OBJECT_ID('pcf_country', 'U') IS NOT NULL drop table pcf_country;
+IF OBJECT_ID('pcf_country_seq', 'SO') IS NOT NULL drop sequence pcf_country_seq;
+
+IF OBJECT_ID('pcf_event', 'U') IS NOT NULL drop table pcf_event;
+IF OBJECT_ID('pcf_event_seq', 'SO') IS NOT NULL drop sequence pcf_event_seq;
+
+IF OBJECT_ID('pcf_person', 'U') IS NOT NULL drop table pcf_person;
+IF OBJECT_ID('pcf_person_seq', 'SO') IS NOT NULL drop sequence pcf_person_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('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;
+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('referencing_bean', 'U') IS NOT NULL drop table referencing_bean;
+
+IF OBJECT_ID('region', 'U') IS NOT NULL drop table region;
+
+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('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('root_bean', 'U') IS NOT NULL drop table root_bean;
+
+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('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;
+
+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('source_base', 'U') IS NOT NULL drop table source_base;
+
+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_detail_with_other_namexxxyy_seq', 'SO') IS NOT NULL drop sequence t_detail_with_other_namexxxyy_seq;
+
+IF OBJECT_ID('t_atable_thatisrelatively', 'U') IS NOT NULL drop table t_atable_thatisrelatively;
+IF OBJECT_ID('t_atable_thatisrelatively_seq', 'SO') IS NOT NULL drop sequence t_atable_thatisrelatively_seq;
+
+IF OBJECT_ID('ttruck_holder', 'U') IS NOT NULL drop table ttruck_holder;
+IF OBJECT_ID('ttruck_holder_seq', 'SO') IS NOT NULL drop sequence ttruck_holder_seq;
+
+IF OBJECT_ID('ttruck_holder_item', 'U') IS NOT NULL drop table ttruck_holder_item;
+IF OBJECT_ID('ttruck_holder_item_seq', 'SO') IS NOT NULL drop sequence ttruck_holder_item_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('target_base', 'U') IS NOT NULL drop table target_base;
+
+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('tree_entity', 'U') IS NOT NULL drop table tree_entity;
+IF OBJECT_ID('tree_entity_seq', 'SO') IS NOT NULL drop sequence tree_entity_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('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;
+
+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('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;
+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('user_interest_live', 'U') IS NOT NULL drop table user_interest_live;
+
+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('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('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;
+
+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;
+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('ecsm_values','U') AND name = 'ix_ecsm_values_host_id') drop index ix_ecsm_values_host_id ON ecsm_values;
+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 9a5d3498c16257833429e36cc5ddbb50bf2451a7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 7 Dec 2020 23:00:02 +1300
Subject: [PATCH 021/447] #2125 - Bump ebean-test-docker dependency to 4.1

---
 ebean-bom/pom.xml  | 2 +-
 ebean-core/pom.xml | 2 +-
 ebean-test/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index aea366e64..d58b37593 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -16,7 +16,7 @@
     <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.0</ebean-migration-auto.version>
     <ebean-migration.version>12.2.0</ebean-migration.version>
-    <ebean-test-docker.version>4.0</ebean-test-docker.version>
+    <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
     <ebean-agent.version>12.6.0</ebean-agent.version>
     <ebean-maven-plugin.version>12.6.0</ebean-maven-plugin.version>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 4532869d3..1ea2b8632 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -202,7 +202,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>4.0</version>
+      <version>4.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 657655d08..f46ee194d 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>4.0</version>
+      <version>4.1</version>
     </dependency>
 
     <dependency>

From a73e4f23ff1c88f8118e094c84639e85b25a2429 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Dec 2020 15:41:59 +1300
Subject: [PATCH 022/447] Bump agent version in BOM

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

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index d58b37593..23c2faa7d 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,8 +18,8 @@
     <ebean-migration.version>12.2.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.6.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.6.0</ebean-maven-plugin.version>
+    <ebean-agent.version>12.6.2</ebean-agent.version>
+    <ebean-maven-plugin.version>12.6.2</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>

From f1b1cee2fd1d7972b3385433a50c596e807e05af Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Dec 2020 15:43:31 +1300
Subject: [PATCH 023/447] Bump enhancement tile

---
 ebean-autotune/pom.xml            | 2 +-
 ebean-externalmapping-xml/pom.xml | 2 +-
 ebean-postgis/pom.xml             | 2 +-
 ebean-querybean/pom.xml           | 2 +-
 ebean-test/pom.xml                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 6ffe3cbce..aba209457 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -64,7 +64,7 @@
         <configuration>
           <tiles>
             <!-- other tiles ... -->
-            <tile>io.ebean.tile:enhancement:12.5.0</tile>
+            <tile>io.ebean.tile:enhancement:12.6.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index c8a91d433..6976ddd4e 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -89,7 +89,7 @@
         <configuration>
           <tiles>
             <!-- other tiles ... -->
-            <tile>io.ebean.tile:enhancement:12.5.0</tile>
+            <tile>io.ebean.tile:enhancement:12.6.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 0ff0ced76..ddcc32484 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -106,7 +106,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.5.0</tile>
+            <tile>io.ebean.tile:enhancement:12.6.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index c2a64271b..7ca147cd6 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -105,7 +105,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.5.0</tile>
+            <tile>io.ebean.tile:enhancement:12.6.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index f46ee194d..9a90b6b9b 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -150,7 +150,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.5.0</tile>
+            <tile>io.ebean.tile:enhancement:12.6.0</tile>
           </tiles>
         </configuration>
       </plugin>

From 373ef6d1eb3cd66b33ff45c0ef2accdd11070e0d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Dec 2020 20:29:34 +1300
Subject: [PATCH 024/447] #2126 - Bump ebean-migration to 12.4.0

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

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 23c2faa7d..442b71980 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -15,7 +15,7 @@
   <properties>
     <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.0</ebean-migration-auto.version>
-    <ebean-migration.version>12.2.0</ebean-migration.version>
+    <ebean-migration.version>12.4.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
     <ebean-agent.version>12.6.2</ebean-agent.version>

From 610f7db1cbfa42fd573488abeaade3034df2c109 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Dec 2020 20:46:36 +1300
Subject: [PATCH 025/447] Bump test dependency kotlin version to 1.4.21 after
 issues downloading 1.4.10 from maven central?

---
 kotlin-querybean-generator/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index a5c53e5fa..f3e6b89bd 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>kotlin-querybean-generator</artifactId>
 
   <properties>
-    <kotlin.version>1.4.10</kotlin.version>
+    <kotlin.version>1.4.21</kotlin.version>
   </properties>
 
   <dependencies>

From 01a3455ecb8c41e9056215ee6f34ff66a0cd4c20 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 8 Dec 2020 20:51:52 +1300
Subject: [PATCH 026/447] Bump test dependency for kotlin-querybean-generator
 release

---
 kotlin-querybean-generator/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index f3e6b89bd..4517e409c 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -106,7 +106,7 @@
                 <annotationProcessorPath>
                   <groupId>io.ebean</groupId>
                   <artifactId>kotlin-querybean-generator</artifactId>
-                  <version>12.6.2-SNAPSHOT</version>
+                  <version>12.6.1</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>

From 0cd0741f1810aa7e4e540d4d021e58bb8954c083 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Dec 2020 13:11:07 +1300
Subject: [PATCH 027/447] [maven-release-plugin] prepare release
 ebean-parent-12.6.2

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 24 ++++++++++++------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 15 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 945d263f0..9227fc4fb 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index aba209457..aeba0bb8f 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.2</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 442b71980..68449d0b9 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,69 +81,69 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.2-SNAPSHOT</version>
+        <version>12.6.2</version>
         <scope>test</scope>
       </dependency>
 
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 6bf92485e..38ba7efe1 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 1ea2b8632..e804be3ec 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.2</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 90203208d..5699ef4dc 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 9b08e0dbb..29a16cbbb 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 6976ddd4e..f7d243fcc 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.2</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index ddcc32484..ad690a41b 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 7ca147cd6..9575aac26 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.2</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 9a90b6b9b..cd9625639 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.2</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 64872ae20..569f3bf6c 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 4517e409c..5ab2d78c2 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2-SNAPSHOT</version>
+      <version>12.6.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 967d6eb53..b342cf59f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.2-SNAPSHOT</version>
+  <version>12.6.2</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.2</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 936bc9c89..e473fdc4f 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2-SNAPSHOT</version>
+    <version>12.6.2</version>
   </parent>
 
   <name>querybean generator</name>

From 948619a125d77a8b6b25c9239aca5888ffd02db8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Dec 2020 13:11:19 +1300
Subject: [PATCH 028/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 24 ++++++++++++------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 15 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 9227fc4fb..eedf3c59b 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index aeba0bb8f..8a91fcfcf 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 68449d0b9..36cdaebbe 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,69 +81,69 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.2</version>
+        <version>12.6.3-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 38ba7efe1..0a36cb1df 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index e804be3ec..16dd68ca8 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 5699ef4dc..2fba2592a 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 29a16cbbb..39af134ba 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index f7d243fcc..eae430ad9 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index ad690a41b..a9342c4ad 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 9575aac26..d674ab88b 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index cd9625639..6fa3751dc 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 569f3bf6c..d1a1785ac 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 5ab2d78c2..d9318b392 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.2</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index b342cf59f..8fe431a0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.2</version>
+  <version>12.6.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index e473fdc4f..f7a288d4a 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.2</version>
+    <version>12.6.3-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 48eac849302287d29011b9ee01dba9d641e9a85a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 14 Dec 2020 09:31:08 +1300
Subject: [PATCH 029/447] #2128 - Bump avaje-config dependency to 1.3 - Fix for
 - Repeated calls to Config.get() with no value, expect to return passed
 default value

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

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index eedf3c59b..835ad6fd0 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
     </dependency>
 
     <!--

From a132f09b03138563c57c46e7dd48c903c92c136c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sn=C5=8Dwball?= <tobias@olsson.be>
Date: Tue, 15 Dec 2020 00:40:06 +0100
Subject: [PATCH 030/447] Ignore javax.persistence.Transient in query beans
 (#2129)

* Add failing tests for transient types

* Ignore jpa @Transient fields in query beans

Any field marked with jpa @Transient should be ignored
---
 .../generator/ProcessingContext.java          |  6 +++-
 .../ebean/querybean/generator/AddressTest.kt  | 29 +++++++++++++++++++
 .../test/kotlin/org/example/domain/Address.kt |  6 +++-
 .../generator/ProcessingContext.java          |  6 +++-
 4 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt

diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index f16bd5553..327f67746 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -200,7 +200,11 @@ class ProcessingContext implements Constants {
 
   private boolean isStaticOrTransient(VariableElement field) {
     Set<Modifier> modifiers = field.getModifiers();
-    return (modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT));
+    return (
+      modifiers.contains(Modifier.STATIC) ||
+      modifiers.contains(Modifier.TRANSIENT) ||
+      hasAnnotations(field, "javax.persistence.Transient")
+    );
   }
 
   private static boolean hasAnnotations(Element element, String... annotations) {
diff --git a/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt b/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt
new file mode 100644
index 000000000..6d740331e
--- /dev/null
+++ b/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt
@@ -0,0 +1,29 @@
+package io.ebean.querybean.generator
+
+import org.example.domain.Address
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Assertions.fail
+import org.junit.jupiter.api.Test
+
+class AddressTest {
+
+  private val fieldsInQueryBean = javaClass.classLoader.loadClass("org.example.domain.query.QAddress")
+    ?.declaredFields
+    ?: fail()
+  private val fieldsInBean = Address::class.java.declaredFields
+
+  @Test
+  fun `assert no transient fields`() {
+    assertFieldsNotExists("javaxPersistenceTransient")
+    assertFieldsNotExists("kotlinJvmTransient")
+  }
+
+  private fun assertFieldsNotExists(fieldName: String) {
+    assertTrue(fieldsInBean.any { it.name == fieldName }) {
+      "$fieldName does not exist in Address."
+    }
+    assertTrue(fieldsInQueryBean.none { it.name == fieldName}) {
+      "$fieldName does exists in query bean for Address (QAddress)."
+    }
+  }
+}
diff --git a/kotlin-querybean-generator/src/test/kotlin/org/example/domain/Address.kt b/kotlin-querybean-generator/src/test/kotlin/org/example/domain/Address.kt
index 1669b6e0e..c70290d63 100644
--- a/kotlin-querybean-generator/src/test/kotlin/org/example/domain/Address.kt
+++ b/kotlin-querybean-generator/src/test/kotlin/org/example/domain/Address.kt
@@ -20,5 +20,9 @@ class Address(
   @Size(max = 100)
   var city: String,
   // Dummy metadata field just to test generation
-  val metadata: GenericType<GenericTypeArgument>
+  val metadata: GenericType<GenericTypeArgument>,
+  @Transient
+  val javaxPersistenceTransient: Set<String>,
+  @kotlin.jvm.Transient
+  val kotlinJvmTransient: Set<String>,
 ) : BaseModel()
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index 1000301f6..faec817bf 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -171,7 +171,11 @@ class ProcessingContext implements Constants {
 
   private boolean isStaticOrTransient(VariableElement field) {
     Set<Modifier> modifiers = field.getModifiers();
-    return (modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT));
+    return (
+      modifiers.contains(Modifier.STATIC) ||
+      modifiers.contains(Modifier.TRANSIENT) ||
+      hasAnnotations(field, "javax.persistence.Transient")
+    );
   }
 
   private static boolean hasAnnotations(Element element, String... annotations) {

From 55324653a5843cb6bbf9a5ef0aaa1c856261dfb1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 16 Dec 2020 15:36:44 +1300
Subject: [PATCH 031/447] #2127 - Adding a new list of children to @OneToMany
 with orphanRemoval true does not delete existing orphans (#2131)

---
 .../server/core/PersistRequestUpdateSql.java  |  4 +-
 .../ebeaninternal/server/core/Persister.java  | 12 ++---
 .../server/persist/BatchControl.java          | 25 +++------
 .../server/persist/DefaultPersister.java      | 24 +++------
 .../server/persist/SaveManyBase.java          |  2 +-
 .../server/persist/SaveManyBeans.java         | 14 ++---
 .../persist/SaveManyElementCollection.java    |  2 +-
 .../persist/SaveManyElementCollectionMap.java |  2 +-
 .../test/java/org/tests/cascade/COOne.java    |  3 ++
 .../tests/cascade/TestDeleteO2MOrphans.java   | 51 +++++++++++++++++++
 10 files changed, 86 insertions(+), 53 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index fc2ae7419..80471f5aa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -73,13 +73,13 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   /**
    * Add this request to BatchControl to flush later.
    */
-  public void addToFlushQueue(boolean early) {
+  public void addToFlushQueue(int pos) {
     BatchControl control = transaction.getBatchControl();
     if (control == null) {
       control = persistExecute.createBatchControl(transaction);
     }
     flushQueue = true;
-    control.addToFlushQueue(this, early);
+    control.addToFlushQueue(this, pos);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/Persister.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/Persister.java
index b8bb132e1..587ce0625 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/Persister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/Persister.java
@@ -104,18 +104,14 @@ public interface Persister {
   void executeOrQueue(SpiSqlUpdate update, SpiTransaction t, boolean queue);
 
   /**
-   * Queue the SqlUpdate for early execution (with JDBC batch).
+   * Queue the SqlUpdate for execution with position 0, 1 or 2 defining
+   * when it executes relative to the flush of beans .
    */
-  void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t);
+  void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t, int pos);
 
   /**
-   * Queue the SqlUpdate for late execution (with JDBC batch).
+   * Add the statement to JDBC batch for later execution via executeBatch.
    */
-  void addToFlushQueueLast(SpiSqlUpdate update, SpiTransaction t);
-
-    /**
-     * Add the statement to JDBC batch for later execution via executeBatch.
-     */
   void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction);
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index ba826af34..bc4b00c4e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -81,8 +81,7 @@ public final class BatchControl {
    */
   private int bufferMax;
 
-  private Queue earlyQueue;
-  private Queue lateQueue;
+  private Queue[] queues = new Queue[3];
 
   /**
    * Create for a given transaction, PersistExecute, default size and getGeneratedKeys.
@@ -271,9 +270,10 @@ public final class BatchControl {
   }
 
   private void flushBuffer(boolean reset) throws BatchedSqlException {
+    flushQueue(queues[0]);
     flushInternal(reset);
-    flushQueue(earlyQueue);
-    flushQueue(lateQueue);
+    flushQueue(queues[1]);
+    flushQueue(queues[2]);
   }
 
   private void flushQueue(Queue queue) throws BatchedSqlException {
@@ -368,20 +368,11 @@ public final class BatchControl {
   /**
    * 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);
+  public void addToFlushQueue(PersistRequestUpdateSql request, int pos) {
+    if (queues[pos] == null) {
+      queues[pos] = new Queue();
     }
+    queues[pos].add(request);
   }
 
   private static class Queue {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 467e823d4..a7b21f0c8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -141,24 +141,17 @@ public final class DefaultPersister implements Persister {
   @Override
   public void executeOrQueue(SpiSqlUpdate update, SpiTransaction t, boolean queue) {
     if (queue) {
-      addToFlushQueue(update, t, false);
+      addToFlushQueue(update, t, 2);
     } else {
       executeSqlUpdate(update, t);
     }
   }
 
-  @Override
-  public void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t) {
-    addToFlushQueue(update, t, true);
-  }
-
-  @Override
-  public void addToFlushQueueLast(SpiSqlUpdate update, SpiTransaction t) {
-    addToFlushQueue(update, t, false);
-  }
-
-  private void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t, boolean early) {
-    new PersistRequestUpdateSql(server, update, t, persistExecute).addToFlushQueue(early);
+  /**
+   * Add to the flush queue in position 0, 1 or 2.
+   */
+  public void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t, int pos) {
+    new PersistRequestUpdateSql(server, update, t, persistExecute).addToFlushQueue(pos);
   }
 
   /**
@@ -963,7 +956,7 @@ public final class DefaultPersister implements Persister {
   void deleteManyIntersection(EntityBean bean, BeanPropertyAssocMany<?> many, SpiTransaction t, boolean publish, boolean queue) {
     SpiSqlUpdate sqlDelete = deleteAllIntersection(bean, many, publish);
     if (queue) {
-      addToFlushQueue(sqlDelete, t, true);
+      addToFlushQueue(sqlDelete, t, 1);
     } else {
       executeSqlUpdate(sqlDelete, t);
     }
@@ -1237,7 +1230,6 @@ public final class DefaultPersister implements Persister {
   @SuppressWarnings({"unchecked"})
   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);
   }
@@ -1252,7 +1244,6 @@ public final class DefaultPersister implements Persister {
 
   @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) {
       type = Type.DELETE;
@@ -1281,7 +1272,6 @@ public final class DefaultPersister implements Persister {
    */
   @SuppressWarnings("unchecked")
   private <T> BeanManager<T> getBeanManager(Object bean) {
-
     BeanManager<T> mgr = (BeanManager<T>) beanDescriptorManager.getBeanManager(bean.getClass());
     if (mgr == null) {
       throw new PersistenceException(errNotRegistered(bean.getClass()));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
index c463c330b..f305e3244 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -49,7 +49,7 @@ abstract class SaveManyBase implements SaveMany {
   void preElementCollectionUpdate() {
     if (!insertedParent) {
       request.preElementCollectionUpdate();
-      persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction);
+      persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 1);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 003a295c8..114aa232e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -235,9 +235,6 @@ public class SaveManyBeans extends SaveManyBase {
   /**
    * 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() {
     if (value == null) {
@@ -336,9 +333,14 @@ public class SaveManyBeans extends SaveManyBase {
   }
 
   private void removeAssocManyOrphans() {
-    // 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<?>) {
+    if (value == null) {
+      return;
+    }
+    if (!(value instanceof BeanCollection<?>)) {
+      if (!insertedParent) {
+        persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0);
+      }
+    } else {
       BeanCollection<?> c = (BeanCollection<?>) value;
       Set<?> modifyRemovals = c.getModifyRemovals();
       if (insertedParent) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
index e7622ce56..53f638114 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
@@ -48,7 +48,7 @@ class SaveManyElementCollection extends SaveManyBase {
       final SpiSqlUpdate sqlInsert = proto.copy();
       sqlInsert.setParameter(parentId);
       many.bindElementValue(sqlInsert, value);
-      persister.addToFlushQueueLast(sqlInsert, transaction);
+      persister.addToFlushQueue(sqlInsert, transaction, 2);
     }
     resetModifyState();
     postElementCollectionUpdate();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
index 552f21424..60dd2e01d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
@@ -51,7 +51,7 @@ class SaveManyElementCollectionMap extends SaveManyBase {
       sqlInsert.setParameter(parentId);
       sqlInsert.setParameter(entry.getKey());
       many.bindElementValue(sqlInsert, entry.getValue());
-      persister.addToFlushQueueLast(sqlInsert, transaction);
+      persister.addToFlushQueue(sqlInsert, transaction, 2);
     }
     resetModifyState();
     postElementCollectionUpdate();
diff --git a/ebean-core/src/test/java/org/tests/cascade/COOne.java b/ebean-core/src/test/java/org/tests/cascade/COOne.java
index cc2430574..07c92ecac 100644
--- a/ebean-core/src/test/java/org/tests/cascade/COOne.java
+++ b/ebean-core/src/test/java/org/tests/cascade/COOne.java
@@ -34,4 +34,7 @@ public class COOne {
     return children;
   }
 
+  public void setChildren(List<COOneMany> children) {
+    this.children = children;
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
new file mode 100644
index 000000000..f4356d2bf
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
@@ -0,0 +1,51 @@
+package org.tests.cascade;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDeleteO2MOrphans extends BaseTestCase {
+
+  @Test
+  public void test() {
+    final long id = setup();
+    // act
+    setNewChildren(id);
+
+    // assert
+    COOne check = findById(id);
+    assertThat(check.getChildren()).hasSize(2);
+    DB.delete(check);
+  }
+
+  private COOne findById(long id) {
+    return DB.find(COOne.class).where().idEq(id).findOne();
+  }
+
+  private void setNewChildren(long id) {
+    COOne found = findById(id);
+    found.setChildren(createManies("M3", "M4"));
+    DB.update(found);
+  }
+
+  private long setup() {
+    COOne company = new COOne("P0");
+    company.setChildren(createManies("M1", "M2"));
+    DB.insert(company);
+    return company.getId();
+  }
+
+  private List<COOneMany> createManies(String name1, String name2) {
+    COOneMany employee1 = new COOneMany(name1);
+    COOneMany employee2 = new COOneMany(name2);
+    List<COOneMany> employees = new ArrayList<>();
+    employees.add(employee1);
+    employees.add(employee2);
+    return employees;
+  }
+}

From fcf14ac2227613d21ba7d237122e87a75c0abb54 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 17 Dec 2020 11:56:34 +1300
Subject: [PATCH 032/447] Add ebean-redis as module

---
 ebean-redis/pom.xml                           |  95 ++++
 .../main/java/io/ebean/redis/DuelCache.java   | 161 ++++++
 .../src/main/java/io/ebean/redis/ModId.java   |  49 ++
 .../io/ebean/redis/NearCacheInvalidate.java   |  24 +
 .../java/io/ebean/redis/NearCacheNotify.java  |  24 +
 .../main/java/io/ebean/redis/RedisCache.java  | 268 +++++++++
 .../io/ebean/redis/RedisCacheFactory.java     | 525 ++++++++++++++++++
 .../java/io/ebean/redis/RedisCachePlugin.java |  17 +
 .../main/java/io/ebean/redis/RedisConfig.java | 179 ++++++
 .../java/io/ebean/redis/encode/Encode.java    |   8 +
 .../io/ebean/redis/encode/EncodeBeanData.java |  47 ++
 .../ebean/redis/encode/EncodeManyIdsData.java |  47 ++
 .../ebean/redis/encode/EncodePrefixKey.java   |  41 ++
 .../redis/encode/EncodeSerializable.java      |  37 ++
 .../java/io/ebean/redis/encode/PrefixKey.java |  22 +
 .../io/ebean/redis/topic/DaemonTopic.java     |  21 +
 .../ebean/redis/topic/DaemonTopicRunner.java  |  95 ++++
 .../services/io.ebean.cache.ServerCachePlugin |   1 +
 .../java/io/ebean/redis/RedisConfigTest.java  |  46 ++
 .../src/test/java/org/domain/EBase.java       |  58 ++
 .../src/test/java/org/domain/Person.java      |  69 +++
 .../java/org/integration/ClusterTest.java     | 123 ++++
 .../java/org/integration/IntegrationTest.java | 107 ++++
 .../src/test/resources/application-test.yaml  |   9 +
 .../src/test/resources/logback-test.xml       |  29 +
 pom.xml                                       |   1 +
 26 files changed, 2103 insertions(+)
 create mode 100644 ebean-redis/pom.xml
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/ModId.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/NearCacheInvalidate.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/NearCacheNotify.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/RedisCachePlugin.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/encode/Encode.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopic.java
 create mode 100644 ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
 create mode 100644 ebean-redis/src/main/resources/META-INF/services/io.ebean.cache.ServerCachePlugin
 create mode 100644 ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java
 create mode 100644 ebean-redis/src/test/java/org/domain/EBase.java
 create mode 100644 ebean-redis/src/test/java/org/domain/Person.java
 create mode 100644 ebean-redis/src/test/java/org/integration/ClusterTest.java
 create mode 100644 ebean-redis/src/test/java/org/integration/IntegrationTest.java
 create mode 100644 ebean-redis/src/test/resources/application-test.yaml
 create mode 100644 ebean-redis/src/test/resources/logback-test.xml

diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
new file mode 100644
index 000000000..7c6578935
--- /dev/null
+++ b/ebean-redis/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.6.3-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>ebean-redis</artifactId>
+  <name>ebean test</name>
+  <description>Testing support for Ebean</description>
+
+
+  <dependencies>
+
+    <dependency>
+      <groupId>redis.clients</groupId>
+      <artifactId>jedis</artifactId>
+      <version>3.4.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>12.6.3-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>12.6.3-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>12.6.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>querybean-generator</artifactId>
+      <version>12.6.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-test</artifactId>
+      <version>12.6.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>logback</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.18</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.ebean.tile:enhancement:12.6.1</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>
+
diff --git a/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java b/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
new file mode 100644
index 000000000..80025e7cc
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
@@ -0,0 +1,161 @@
+package io.ebean.redis;
+
+import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheStatistics;
+import io.ebean.meta.MetricVisitor;
+import io.ebeaninternal.server.cache.DefaultServerCache;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class DuelCache implements ServerCache, NearCacheInvalidate {
+
+  private final DefaultServerCache near;
+  private final RedisCache remote;
+  private final NearCacheNotify cacheNotify;
+  private final String cacheKey;
+
+  public DuelCache(DefaultServerCache near, RedisCache remote, String cacheKey, NearCacheNotify cacheNotify) {
+    this.near = near;
+    this.remote = remote;
+    this.cacheKey = cacheKey;
+    this.cacheNotify = cacheNotify;
+  }
+
+  @Override
+  public void visit(MetricVisitor visitor) {
+    near.visit(visitor);
+    remote.visit(visitor);
+  }
+
+  @Override
+  public void invalidateKeys(Set<Object> keySet) {
+    near.removeAll(keySet);
+  }
+
+  @Override
+  public void invalidateKey(Object id) {
+    near.remove(id);
+  }
+
+  @Override
+  public void invalidateClear() {
+    near.clear();
+  }
+
+  @Override
+  public Map<Object, Object> getAll(Set<Object> keys) {
+
+    Map<Object, Object> resultMap = near.getAll(keys);
+    Set<Object> localKeys = resultMap.keySet();
+
+    Set<Object> remainingKeys = new HashSet<>();
+    for (Object key : keys) {
+      if (!localKeys.contains(key)) {
+        remainingKeys.add(key);
+      }
+    }
+    if (!remainingKeys.isEmpty()) {
+      // fetch missing ones from remote cache and merge results
+      Map<Object, Object> remoteMap = remote.getAll(remainingKeys);
+      if (!remoteMap.isEmpty()) {
+        near.putAll(remoteMap);
+        resultMap.putAll(remoteMap);
+      }
+    }
+
+    return resultMap;
+  }
+
+  @Override
+  public Object get(Object id) {
+    Object val = near.get(id);
+    if (val != null) {
+      return val;
+    }
+    Object remoteVal = remote.get(id);
+    if (remoteVal != null) {
+      near.put(id, remoteVal);
+    }
+    return remoteVal;
+  }
+
+  @Override
+  public void putAll(Map<Object, Object> keyValues) {
+    near.putAll(keyValues);
+    remote.putAll(keyValues);
+    cacheNotify.invalidateKeys(cacheKey, keyValues.keySet());
+  }
+
+  @Override
+  public void put(Object id, Object value) {
+    near.put(id, value);
+    remote.put(id, value);
+    cacheNotify.invalidateKey(cacheKey, id);
+  }
+
+  @Override
+  public void removeAll(Set<Object> keys) {
+    near.removeAll(keys);
+    remote.removeAll(keys);
+    cacheNotify.invalidateKeys(cacheKey, keys);
+  }
+
+  @Override
+  public void remove(Object id) {
+    near.remove(id);
+    remote.remove(id);
+    cacheNotify.invalidateKey(cacheKey, id);
+  }
+
+  @Override
+  public void clear() {
+    near.clear();
+    remote.clear();
+    cacheNotify.invalidateClear(cacheKey);
+  }
+
+  /**
+   * Return the near cache hit count.
+   */
+  public long getNearHitCount() {
+    return near.getHitCount();
+  }
+
+  /**
+   * Return the near cache miss count.
+   */
+  public long getNearMissCount() {
+    return near.getMissCount();
+  }
+
+  /**
+   * Return the redis cache hit count.
+   */
+  public long getRemoteHitCount() {
+    return remote.getHitCount();
+  }
+
+  /**
+   * Return the redis cache miss count.
+   */
+  public long getRemoteMissCount() {
+    return remote.getMissCount();
+  }
+
+  @Override
+  public int size() {
+    return 0;
+  }
+
+  @Override
+  public int getHitRatio() {
+    return 0;
+  }
+
+  @Override
+  public ServerCacheStatistics getStatistics(boolean reset) {
+    return null;
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/ModId.java b/ebean-redis/src/main/java/io/ebean/redis/ModId.java
new file mode 100644
index 000000000..f063dea0c
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/ModId.java
@@ -0,0 +1,49 @@
+package io.ebean.redis;
+
+import java.security.SecureRandom;
+import java.util.Base64;
+
+/**
+ * Provides a modified base64 encoded UUID and shorter 12 character random unique value.
+ * <p>
+ * <h3>newId()</h3>
+ * <p>
+ * It produces a 22 character string that is a base64 encoded UUID with the +
+ * and / characters replaced with - and _ so as to be URL safe without requiring
+ * encoding.
+ * </p>
+ * <h3>newShortId()</h3>
+ * <p>
+ * It produces a 12 character string that base64 encoded random number (72 bit).
+ * </p>
+ * <p>
+ * Note that this now internally uses java.util.Base64 to encode the values.
+ * </p>
+ */
+public class ModId {
+
+  private static final SecureRandom shortIdSecureRandom = new SecureRandom();
+
+  private static final Base64.Encoder urlEncoder = Base64.getUrlEncoder();
+
+  /**
+   * Return a 12 character string using a 72 bit randomly generated ID encoded
+   * in modified base64.
+   * <p>
+   * A UUID is 128 bits and this is 72 bits so quite a bit smaller but still
+   * very random with one in 4.7 * 10^21 chance of a collision.
+   * </p>
+   */
+  public static String id() {
+
+    // Random 72 bits
+    byte[] randomBytes = new byte[9];
+    shortIdSecureRandom.nextBytes(randomBytes);
+    return encode64(randomBytes);
+  }
+
+  private static String encode64(byte[] bytes) {
+    return urlEncoder.encodeToString(bytes);
+  }
+
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/NearCacheInvalidate.java b/ebean-redis/src/main/java/io/ebean/redis/NearCacheInvalidate.java
new file mode 100644
index 000000000..88a19260d
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/NearCacheInvalidate.java
@@ -0,0 +1,24 @@
+package io.ebean.redis;
+
+import java.util.Set;
+
+/**
+ * Near cache invalidation.
+ */
+public interface NearCacheInvalidate {
+
+  /**
+   * Invalidate from near cache the given keys.
+   */
+  void invalidateKeys(Set<Object> keySet);
+
+  /**
+   * Invalidate from near cache the given key.
+   */
+  void invalidateKey(Object id);
+
+  /**
+   * Clear the near cache.
+   */
+  void invalidateClear();
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/NearCacheNotify.java b/ebean-redis/src/main/java/io/ebean/redis/NearCacheNotify.java
new file mode 100644
index 000000000..24e078452
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/NearCacheNotify.java
@@ -0,0 +1,24 @@
+package io.ebean.redis;
+
+import java.util.Set;
+
+/**
+ * Notify other cluster members to invalidate parts of their near cache.
+ */
+public interface NearCacheNotify {
+
+  /**
+   * Invalidate the given keys.
+   */
+  void invalidateKeys(String cacheKey, Set<Object> keySet);
+
+  /**
+   * Invalidate a single key.
+   */
+  void invalidateKey(String cacheKey, Object id);
+
+  /**
+   * Clear a near cache.
+   */
+  void invalidateClear(String cacheKey);
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
new file mode 100644
index 000000000..39e670a7f
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -0,0 +1,268 @@
+package io.ebean.redis;
+
+import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheConfig;
+import io.ebean.cache.ServerCacheStatistics;
+import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.CountMetric;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
+import io.ebean.redis.encode.Encode;
+import io.ebean.redis.encode.EncodePrefixKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.ScanParams;
+import redis.clients.jedis.ScanResult;
+import redis.clients.jedis.util.SafeEncoder;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+class RedisCache implements ServerCache {
+
+  private static final Logger log = LoggerFactory.getLogger(RedisCache.class);
+
+  private static final String CURSOR_0 = "0";
+  private static final byte[] CURSOR_0_BYTES = SafeEncoder.encode(CURSOR_0);
+
+  private final JedisPool jedisPool;
+  private final String cacheKey;
+  private final Encode keyEncode;
+  private final Encode valueEncode;
+
+  private final TimedMetric metricGet;
+  private final TimedMetric metricGetAll;
+  private final TimedMetric metricPut;
+  private final TimedMetric metricPutAll;
+  private final TimedMetric metricRemove;
+  private final TimedMetric metricRemoveAll;
+  private final TimedMetric metricClear;
+  private final CountMetric hitCount;
+  private final CountMetric missCount;
+
+  RedisCache(JedisPool jedisPool, ServerCacheConfig config, Encode valueEncode) {
+
+    this.jedisPool = jedisPool;
+    this.cacheKey = config.getCacheKey();
+    this.keyEncode = new EncodePrefixKey(config.getCacheKey());
+    this.valueEncode = valueEncode;
+
+    String pre = "l2r.";
+    String shortName = config.getShortName();
+    MetricFactory factory = MetricFactory.get();
+
+    hitCount = factory.createCountMetric(pre + shortName + ".hit");
+    missCount = factory.createCountMetric(pre + shortName + ".miss");
+    metricGet = factory.createTimedMetric(pre + shortName + ".get");
+    metricGetAll = factory.createTimedMetric(pre + shortName + ".getMany");
+    metricPut = factory.createTimedMetric(pre + shortName + ".put");
+    metricPutAll = factory.createTimedMetric(pre + shortName + ".putMany");
+    metricRemove = factory.createTimedMetric(pre + shortName + ".remove");
+    metricRemoveAll = factory.createTimedMetric(pre + shortName + ".removeMany");
+    metricClear = factory.createTimedMetric(pre + shortName + ".clear");
+  }
+
+  @Override
+  public void visit(MetricVisitor visitor) {
+    hitCount.visit(visitor);
+    missCount.visit(visitor);
+    metricGet.visit(visitor);
+    metricGetAll.visit(visitor);
+    metricPut.visit(visitor);
+    metricPutAll.visit(visitor);
+    metricRemove.visit(visitor);
+    metricRemoveAll.visit(visitor);
+    metricClear.visit(visitor);
+  }
+
+  private byte[] key(Object id) {
+    return keyEncode.encode(id);
+  }
+
+  private byte[] value(Object data) {
+    if (data == null) {
+      return null;
+    }
+    return valueEncode.encode(data);
+  }
+
+  private Object valueDecode(byte[] data) {
+    try {
+      if (data == null) {
+        return null;
+      }
+      return valueEncode.decode(data);
+    } catch (Exception e) {
+      log.error("Error decoding data, treated as cache miss", e);
+      return null;
+    }
+  }
+
+  @Override
+  public Map<Object, Object> getAll(Set<Object> keys) {
+
+    long start = System.nanoTime();
+    Map<Object, Object> map = new LinkedHashMap<>();
+
+    List<Object> keyList = new ArrayList<>(keys);
+    try (Jedis resource = jedisPool.getResource()) {
+      List<byte[]> valsAsBytes = resource.mget(keysAsBytes(keyList));
+      for (int i = 0; i < keyList.size(); i++) {
+        Object val = valueDecode(valsAsBytes.get(i));
+        if (val != null) {
+          map.put(keyList.get(i), val);
+        }
+      }
+      int hits = map.size();
+      int miss = keys.size() - hits;
+      if (hits > 0) {
+        hitCount.add(hits);
+      }
+      if (miss > 0) {
+        missCount.add(miss);
+      }
+      metricGetAll.addSinceNanos(start);
+      return map;
+    }
+  }
+
+  @Override
+  public Object get(Object id) {
+    long start = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+      Object val = valueDecode(resource.get(key(id)));
+      if (val != null) {
+        hitCount.increment();
+      } else {
+        missCount.increment();
+      }
+      metricGet.addSinceNanos(start);
+      return val;
+    }
+  }
+
+
+  @Override
+  public void put(Object id, Object value) {
+    long start = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+      resource.set(key(id), value(value));
+      metricPut.addSinceNanos(start);
+    }
+  }
+
+  @Override
+  public void putAll(Map<Object, Object> keyValues) {
+    long start = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+      byte[][] raw = new byte[keyValues.size() * 2][];
+      int pos = 0;
+      for (Map.Entry<Object, Object> entry : keyValues.entrySet()) {
+        raw[pos++] = key(entry.getKey());
+        raw[pos++] = value(entry.getValue());
+      }
+      resource.mset(raw);
+      metricPutAll.addSinceNanos(start);
+    }
+  }
+
+  @Override
+  public void remove(Object id) {
+    long start = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+      resource.del(key(id));
+      metricRemove.addSinceNanos(start);
+    }
+  }
+
+  @Override
+  public void removeAll(Set<Object> keys) {
+    long start = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+      resource.del(keysAsBytes(keys));
+      metricRemoveAll.addSinceNanos(start);
+    }
+  }
+
+  private byte[][] keysAsBytes(Collection<Object> keys) {
+    byte[][] raw = new byte[keys.size()][];
+    int pos = 0;
+    for (Object id : keys) {
+      raw[pos++] = key(id);
+    }
+    return raw;
+  }
+
+  @Override
+  public void clear() {
+    long start = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+
+      ScanParams params = new ScanParams();
+      params.match(cacheKey + ":*");
+
+      String next;
+      byte[] nextCursor = CURSOR_0_BYTES;
+      do {
+        ScanResult<byte[]> scanResult = resource.scan(nextCursor, params);
+        List<byte[]> keys = scanResult.getResult();
+        nextCursor = scanResult.getCursorAsBytes();
+
+        if (!keys.isEmpty()) {
+          byte[][] raw = new byte[keys.size()][];
+          for (int i = 0; i < keys.size(); i++) {
+            raw[i] = keys.get(i);
+          }
+          resource.del(raw);
+        }
+
+        next = SafeEncoder.encode(nextCursor);
+      } while (!next.equals("0"));
+
+      metricClear.addSinceNanos(start);
+    }
+  }
+
+  /**
+   * 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 size() {
+    return 0;
+  }
+
+  @Override
+  public int getHitRatio() {
+    return 0;
+  }
+
+  @Override
+  public ServerCacheStatistics getStatistics(boolean reset) {
+
+    ServerCacheStatistics cacheStats = new ServerCacheStatistics();
+    cacheStats.setCacheName(cacheKey);
+    cacheStats.setHitCount(hitCount.get(reset));
+    cacheStats.setMissCount(missCount.get(reset));
+    cacheStats.setPutCount(metricPut.collect(reset).getCount());
+    cacheStats.setRemoveCount(metricRemove.collect(reset).getCount());
+    cacheStats.setClearCount(metricClear.collect(reset).getCount());
+    return cacheStats;
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
new file mode 100644
index 000000000..93ed840e1
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
@@ -0,0 +1,525 @@
+package io.ebean.redis;
+
+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;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
+import io.ebean.redis.encode.EncodeBeanData;
+import io.ebean.redis.encode.EncodeManyIdsData;
+import io.ebean.redis.encode.EncodeSerializable;
+import io.ebean.redis.topic.DaemonTopic;
+import io.ebean.redis.topic.DaemonTopicRunner;
+import io.ebeaninternal.server.cache.DefaultServerCache;
+import io.ebeaninternal.server.cache.DefaultServerCacheConfig;
+import io.ebeaninternal.server.cache.DefaultServerQueryCache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import redis.clients.jedis.BinaryJedisPubSub;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.util.SafeEncoder;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static java.util.Arrays.asList;
+
+class RedisCacheFactory implements ServerCacheFactory {
+
+  private static final Logger log = LoggerFactory.getLogger(RedisCacheFactory.class);
+
+  private static final Logger queryLogger = LoggerFactory.getLogger("io.ebean.cache.QUERY");
+
+  private static final Logger logger = LoggerFactory.getLogger("io.ebean.cache.CACHE");
+
+  private static final Logger tableModLogger = LoggerFactory.getLogger("io.ebean.cache.TABLEMODS");
+
+  private static final int MSG_NEARCACHE_CLEAR = 1;
+  private static final int MSG_NEARCACHE_KEYS = 2;
+  private static final int MSG_NEARCACHE_KEY = 3;
+
+  /**
+   * Channel for standard L2 cache messages.
+   */
+  private static final String CHANNEL_L2 = "ebean.l2cache";
+
+  /**
+   * Channel specifically for near cache invalidation messages.
+   */
+  private static final String CHANNEL_NEAR = "ebean.l2near";
+
+  private static final byte[] CHANNEL_L2_BYTES = SafeEncoder.encode(CHANNEL_L2);
+  private static final byte[] CHANNEL_NEAR_BYTES = SafeEncoder.encode(CHANNEL_NEAR);
+
+  private final ConcurrentHashMap<String, RQueryCache> queryCaches = new ConcurrentHashMap<>();
+
+  private final Map<String, NearCacheInvalidate> nearCacheMap = new ConcurrentHashMap<>();
+
+  private final EncodeManyIdsData encodeManyIdsData = new EncodeManyIdsData();
+  private final EncodeBeanData encodeBeanData = new EncodeBeanData();
+  private final EncodeSerializable encodeSerializable = new EncodeSerializable();
+
+  private final BackgroundExecutor executor;
+
+  private final JedisPool jedisPool;
+
+  private final DaemonTopicRunner daemonTopicRunner;
+
+  private final NearCacheNotify nearCacheNotify;
+
+  private final TimedMetric metricOutNearCache;
+  private final TimedMetric metricOutTableMod;
+  private final TimedMetric metricOutQueryCache;
+  private final TimedMetric metricInNearCache;
+  private final TimedMetric metricInTableMod;
+  private final TimedMetric metricInQueryCache;
+
+  private final String serverId = ModId.id();
+
+  private ServerCacheNotify listener;
+
+  RedisCacheFactory(DatabaseConfig config, BackgroundExecutor executor) {
+    this.executor = executor;
+    this.nearCacheNotify = new DNearCacheNotify();
+    MetricFactory factory = MetricFactory.get();
+    this.metricOutTableMod = factory.createTimedMetric("l2a.outTableMod");
+    this.metricOutQueryCache = factory.createTimedMetric("l2a.outQueryCache");
+    this.metricOutNearCache = factory.createTimedMetric("l2a.outNearKeys");
+    this.metricInTableMod = factory.createTimedMetric("l2a.inTableMod");
+    this.metricInQueryCache = factory.createTimedMetric("l2a.inQueryCache");
+    this.metricInNearCache = factory.createTimedMetric("l2a.inNearKeys");
+    if (config.isDisableL2Cache()) {
+      this.jedisPool = null;
+      this.daemonTopicRunner = null;
+    } else {
+      this.jedisPool = getJedisPool(config);
+      this.daemonTopicRunner = new DaemonTopicRunner(jedisPool, new CacheDaemonTopic());
+      daemonTopicRunner.run();
+    }
+  }
+
+  /**
+   * Return the JedisPool to use (only 1 at this stage).
+   */
+  private JedisPool getJedisPool(DatabaseConfig config) {
+    JedisPool jedisPool = config.getServiceObject(JedisPool.class);
+    if (jedisPool != null) {
+      return jedisPool;
+    }
+    RedisConfig redisConfig = config.getServiceObject(RedisConfig.class);
+    if (redisConfig == null) {
+      redisConfig = new RedisConfig();
+    }
+    redisConfig.loadProperties(config.getProperties());
+    log.info("using l2cache redis host {}:{}", redisConfig.getServer(), redisConfig.getPort());
+    return redisConfig.createPool();
+  }
+
+  @Override
+  public void visit(MetricVisitor visitor) {
+    metricOutQueryCache.visit(visitor);
+    metricOutTableMod.visit(visitor);
+    metricOutNearCache.visit(visitor);
+    metricInTableMod.visit(visitor);
+    metricInQueryCache.visit(visitor);
+    metricInNearCache.visit(visitor);
+  }
+
+  @Override
+  public ServerCache createCache(ServerCacheConfig config) {
+    if (config.isQueryCache()) {
+      return createQueryCache(config);
+    }
+    return createNormalCache(config);
+  }
+
+  private ServerCache createNormalCache(ServerCacheConfig config) {
+
+    RedisCache redisCache = createRedisCache(config);
+    boolean nearCache = config.getCacheOptions().isNearCache();
+    if (!nearCache) {
+      return redisCache;
+    }
+
+    String cacheKey = config.getCacheKey();
+
+    DefaultServerCache near = new DefaultServerCache(new DefaultServerCacheConfig(config));
+    near.periodicTrim(executor);
+    DuelCache duelCache = new DuelCache(near, redisCache, cacheKey, nearCacheNotify);
+    nearCacheMap.put(cacheKey, duelCache);
+
+    return duelCache;
+  }
+
+  private RedisCache createRedisCache(ServerCacheConfig config) {
+
+    switch (config.getType()) {
+      case NATURAL_KEY:
+        return new RedisCache(jedisPool, config, encodeSerializable);
+      case BEAN:
+        return new RedisCache(jedisPool, config, encodeBeanData);
+      case COLLECTION_IDS:
+        return new RedisCache(jedisPool, config, encodeManyIdsData);
+      default:
+        throw new IllegalArgumentException("Unexpected cache type? " + config.getType());
+    }
+  }
+
+  private ServerCache createQueryCache(ServerCacheConfig config) {
+    synchronized (this) {
+      RQueryCache cache = queryCaches.get(config.getCacheKey());
+      if (cache == null) {
+        logger.debug("create query cache [{}]", config.getCacheKey());
+        cache = new RQueryCache(new DefaultServerCacheConfig(config));
+        cache.periodicTrim(executor);
+        queryCaches.put(config.getCacheKey(), cache);
+      }
+      return cache;
+    }
+  }
+
+  @Override
+  public ServerCacheNotify createCacheNotify(ServerCacheNotify listener) {
+    this.listener = listener;
+    return new RServerCacheNotify();
+  }
+
+  private void sendQueryCacheInvalidation(String name) {
+    long nanos = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+      resource.publish(CHANNEL_L2, serverId + ":queryCache:" + name);
+    } finally {
+      metricOutQueryCache.addSinceNanos(nanos);
+    }
+  }
+
+  private void sendTableMod(String formattedMsg) {
+    long nanos = System.nanoTime();
+    try (Jedis resource = jedisPool.getResource()) {
+      resource.publish(CHANNEL_L2, serverId + ":tableMod:" + formattedMsg);
+    } finally {
+      metricOutTableMod.addSinceNanos(nanos);
+    }
+  }
+
+  /**
+   * Query cache implementation using Redis channel for message notifications.
+   */
+  private class RQueryCache extends DefaultServerQueryCache {
+
+    RQueryCache(DefaultServerCacheConfig config) {
+      super(config);
+    }
+
+    @Override
+    public void clear() {
+      super.clear();
+      sendQueryCacheInvalidation(name);
+    }
+
+    /**
+     * Process the invalidation message coming from the cluster.
+     */
+    private void invalidate() {
+      queryLogger.debug("   CLEAR {}(*) - cluster invalidate", name);
+      super.clear();
+    }
+  }
+
+  /**
+   * Publish table modifications using Redis channel (to other cluster members)
+   */
+  private class RServerCacheNotify implements ServerCacheNotify {
+
+    @Override
+    public void notify(ServerCacheNotification tableModifications) {
+
+      Set<String> dependentTables = tableModifications.getDependentTables();
+      if (dependentTables != null && !dependentTables.isEmpty()) {
+
+        StringBuilder msg = new StringBuilder(50);
+        for (String table : dependentTables) {
+          msg.append(table).append(",");
+        }
+
+        String formattedMsg = msg.toString();
+        if (tableModLogger.isDebugEnabled()) {
+          tableModLogger.debug("Publish TableMods - {}", formattedMsg);
+        }
+        sendTableMod(formattedMsg);
+      }
+    }
+  }
+
+  /**
+   * Clear the query cache if we have it.
+   */
+  private void queryCacheInvalidate(String key) {
+    long nanos = System.nanoTime();
+    try {
+      RQueryCache queryCache = queryCaches.get(key);
+      if (queryCache != null) {
+        queryCache.invalidate();
+      }
+    } finally {
+      metricInQueryCache.addSinceNanos(nanos);
+    }
+  }
+
+  /**
+   * Process a remote dependent table modify event.
+   */
+  private void processTableNotify(String rawMessage) {
+    long nanos = System.nanoTime();
+    try {
+      if (logger.isDebugEnabled()) {
+        logger.debug("processTableNotify {}", rawMessage);
+      }
+      Set<String> tables = new HashSet<>(asList(rawMessage.split(",")));
+      listener.notify(new ServerCacheNotification(tables));
+    } finally {
+      metricInTableMod.addSinceNanos(nanos);
+    }
+  }
+
+  /**
+   * Near cache notification using a specific Redis channel (CHANNEL_NEAR).
+   */
+  private class DNearCacheNotify implements NearCacheNotify {
+
+    @Override
+    public void invalidateKeys(String cacheKey, Set<Object> keySet) {
+      try {
+        sendMessage(messageInvalidateKeys(cacheKey, keySet));
+      } catch (IOException e) {
+        logger.error("failed to transmit invalidateKeys() message", e);
+      }
+    }
+
+    @Override
+    public void invalidateKey(String cacheKey, Object id) {
+      try {
+        sendMessage(messageInvalidateKey(cacheKey, id));
+      } catch (IOException e) {
+        logger.error("failed to transmit invalidateKeys() message", e);
+      }
+    }
+
+    @Override
+    public void invalidateClear(String cacheKey) {
+      try {
+        sendMessage(messageInvalidateClear(cacheKey));
+      } catch (IOException e) {
+        logger.error("failed to transmit invalidateKeys() message", e);
+      }
+    }
+
+    private void sendMessage(byte[] message) {
+      long nanos = System.nanoTime();
+      try (Jedis resource = jedisPool.getResource()) {
+        resource.publish(CHANNEL_NEAR_BYTES, message);
+      } finally {
+        metricOutNearCache.addSinceNanos(nanos);
+      }
+    }
+
+    private byte[] messageInvalidateKeys(String cacheKey, Set<Object> keySet) throws IOException {
+      ByteArrayOutputStream ba = new ByteArrayOutputStream(100);
+      ObjectOutputStream os = new ObjectOutputStream(ba);
+      os.writeUTF(serverId);
+      os.writeInt(MSG_NEARCACHE_KEYS);
+      os.writeUTF(cacheKey);
+      os.writeInt(keySet.size());
+      for (Object key : keySet) {
+        os.writeObject(key);
+      }
+      os.flush();
+      os.close();
+      return ba.toByteArray();
+    }
+
+    private byte[] messageInvalidateKey(String cacheKey, Object id) throws IOException {
+      ByteArrayOutputStream ba = new ByteArrayOutputStream(100);
+      ObjectOutputStream os = new ObjectOutputStream(ba);
+      os.writeUTF(serverId);
+      os.writeInt(MSG_NEARCACHE_KEY);
+      os.writeUTF(cacheKey);
+      os.writeObject(id);
+      os.flush();
+      os.close();
+      return ba.toByteArray();
+    }
+
+    private byte[] messageInvalidateClear(String cacheKey) throws IOException {
+      ByteArrayOutputStream ba = new ByteArrayOutputStream(100);
+      ObjectOutputStream os = new ObjectOutputStream(ba);
+      os.writeUTF(serverId);
+      os.writeInt(MSG_NEARCACHE_CLEAR);
+      os.writeUTF(cacheKey);
+      os.flush();
+      os.close();
+      return ba.toByteArray();
+    }
+  }
+
+  /**
+   * Redis channel listener that supports reconnection etc.
+   */
+  private class CacheDaemonTopic implements DaemonTopic {
+
+    @Override
+    public void subscribe(Jedis jedis) {
+      jedis.subscribe(new ChannelSubscriber(), CHANNEL_L2_BYTES, CHANNEL_NEAR_BYTES);
+    }
+
+    @Override
+    public void notifyConnected() {
+      logger.info("Established connection to Redis");
+    }
+
+    /**
+     * Handles updates to the features (via redis topic notifications).
+     */
+    private class ChannelSubscriber extends BinaryJedisPubSub {
+
+      @Override
+      public void onMessage(byte[] channel, byte[] message) {
+        String channelName = SafeEncoder.encode(channel);
+        if (channelName.equals(CHANNEL_L2)) {
+          processL2Message(SafeEncoder.encode(message));
+        } else {
+          processNearCacheMessage(message);
+        }
+      }
+
+      private void processNearCacheMessage(byte[] message) {
+        long nanos = System.nanoTime();
+        int msgType = 0;
+        String cacheKey = null;
+        try {
+          ObjectInputStream oi = new ObjectInputStream(new ByteArrayInputStream(message));
+          String sourceServerId = oi.readUTF();
+          if (sourceServerId.equals(serverId)) {
+            // ignore this message as we are the server that sent it
+            return;
+          }
+          msgType = oi.readInt();
+          cacheKey = oi.readUTF();
+          if (logger.isDebugEnabled()) {
+            logger.debug("processNearCacheMessage serverId:{} type:{} cacheKey:{}", sourceServerId, msgType, cacheKey);
+          }
+
+          switch (msgType) {
+            case MSG_NEARCACHE_CLEAR:
+              nearCacheInvalidateClear(cacheKey);
+              break;
+
+            case MSG_NEARCACHE_KEY:
+              Object key = oi.readObject();
+              nearCacheInvalidateKey(cacheKey, key);
+              break;
+
+            case MSG_NEARCACHE_KEYS:
+              int count = oi.readInt();
+              Set<Object> keys = new LinkedHashSet<>();
+              for (int i = 0; i < count; i++) {
+                keys.add(oi.readObject());
+              }
+              nearCacheInvalidateKeys(cacheKey, keys);
+              break;
+
+            default:
+              throw new IllegalStateException("Unexpected message type ? " + msgType);
+          }
+
+        } catch (IOException | ClassNotFoundException e) {
+          logger.error("failed to decode near cache message [" + SafeEncoder.encode(message) + "] for cache:" + cacheKey, e);
+          if (cacheKey != null) {
+            nearCacheInvalidateClear(cacheKey);
+          }
+        } finally {
+          if (msgType != 0) {
+            metricInNearCache.addSinceNanos(nanos);
+          }
+        }
+      }
+
+      private void processL2Message(String message) {
+        try {
+          String[] split = message.split(":");
+          if (serverId.equals(split[0])) {
+            // ignore this message as we are the server that sent it
+            return;
+          }
+          switch (split[1]) {
+            case "tableMod":
+              processTableNotify(split[2]);
+              break;
+            case "queryCache":
+              queryCacheInvalidate(split[2]);
+              break;
+            default:
+              logger.error("Unknown L2 message type[{}] on redis channel - message[{}] ", split[0], message);
+          }
+        } catch (Exception e) {
+          logger.error("Error handling L2 message[" + message + "]", e);
+        }
+      }
+    }
+  }
+
+  /**
+   * Invalidate key for a local near cache.
+   */
+  private void nearCacheInvalidateKey(String cacheKey, Object key) {
+    NearCacheInvalidate invalidate = nearCacheMap.get(cacheKey);
+    if (invalidate == null) {
+      warnNearCacheNotFound(cacheKey);
+    } else {
+      invalidate.invalidateKey(key);
+    }
+  }
+
+  /**
+   * Invalidate keys for a local near cache.
+   */
+  private void nearCacheInvalidateKeys(String cacheKey, Set<Object> keys) {
+    NearCacheInvalidate invalidate = nearCacheMap.get(cacheKey);
+    if (invalidate == null) {
+      warnNearCacheNotFound(cacheKey);
+    } else {
+      invalidate.invalidateKeys(keys);
+    }
+  }
+
+  /**
+   * Invalidate clear for a local near cache.
+   */
+  private void nearCacheInvalidateClear(String cacheKey) {
+    NearCacheInvalidate invalidate = nearCacheMap.get(cacheKey);
+    if (invalidate == null) {
+      warnNearCacheNotFound(cacheKey);
+    } else {
+      invalidate.invalidateClear();
+    }
+  }
+
+  private void warnNearCacheNotFound(String cacheKey) {
+    logger.warn("No near cache found for cacheKey [" + cacheKey + "] yet - probably on startup");
+  }
+
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCachePlugin.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCachePlugin.java
new file mode 100644
index 000000000..27806a4c4
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCachePlugin.java
@@ -0,0 +1,17 @@
+package io.ebean.redis;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.cache.ServerCacheFactory;
+import io.ebean.cache.ServerCachePlugin;
+import io.ebean.config.DatabaseConfig;
+
+public class RedisCachePlugin implements ServerCachePlugin {
+
+  /**
+   * Create the ServerCacheFactory implementation.
+   */
+  @Override
+  public ServerCacheFactory create(DatabaseConfig config, BackgroundExecutor executor) {
+    return new RedisCacheFactory(config, executor);
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java b/ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java
new file mode 100644
index 000000000..1b738cff9
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java
@@ -0,0 +1,179 @@
+package io.ebean.redis;
+
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+import java.util.Properties;
+
+/**
+ * Deployment configuration for redis.
+ */
+public class RedisConfig {
+
+  private String server = "localhost";
+
+  private int port = 6379;
+
+  private int maxTotal = 200;
+
+  private int maxIdle = 200;
+
+  private int minIdle = 1;
+
+  private long maxWaitMillis = -1L;
+
+  private boolean blockWhenExhausted = true;
+
+  private int timeout = 2000;
+
+  private String username;
+
+  private String password;
+
+  private boolean ssl;
+
+  /**
+   * Return a new JedisPool based on the configuration.
+   */
+  public JedisPool createPool() {
+    JedisPoolConfig poolConfig = new JedisPoolConfig();
+    poolConfig.setMaxTotal(maxTotal);
+    poolConfig.setMaxIdle(maxIdle);
+    poolConfig.setMinIdle(minIdle);
+    poolConfig.setMaxWaitMillis(maxWaitMillis);
+    poolConfig.setBlockWhenExhausted(blockWhenExhausted);
+    return new JedisPool(poolConfig, server, port, timeout, username, password, ssl);
+  }
+
+  public String getServer() {
+    return server;
+  }
+
+  public void setServer(String server) {
+    this.server = server;
+  }
+
+  public int getPort() {
+    return port;
+  }
+
+  public void setPort(int port) {
+    this.port = port;
+  }
+
+  public int getMaxTotal() {
+    return maxTotal;
+  }
+
+  public void setMaxTotal(int maxTotal) {
+    this.maxTotal = maxTotal;
+  }
+
+  public int getMaxIdle() {
+    return maxIdle;
+  }
+
+  public void setMaxIdle(int maxIdle) {
+    this.maxIdle = maxIdle;
+  }
+
+  public int getMinIdle() {
+    return minIdle;
+  }
+
+  public void setMinIdle(int minIdle) {
+    this.minIdle = minIdle;
+  }
+
+  public long getMaxWaitMillis() {
+    return maxWaitMillis;
+  }
+
+  public void setMaxWaitMillis(long maxWaitMillis) {
+    this.maxWaitMillis = maxWaitMillis;
+  }
+
+  public boolean isBlockWhenExhausted() {
+    return blockWhenExhausted;
+  }
+
+  public void setBlockWhenExhausted(boolean blockWhenExhausted) {
+    this.blockWhenExhausted = blockWhenExhausted;
+  }
+
+  public int getTimeout() {
+    return timeout;
+  }
+
+  public void setTimeout(int timeout) {
+    this.timeout = timeout;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public boolean isSsl() {
+    return ssl;
+  }
+
+  public void setSsl(boolean ssl) {
+    this.ssl = ssl;
+  }
+
+  public void loadProperties(Properties properties) {
+    Reader reader = new Reader(properties);
+    this.server = reader.get("ebean.redis.server", server);
+    this.port = reader.getInt("ebean.redis.port", port);
+    this.ssl = reader.getBool("ebean.redis.ssl", ssl);
+    this.minIdle = reader.getInt("ebean.redis.minIdle", minIdle);
+    this.maxIdle = reader.getInt("ebean.redis.maxIdle", maxIdle);
+    this.maxTotal = reader.getInt("ebean.redis.maxTotal", maxTotal);
+    this.maxWaitMillis = reader.getLong("ebean.redis.maxWaitMillis", maxWaitMillis);
+    this.timeout = reader.getInt("ebean.redis.timeout", timeout);
+    this.username = reader.get("ebean.redis.username", username);
+    this.password = reader.get("ebean.redis.password", password);
+    this.blockWhenExhausted = reader.getBool("ebean.redis.blockWhenExhausted", blockWhenExhausted);
+  }
+
+  private static class Reader {
+
+    private final Properties properties;
+
+    Reader(Properties properties) {
+      this.properties = (properties != null) ? properties : new Properties();
+    }
+
+    String get(String key, String defaultVal) {
+      return System.getProperty(key, properties.getProperty(key, defaultVal));
+    }
+
+    int getInt(String key, int defaultVal) {
+      final String val = get(key, null);
+      return val != null ? Integer.parseInt(val.trim()) : defaultVal;
+    }
+
+    long getLong(String key, long defaultVal) {
+      final String val = get(key, null);
+      return val != null ? Integer.parseInt(val.trim()) : defaultVal;
+    }
+
+    boolean getBool(String key, boolean defaultVal) {
+      final String val = get(key, null);
+      return val != null ? Boolean.parseBoolean(val.trim()) : defaultVal;
+    }
+  }
+
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/Encode.java b/ebean-redis/src/main/java/io/ebean/redis/encode/Encode.java
new file mode 100644
index 000000000..331f11dd2
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/Encode.java
@@ -0,0 +1,8 @@
+package io.ebean.redis.encode;
+
+public interface Encode {
+
+  byte[] encode(Object value);
+
+  Object decode(byte[] data);
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
new file mode 100644
index 000000000..5dd9e31f2
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
@@ -0,0 +1,47 @@
+package io.ebean.redis.encode;
+
+import io.ebeaninternal.server.cache.CachedBeanData;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+public class EncodeBeanData implements Encode {
+
+  @Override
+  public byte[] encode(Object value) {
+
+    try {
+      CachedBeanData data = (CachedBeanData) value;
+      ByteArrayOutputStream os = new ByteArrayOutputStream();
+      ObjectOutputStream oos = new ObjectOutputStream(os);
+
+      data.writeExternal(oos);
+      oos.flush();
+      oos.close();
+
+      return os.toByteArray();
+
+    } catch (IOException e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+
+  @Override
+  public Object decode(byte[] data) {
+
+    try {
+      ByteArrayInputStream is = new ByteArrayInputStream(data);
+      ObjectInputStream ois = new ObjectInputStream(is);
+
+      CachedBeanData read = new CachedBeanData();
+      read.readExternal(ois);
+      return read;
+
+    } catch (ClassNotFoundException | IOException e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
new file mode 100644
index 000000000..dc33b3bb4
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
@@ -0,0 +1,47 @@
+package io.ebean.redis.encode;
+
+import io.ebeaninternal.server.cache.CachedManyIds;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+public class EncodeManyIdsData implements Encode {
+
+  @Override
+  public byte[] encode(Object value) {
+
+    try {
+      CachedManyIds data = (CachedManyIds) value;
+      ByteArrayOutputStream os = new ByteArrayOutputStream();
+      ObjectOutputStream oos = new ObjectOutputStream(os);
+
+      data.writeExternal(oos);
+      oos.flush();
+      oos.close();
+
+      return os.toByteArray();
+
+    } catch (IOException e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+
+  @Override
+  public Object decode(byte[] data) {
+
+    try {
+      ByteArrayInputStream is = new ByteArrayInputStream(data);
+      ObjectInputStream ois = new ObjectInputStream(is);
+
+      CachedManyIds read = new CachedManyIds();
+      read.readExternal(ois);
+      return read;
+
+    } catch (ClassNotFoundException | IOException e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
new file mode 100644
index 000000000..fd6605d24
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
@@ -0,0 +1,41 @@
+package io.ebean.redis.encode;
+
+import io.ebean.cache.TenantAwareKey;
+
+import java.nio.charset.StandardCharsets;
+
+public class EncodePrefixKey implements Encode {
+
+  private final String prefix;
+
+  public EncodePrefixKey(String cacheKey) {
+    this.prefix = cacheKey + ":";
+  }
+
+  @Override
+  public byte[] encode(Object value) {
+    try {
+      if (!(value instanceof String) && !(value instanceof TenantAwareKey.CacheKey)) {
+        throw new IllegalStateException("Expecting String keys but got type:" + value.getClass());
+      }
+
+      String key = prefix + value.toString();
+      return key.getBytes(StandardCharsets.UTF_8);
+
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+
+  @Override
+  public Object decode(byte[] data) {
+    try {
+      String key = new String(data, StandardCharsets.UTF_8);
+      int pos = key.indexOf(':');
+      return key.substring(pos);
+
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
new file mode 100644
index 000000000..5a63b243c
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
@@ -0,0 +1,37 @@
+package io.ebean.redis.encode;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+public class EncodeSerializable implements Encode {
+
+  @Override
+  public byte[] encode(Object value) {
+
+    try {
+      ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream());
+      oos.writeObject(value);
+      oos.flush();
+      oos.close();
+
+      return new ByteArrayOutputStream().toByteArray();
+
+    } catch (IOException e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+
+  @Override
+  public Object decode(byte[] data) {
+    try {
+      try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(data))) {
+        return ois.readObject();
+      }
+    } catch (ClassNotFoundException | IOException e) {
+      throw new RuntimeException("Failed to decode cache data", e);
+    }
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java b/ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java
new file mode 100644
index 000000000..58aca8375
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java
@@ -0,0 +1,22 @@
+package io.ebean.redis.encode;
+
+import java.io.Serializable;
+
+public class PrefixKey implements Serializable {
+
+  private final String prefix;
+  private final Object key;
+
+  PrefixKey(String prefix, Object key) {
+    this.prefix = prefix;
+    this.key = key;
+  }
+
+  public String getPrefix() {
+    return prefix;
+  }
+
+  public Object getKey() {
+    return key;
+  }
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopic.java b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopic.java
new file mode 100644
index 000000000..31fdcddd5
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopic.java
@@ -0,0 +1,21 @@
+package io.ebean.redis.topic;
+
+import redis.clients.jedis.Jedis;
+
+/**
+ * Topic subscriber that has re-connect notification.
+ */
+public interface DaemonTopic {
+
+  /**
+   * Subscribe to the topic/channel (blocking).
+   *
+   * @param jedis The redis connection to subscribe (and block on).
+   */
+  void subscribe(Jedis jedis);
+
+  /**
+   * Notify that the topic subscription has been connected (or reconnected).
+   */
+  void notifyConnected();
+}
diff --git a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
new file mode 100644
index 000000000..2771c0766
--- /dev/null
+++ b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
@@ -0,0 +1,95 @@
+package io.ebean.redis.topic;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.exceptions.JedisException;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Subscribe to redis topic listening for changes.
+ * <p>
+ * Handles reconnection to redis when the connection is lost and
+ * notification of when reconnection takes place.
+ * </p>
+ */
+public class DaemonTopicRunner {
+
+  private static final Logger log = LoggerFactory.getLogger(DaemonTopicRunner.class);
+
+  private static final long reconnectWaitMillis = 1000;
+
+  private final JedisPool jedisPool;
+
+  private final DaemonTopic daemonTopic;
+
+  public DaemonTopicRunner(JedisPool jedisPool, DaemonTopic daemonTopic) {
+    this.jedisPool = jedisPool;
+    this.daemonTopic = daemonTopic;
+  }
+
+  public void run() {
+    Thread t = new Thread(() -> attemptConnections(), "redis-sub");
+    t.start();
+  }
+
+  private void attemptConnections() {
+
+    Timer reloadTimer = new Timer("redis-sub-notify");
+    ReloadNotifyTask notifyTask = null;
+    int attempts = 1;
+
+    while (true) {
+      if (notifyTask != null) {
+        // we didn't successfully re-connect to redis
+        notifyTask.cancel();
+      }
+      notifyTask = new ReloadNotifyTask();
+      reloadTimer.schedule(notifyTask, reconnectWaitMillis + 500);
+      attempts++;
+      try {
+        subscribe();
+      } catch (JedisException e) {
+        log.debug("... redis subscribe connection attempt:{} failed:{}", attempts, e.getMessage());
+        try {
+          // wait a little before retrying
+          Thread.sleep(reconnectWaitMillis);
+        } catch (InterruptedException e1) {
+          log.warn("Interrupted redis re-connection wait", e1);
+        }
+      }
+    }
+  }
+
+  /**
+   * Subscribe and block when successful.
+   */
+  private void subscribe() {
+    Jedis jedis = jedisPool.getResource();
+    jedis.echo("hi");
+    try {
+      daemonTopic.subscribe(jedis);
+
+    } catch (Exception e) {
+      log.error("Lost connection to topic, starting re-connection loop", e);
+      attemptConnections();
+
+    } finally {
+      try {
+        jedis.close();
+      } catch (Exception e) {
+        log.warn("Error closing probably broken Redis connection", e);
+      }
+    }
+  }
+
+  private class ReloadNotifyTask extends TimerTask {
+    @Override
+    public void run() {
+      daemonTopic.notifyConnected();
+    }
+  }
+}
diff --git a/ebean-redis/src/main/resources/META-INF/services/io.ebean.cache.ServerCachePlugin b/ebean-redis/src/main/resources/META-INF/services/io.ebean.cache.ServerCachePlugin
new file mode 100644
index 000000000..577a7fc5a
--- /dev/null
+++ b/ebean-redis/src/main/resources/META-INF/services/io.ebean.cache.ServerCachePlugin
@@ -0,0 +1 @@
+io.ebean.redis.RedisCachePlugin
diff --git a/ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java b/ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java
new file mode 100644
index 000000000..0b149bb87
--- /dev/null
+++ b/ebean-redis/src/test/java/io/ebean/redis/RedisConfigTest.java
@@ -0,0 +1,46 @@
+package io.ebean.redis;
+
+import org.junit.Test;
+
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RedisConfigTest {
+
+  @Test
+  public void loadProperties() {
+
+    Properties p = new Properties();
+    p.setProperty("ebean.redis.server", "test-server");
+    p.setProperty("ebean.redis.port", "99");
+    p.setProperty("ebean.redis.maxIdle", "5");
+    p.setProperty("ebean.redis.maxTotal", "6");
+    p.setProperty("ebean.redis.minIdle", "7");
+    p.setProperty("ebean.redis.maxWaitMillis", "8");
+    p.setProperty("ebean.redis.username", "un");
+    p.setProperty("ebean.redis.password", "pw");
+    p.setProperty("ebean.redis.ssl", "true");
+
+    RedisConfig config = new RedisConfig();
+    config.loadProperties(p);
+
+    assertThat(config.getServer()).isEqualTo("test-server");
+    assertThat(config.getPort()).isEqualTo(99);
+    assertThat(config.getMaxIdle()).isEqualTo(5);
+    assertThat(config.getMaxTotal()).isEqualTo(6);
+    assertThat(config.getMinIdle()).isEqualTo(7);
+    assertThat(config.getMaxWaitMillis()).isEqualTo(8);
+    assertThat(config.getUsername()).isEqualTo("un");
+    assertThat(config.getPassword()).isEqualTo("pw");
+    assertThat(config.isSsl()).isEqualTo(true);
+  }
+
+  @Test
+  public void test_defaultValues() {
+    RedisConfig config = new RedisConfig();
+    assertThat(config.getUsername()).isNull();
+    assertThat(config.getPassword()).isNull();
+    assertThat(config.isSsl()).isEqualTo(false);
+  }
+}
diff --git a/ebean-redis/src/test/java/org/domain/EBase.java b/ebean-redis/src/test/java/org/domain/EBase.java
new file mode 100644
index 000000000..84143f8e3
--- /dev/null
+++ b/ebean-redis/src/test/java/org/domain/EBase.java
@@ -0,0 +1,58 @@
+package org.domain;
+
+import io.ebean.Model;
+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 class EBase extends Model {
+
+  @Id
+  protected long id;
+
+  @Version
+  protected long version;
+
+  @WhenCreated
+  protected Instant whenCreated;
+
+  @WhenModified
+  protected Instant whenModified;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public Instant getWhenCreated() {
+    return whenCreated;
+  }
+
+  public void setWhenCreated(Instant whenCreated) {
+    this.whenCreated = whenCreated;
+  }
+
+  public Instant getWhenModified() {
+    return whenModified;
+  }
+
+  public void setWhenModified(Instant whenModified) {
+    this.whenModified = whenModified;
+  }
+}
diff --git a/ebean-redis/src/test/java/org/domain/Person.java b/ebean-redis/src/test/java/org/domain/Person.java
new file mode 100644
index 000000000..b2a5d2110
--- /dev/null
+++ b/ebean-redis/src/test/java/org/domain/Person.java
@@ -0,0 +1,69 @@
+package org.domain;
+
+
+import io.ebean.annotation.Cache;
+import io.ebean.annotation.Index;
+
+import javax.persistence.Entity;
+import java.time.LocalDate;
+
+@Cache(enableQueryCache = true, nearCache = true, naturalKey = "name")
+@Entity
+public class Person extends EBase {
+
+  public enum Status {
+    NEW,
+    ACTIVE,
+    INACTIVE
+  }
+
+  @Index(unique = true)
+  String name;
+
+  Status status;
+
+  LocalDate localDate;
+
+  String notes;
+
+  public Person(String name) {
+    this.name = name;
+    this.status = Status.NEW;
+  }
+
+  public String toString() {
+    return "[id:" + id + " name:" + name + "date:" + localDate + ']';
+  }
+
+  public Status getStatus() {
+    return status;
+  }
+
+  public void setStatus(Status status) {
+    this.status = status;
+  }
+
+  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 LocalDate getLocalDate() {
+    return localDate;
+  }
+
+  public void setLocalDate(LocalDate localDate) {
+    this.localDate = localDate;
+  }
+}
diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java
new file mode 100644
index 000000000..0d9414579
--- /dev/null
+++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java
@@ -0,0 +1,123 @@
+package org.integration;
+
+import io.ebean.redis.DuelCache;
+import org.domain.Person;
+import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.config.DatabaseConfig;
+import org.domain.query.QPerson;
+import org.junit.Test;
+
+import javax.sql.DataSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ClusterTest {
+
+
+  private Database createOther(DataSource dataSource) {
+
+    DatabaseConfig config = new DatabaseConfig();
+    config.setDataSource(dataSource);
+    config.loadFromProperties();
+    config.setDefaultServer(false);
+    config.setName("other");
+    config.setDdlGenerate(false);
+    config.setDdlRun(false);
+
+    return DatabaseFactory.create(config);
+  }
+
+  @Test
+  public void testBothNear() {
+    // ensure the default server exists first
+    final Database db = DB.getDefault();
+    Database other = createOther(db.getPluginApi().getDataSource());
+
+    new QPerson()
+      .name.eq("Someone")
+      .delete();
+
+    Person foo = new Person("Someone");
+    foo.save();
+
+    DB.getServerCacheManager().clearAll();
+    other.getMetaInfoManager().resetAllMetrics();
+
+    Person fooA = DB.find(Person.class, foo.getId());
+    Person fooB = other.find(Person.class, foo.getId());
+    fooA = DB.find(Person.class, foo.getId());
+    fooB = other.find(Person.class, foo.getId());
+    fooA = DB.find(Person.class, foo.getId());
+    fooB = other.find(Person.class, foo.getId());
+
+    DuelCache dualCache = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);
+    assertCounts(dualCache, 2, 1, 1, 0);
+
+  }
+
+  @Test
+  public void test() throws InterruptedException {
+
+    // ensure the default server exists first
+    final Database db = DB.getDefault();
+
+    Database other = createOther(db.getPluginApi().getDataSource());
+
+    for (int i = 0; i < 10; i++) {
+      Person foo = new Person("name " + i);
+      foo.save();
+    }
+
+    other.getServerCacheManager().clearAll();
+    other.getMetaInfoManager().resetAllMetrics();
+
+    DuelCache dualCache = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);
+
+    Person foo0 = other.find(Person.class, 1);
+    assertCounts(dualCache, 0, 1, 0, 1);
+
+    other.find(Person.class, 1);
+    assertCounts(dualCache, 1, 1, 0, 1);
+
+    other.find(Person.class, 1);
+    assertCounts(dualCache, 2, 1, 0, 1);
+
+    other.find(Person.class, 1);
+    assertCounts(dualCache, 3, 1, 0, 1);
+
+    other.find(Person.class, 2);
+    assertCounts(dualCache, 3, 2, 0, 2);
+
+
+    foo0.setName("name2");
+    foo0.save();
+    allowAsyncMessaging();
+
+    Person foo3 = other.find(Person.class, 1);
+    assertThat(foo3.getName()).isEqualTo("name2");
+    assertCounts(dualCache, 3, 3, 1, 2);
+
+
+    foo0.setName("name3");
+    foo0.save();
+    allowAsyncMessaging();
+
+    foo3 = other.find(Person.class, 1);
+    assertThat(foo3.getName()).isEqualTo("name3");
+    assertCounts(dualCache, 3, 4, 2, 2);
+  }
+
+  private void assertCounts(DuelCache dualCache, int nearHits, int nearMiss, int remoteHit, int remoteMiss) {
+
+    assertThat(dualCache.getNearHitCount()).isEqualTo(nearHits);
+    assertThat(dualCache.getNearMissCount()).isEqualTo(nearMiss);
+    assertThat(dualCache.getRemoteHitCount()).isEqualTo(remoteHit);
+    assertThat(dualCache.getRemoteMissCount()).isEqualTo(remoteMiss);
+  }
+
+  private void allowAsyncMessaging() throws InterruptedException {
+    Thread.sleep(10);
+  }
+}
diff --git a/ebean-redis/src/test/java/org/integration/IntegrationTest.java b/ebean-redis/src/test/java/org/integration/IntegrationTest.java
new file mode 100644
index 000000000..419b8d78c
--- /dev/null
+++ b/ebean-redis/src/test/java/org/integration/IntegrationTest.java
@@ -0,0 +1,107 @@
+package org.integration;
+
+import io.ebean.DB;
+import org.domain.Person;
+import org.domain.query.QPerson;
+import org.junit.Test;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class IntegrationTest {
+
+  @Test
+  public void test() throws InterruptedException {
+
+    insertSomePeople();
+
+    Person fiona = findByName("Fiona");
+    fiona.setName("Fortuna");
+    fiona.setLocalDate(LocalDate.now());
+    fiona.update();
+
+    Thread.sleep(100);
+
+    Person one = findById(1);
+    assertThat(one).isNotNull();
+
+    for (int i = 1; i < 4; i++) {
+      System.out.println("hit " + findById(i));
+    }
+
+    List<Person> one2 = nameStartsWith("fo");
+    assertThat(one2).hasSize(1);
+
+    one2 = nameStartsWith("j");
+    assertThat(one2).hasSize(2);
+
+    one2 = nameStartsWith("j");
+    assertThat(one2).hasSize(2);
+
+
+    List<Person> byNames = findByNames("Jack", "Rob");
+    assertThat(byNames).hasSize(2);
+
+    byNames = findByNames("Jack", "Rob", "Moby");
+    assertThat(byNames).hasSize(3);
+
+    fiona.setName("fo2");
+    fiona.setLocalDate(LocalDate.now());
+    fiona.update();
+
+    byNames = findByNames("Jack", "Rob", "Moby");
+    assertThat(byNames).hasSize(3);
+
+    Thread.sleep(200);
+
+    one2 = nameStartsWith("fo%");
+    System.out.println("one2 " + one2);
+    one2 = nameStartsWith("f0%");
+
+    System.out.println("one2 " + one2);
+
+    DB.getServerCacheManager().clear(Person.class);
+
+    System.out.println("done");
+  }
+
+  private List<Person> insertSomePeople() {
+
+    List<Person> people = new ArrayList<>();
+    for (String name : new String[]{"Jack", "John", "Rob", "Moby", "Fiona"}) {
+      people.add(new Person(name));
+    }
+
+    DB.saveAll(people);
+    return people;
+  }
+
+  private Person findByName(String name) {
+    return new QPerson()
+      .name.eq(name)
+      .findOne();
+  }
+
+  private List<Person> findByNames(String... names) {
+    return new QPerson()
+      .name.in(names)
+      .setUseCache(true)
+      .findList();
+  }
+
+  private Person findById(int id) {
+    return new QPerson()
+      .id.eq(id)
+      .findOne();
+  }
+
+  private List<Person> nameStartsWith(String pattern) {
+    return new QPerson()
+        .name.istartsWith(pattern)
+        .setUseQueryCache(true)
+        .findList();
+  }
+}
diff --git a/ebean-redis/src/test/resources/application-test.yaml b/ebean-redis/src/test/resources/application-test.yaml
new file mode 100644
index 000000000..870423533
--- /dev/null
+++ b/ebean-redis/src/test/resources/application-test.yaml
@@ -0,0 +1,9 @@
+ebean:
+  dumpMetricsOnShutdown: true
+  dumpMetricsOptions: sql,hash,loc
+  test:
+    redis: latest
+#    shutdown: stop # stop | remove
+    platform: h2 # h2, postgres, mysql, oracle, sqlserver, sqlite
+    ddlMode: dropCreate # none | dropCreate | create | migration | createOnly | migrationDropCreate
+    dbName: myapp
diff --git a/ebean-redis/src/test/resources/logback-test.xml b/ebean-redis/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..81299d802
--- /dev/null
+++ b/ebean-redis/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<configuration scan="true" scanPeriod="10 seconds">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>TRACE</level>
+    </filter>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+  <!--<logger name="com.avaje.ebeaninternal.server.cluster" level="TRACE"/>-->
+
+<!--  <logger name="io.ebean" 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.cache" level="TRACE"/>
+  <logger name="io.ebean.cache.QUERY" level="TRACE"/>
+  <logger name="io.ebean.cache.BEAN" level="TRACE"/>
+  <logger name="io.ebean.cache.COLL" level="TRACE"/>
+  <logger name="io.ebean.cache.NATKEY" level="TRACE"/>
+
+</configuration>
diff --git a/pom.xml b/pom.xml
index 8fe431a0c..6350ca0af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
     <module>kotlin-querybean-generator</module>
     <module>ebean-querybean</module>
     <module>ebean-postgis</module>
+    <module>ebean-redis</module>
   </modules>
 
 </project>

From 3e7db2887fd17af7a5939ba46a119cf526cfa003 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 17 Dec 2020 14:38:54 +1300
Subject: [PATCH 033/447] Add ebean-redis as module

---
 ebean-redis/pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 7c6578935..aa9174ea3 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -10,9 +10,8 @@
   </parent>
 
   <artifactId>ebean-redis</artifactId>
-  <name>ebean test</name>
-  <description>Testing support for Ebean</description>
-
+  <name>ebean redis</name>
+  <description>Ebean Redis L2 Cache</description>
 
   <dependencies>
 

From e9081a176fb942e156a2b5dcf0f69e724944c270 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 18 Dec 2020 14:14:43 +1300
Subject: [PATCH 034/447] #2133 - Spring transactions not getting ChangeLog
 changeSet as part of postCommit() processing

---
 .../io/ebeaninternal/api/SpiTransaction.java     | 11 +++++++++++
 .../ebeaninternal/api/SpiTransactionProxy.java   |  9 +++++++++
 .../transaction/ImplicitReadOnlyTransaction.java | 10 ++++++++++
 .../server/transaction/JdbcTransaction.java      | 14 ++++++++++++--
 .../server/transaction/JtaTransaction.java       | 16 +++++++---------
 .../transaction/JtaTransactionManager.java       |  8 +++-----
 .../server/transaction/NoTransaction.java        | 10 ++++++++++
 7 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 5e75831b5..0832a00b2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -318,4 +318,15 @@ public interface SpiTransaction extends Transaction {
    * Return true if explicitly set to skip cache (ignores skipOnWrite).
    */
   boolean isSkipCacheExplicit();
+
+  /**
+   * Fire post commit events and listeners.
+   */
+  void postCommit();
+
+  /**
+   * Fire post rollback events and listeners.
+   */
+  void postRollback(Throwable cause);
+
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index 897a32f44..d87b5c744 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -418,4 +418,13 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.flushBatchOnCollection();
   }
 
+  @Override
+  public void postCommit() {
+    transaction.postCommit();
+  }
+
+  @Override
+  public void postRollback(Throwable cause) {
+    transaction.postRollback(cause);
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 53d266964..b890b3b50 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -586,6 +586,16 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     }
   }
 
+  @Override
+  public void postCommit() {
+    // do nothing
+  }
+
+  @Override
+  public void postRollback(Throwable cause) {
+    // do nothing
+  }
+
   /**
    * Return true if the transaction is active.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 5f810dc17..1dbcfca67 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -985,6 +985,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     firePreCommit();
     // only performCommit can throw an exception
     performCommit();
+    postCommit();
+  }
+
+  @Override
+  public void postCommit() {
     firePostCommit();
     notifyCommit();
   }
@@ -1132,11 +1137,16 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
     } finally {
       // these will not throw an exception
-      firePostRollback();
-      notifyRollback(cause);
+      postRollback(cause);
     }
   }
 
+  @Override
+  public void postRollback(Throwable cause) {
+    firePostRollback();
+    notifyRollback(cause);
+  }
+
   /**
    * If the transaction is active then perform rollback.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java
index 811d9d1d6..e0c33a193 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java
@@ -13,9 +13,9 @@ public class JtaTransaction extends JdbcTransaction {
 
   private final UserTransaction userTransaction;
 
-  private boolean commmitted;
+  private final boolean newTransaction;
 
-  private boolean newTransaction;
+  private boolean committed;
 
   /**
    * Create the JtaTransaction.
@@ -41,7 +41,6 @@ public class JtaTransaction extends JdbcTransaction {
       if (connection.getAutoCommit()) {
         connection.setAutoCommit(false);
       }
-
     } catch (SQLException e) {
       throw new PersistenceException(e);
     }
@@ -52,7 +51,7 @@ public class JtaTransaction extends JdbcTransaction {
    */
   @Override
   public void commit() {
-    if (commmitted) {
+    if (committed) {
       throw new PersistenceException("This transaction has already been committed.");
     }
     try {
@@ -60,14 +59,14 @@ public class JtaTransaction extends JdbcTransaction {
         if (newTransaction) {
           userTransaction.commit();
         }
-        notifyCommit();
+        postCommit();
       } finally {
         close();
       }
     } catch (Exception e) {
       throw new PersistenceException(e);
     }
-    commmitted = true;
+    committed = true;
   }
 
   @Override
@@ -80,7 +79,7 @@ public class JtaTransaction extends JdbcTransaction {
    */
   @Override
   public void rollback(Throwable e) {
-    if (!commmitted) {
+    if (!committed) {
       try {
         try {
           if (userTransaction != null) {
@@ -90,7 +89,7 @@ public class JtaTransaction extends JdbcTransaction {
               userTransaction.setRollbackOnly();
             }
           }
-          notifyRollback(e);
+          postRollback(e);
         } finally {
           closeConnection();
         }
@@ -98,7 +97,6 @@ public class JtaTransaction extends JdbcTransaction {
         throw new PersistenceException(ex);
       }
     }
-
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index 3fbed7d84..6362926e8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -190,19 +190,17 @@ public class JtaTransactionManager implements ExternalTransactionManager {
 
     @Override
     public void beforeCompletion() {
-      // Future note: for JPA2 locking we will
-      // have beforeCommit events to fire
+      transaction.flush();
     }
 
     @Override
     public void afterCompletion(int status) {
-
       switch (status) {
         case Status.STATUS_COMMITTED:
           if (logger.isDebugEnabled()) {
             logger.debug("Jta Txn [" + transaction.getId() + "] committed");
           }
-          transactionManager.notifyOfCommit(transaction);
+          transaction.postCommit();
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;
@@ -211,7 +209,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
           if (logger.isDebugEnabled()) {
             logger.debug("Jta Txn [" + transaction.getId() + "] rollback");
           }
-          transactionManager.notifyOfRollback(transaction, null);
+          transaction.postRollback(null);
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 48476c14a..901b0faf0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -88,6 +88,16 @@ class NoTransaction implements SpiTransaction {
     // do nothing
   }
 
+  @Override
+  public void postCommit() {
+    // do nothing
+  }
+
+  @Override
+  public void postRollback(Throwable cause) {
+    // do nothing
+  }
+
   @Override
   public String getLogPrefix() {
     return null;

From 1bdc6d8f7f93c39610cef9d47e93f720d5a0a95a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 18 Dec 2020 14:54:44 +1300
Subject: [PATCH 035/447] #2134 - Modify ChangeLog to send the last set of
 changes Pre Commit (rather than post commit). Expose this for spring
 transactions.

---
 .../io/ebeaninternal/api/SpiTransaction.java  |  5 +++
 .../api/SpiTransactionProxy.java              |  5 +++
 .../ImplicitReadOnlyTransaction.java          |  5 +++
 .../server/transaction/JdbcTransaction.java   | 13 +++++--
 .../transaction/JtaTransactionManager.java    |  2 +-
 .../server/transaction/NoTransaction.java     |  5 +++
 .../server/transaction/TChangeLogHolder.java  | 21 +++++++---
 .../org/tests/changelog/TestChangeLog.java    | 38 ++++++++++++-------
 8 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 0832a00b2..74faeccb0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -319,6 +319,11 @@ public interface SpiTransaction extends Transaction {
    */
   boolean isSkipCacheExplicit();
 
+  /**
+   * Fire pre commit processing/listeners.
+   */
+  void preCommit();
+
   /**
    * Fire post commit events and listeners.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index d87b5c744..fe5351ddc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -418,6 +418,11 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.flushBatchOnCollection();
   }
 
+  @Override
+  public void preCommit() {
+    transaction.preCommit();
+  }
+
   @Override
   public void postCommit() {
     transaction.postCommit();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index b890b3b50..79bf85335 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -586,6 +586,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     }
   }
 
+  @Override
+  public void preCommit() {
+    // do nothing
+  }
+
   @Override
   public void postCommit() {
     // do nothing
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 1dbcfca67..8c1897ff5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -373,6 +373,9 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   private void firePreCommit() {
     withEachCallback(TransactionCallback::preCommit);
+    if (changeLogHolder != null) {
+      changeLogHolder.preCommit();
+    }
   }
 
   private void firePostCommit() {
@@ -981,9 +984,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Batch flush, jdbc commit, trigger registered TransactionCallbacks, notify l2 cache etc.
    */
   private void flushCommitAndNotify() throws SQLException {
-    internalBatchFlush();
-    firePreCommit();
-    // only performCommit can throw an exception
+    preCommit();
     performCommit();
     postCommit();
   }
@@ -994,6 +995,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     notifyCommit();
   }
 
+  @Override
+  public void preCommit() {
+    internalBatchFlush();
+    firePreCommit();
+  }
+
   /**
    * Perform a commit, fire callbacks and notify l2 cache etc.
    * <p>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index 6362926e8..cc9e8cdc8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -190,7 +190,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
 
     @Override
     public void beforeCompletion() {
-      transaction.flush();
+      transaction.preCommit();
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 901b0faf0..2ef3f2058 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -88,6 +88,11 @@ class NoTransaction implements SpiTransaction {
     // do nothing
   }
 
+  @Override
+  public void preCommit() {
+    // do nothing
+  }
+
   @Override
   public void postCommit() {
     // do nothing
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
index b97a004ea..961247bd9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
@@ -56,20 +56,31 @@ public class TChangeLogHolder {
    * Add a bean change to the change set.
    */
   public void addBeanChange(BeanChange change) {
-
     changes.addBeanChange(change);
     if (++count >= batchSize) {
       // we hit the batch size so send what we have knowing
       // that the transaction has not completed yet and
       // reset the changes and count
-      owner.sendChangeLog(changes);
-      changes = new ChangeSet(transactionId, ++batchId);
-      count = 0;
+      sendChanges();
     }
   }
 
+  private void sendChanges() {
+    owner.sendChangeLog(changes);
+    changes = new ChangeSet(transactionId, ++batchId);
+    count = 0;
+  }
+
   /**
-   * On post commit send the changes we have collected.
+   * Send the changes held prior to transaction commit.
+   */
+  public void preCommit() {
+    sendChanges();
+  }
+
+  /**
+   * On post commit send the changes we have collected. This should be
+   * only the COMMITTED state and with all changes sent prior to commit.
    */
   public void postCommit() {
     changes.setTxnState(TxnState.COMMITTED);
diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
index 7c1d3040c..2adbbfc4b 100644
--- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -15,11 +15,15 @@ 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.ebean.event.changelog.TxnState;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.tests.model.basic.EBasicChangeLog;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
@@ -43,6 +47,13 @@ public class TestChangeLog extends BaseTestCase {
     server.shutdown();
   }
 
+  private BeanChange firstChange() {
+    ChangeSet changeSet0 = changeLogListener.changes.get(0);
+    BeanChange change = changeSet0.getChanges().get(0);
+    changeLogListener.changes.clear();
+    return change;
+  }
+
   @Test
   public void test() {
 
@@ -50,8 +61,13 @@ public class TestChangeLog extends BaseTestCase {
     bean.setName("logBean");
     bean.setShortDescription("hello");
     server.save(bean);
-    BeanChange change = changeLogListener.changes.getChanges().get(0);
 
+    final List<ChangeSet> allChanges = changeLogListener.changes;
+    assertThat(allChanges).hasSize(2);
+    assertThat(allChanges.get(0).getTxnState()).isEqualTo(TxnState.IN_PROGRESS);
+    assertThat(allChanges.get(1).getTxnState()).isEqualTo(TxnState.COMMITTED);
+
+    BeanChange change = firstChange();
     assertThat(change.getEvent()).isEqualTo(ChangeType.INSERT);
     assertThat(change.getData())
       .contains("\"name\":\"logBean\"")
@@ -61,8 +77,7 @@ public class TestChangeLog extends BaseTestCase {
     bean.setName("ChangedName");
     server.save(bean);
 
-    change = changeLogListener.changes.getChanges().get(0);
-
+    change = firstChange();
     assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE);
     assertThat(change.getOldData()).contains("\"name\":\"logBean\"");
     assertThat(change.getData()).contains("\"name\":\"ChangedName\"");
@@ -70,14 +85,11 @@ public class TestChangeLog extends BaseTestCase {
 
     server.delete(bean);
 
-    change = changeLogListener.changes.getChanges().get(0);
-
+    change = firstChange();
     assertThat(change.getEvent()).isEqualTo(ChangeType.DELETE);
     assertThat(change.getData()).isNull();
-
   }
 
-
   @Test
   public void testWithNull() {
 
@@ -85,7 +97,7 @@ public class TestChangeLog extends BaseTestCase {
     bean.setName(null);
     bean.setShortDescription("hello");
     server.save(bean);
-    BeanChange change = changeLogListener.changes.getChanges().get(0);
+    BeanChange change = firstChange();
 
     assertThat(change.getEvent()).isEqualTo(ChangeType.INSERT);
     assertThat(change.getData())
@@ -99,7 +111,7 @@ public class TestChangeLog extends BaseTestCase {
     bean.setShortDescription("hello");
     server.save(bean);
 
-    change = changeLogListener.changes.getChanges().get(0);
+    change = firstChange();
 
     assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE);
     assertThat(change.getOldData())
@@ -113,11 +125,10 @@ public class TestChangeLog extends BaseTestCase {
 
     server.delete(bean);
 
-    change = changeLogListener.changes.getChanges().get(0);
+    change = firstChange();
 
     assertThat(change.getEvent()).isEqualTo(ChangeType.DELETE);
     assertThat(change.getData()).isNull();
-
   }
 
   private Database createServer() {
@@ -153,16 +164,15 @@ public class TestChangeLog extends BaseTestCase {
 
     ObjectMapper objectMapper = new ObjectMapper();
 
-    ChangeSet changes;
+    List<ChangeSet> changes = new ArrayList<>();
 
     public TDChangeLogListener() {
       objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     }
 
-
     @Override
     public void log(ChangeSet changes) {
-      this.changes = changes;
+      this.changes.add(changes);
       try {
         String json = objectMapper.writeValueAsString(changes);
         ChangeSet changes1 = objectMapper.readValue(json, ChangeSet.class);

From a674d0d696d665d72b8edfec76bdece1b8410166 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 18 Dec 2020 15:03:53 +1300
Subject: [PATCH 036/447] [maven-release-plugin] prepare release
 ebean-parent-12.6.3

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 24 ++++++++++++------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 16 +++++++---------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 835ad6fd0..7c16a5fac 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 8a91fcfcf..18bf3b8cd 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.3</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 36cdaebbe..838745611 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,69 +81,69 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.3-SNAPSHOT</version>
+        <version>12.6.3</version>
         <scope>test</scope>
       </dependency>
 
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 0a36cb1df..53fe5be9e 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 16dd68ca8..9c9d39984 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.3</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 2fba2592a..313d7cbdd 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 39af134ba..6f3e1ad9c 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index eae430ad9..b80078e1c 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.3</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index a9342c4ad..d5d727cda 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index d674ab88b..4eda1870c 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.3</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index aa9174ea3..c96f0323e 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -24,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 6fa3751dc..370540dbf 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.3</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index d1a1785ac..fbbab1a37 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index d9318b392..8642e11d5 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3-SNAPSHOT</version>
+      <version>12.6.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 6350ca0af..202f9bb0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.3-SNAPSHOT</version>
+  <version>12.6.3</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.3</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index f7a288d4a..68e17bbb7 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3-SNAPSHOT</version>
+    <version>12.6.3</version>
   </parent>
 
   <name>querybean generator</name>

From 573e1b553cdc73490c33fbb0b5bcc5c5a52b8bf5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 18 Dec 2020 15:04:05 +1300
Subject: [PATCH 037/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 24 ++++++++++++------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 7c16a5fac..8e64b12fc 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 18bf3b8cd..95eac64ee 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 838745611..8fc89b69c 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,69 +81,69 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.3</version>
+        <version>12.6.4-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 53fe5be9e..94abe76e8 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 9c9d39984..94223d0cf 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 313d7cbdd..bee92b994 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 6f3e1ad9c..08ffd9c8b 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index b80078e1c..107bde2dc 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index d5d727cda..cb4eb6f77 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 4eda1870c..8efe9330f 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index c96f0323e..95e79de19 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 370540dbf..992aff7fa 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index fbbab1a37..a7fc58de9 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 8642e11d5..dca243195 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.3</version>
+      <version>12.6.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 202f9bb0b..df6bf9f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.3</version>
+  <version>12.6.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 68e17bbb7..9d6d04a55 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.3</version>
+    <version>12.6.4-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From e98ff952bf8b2e62e261040e97f5b281925d1da1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Dec 2020 14:11:28 +1300
Subject: [PATCH 038/447] #2137 - Expected Transaction flush on SqlQuery and
 DtoQuery not occurring

---
 .../server/core/AbstractSqlQueryRequest.java  |  6 +++
 .../server/core/DtoQueryRequest.java          |  3 ++
 .../server/core/RelationalQueryRequest.java   |  8 ++++
 .../batchinsert/TestBatchInsertFlush.java     | 37 +++++++++++++++++++
 4 files changed, 54 insertions(+)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 606d51b40..a8a31d8d6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -73,6 +73,12 @@ public abstract class AbstractSqlQueryRequest {
     }
   }
 
+  protected void flushJdbcBatchOnQuery() {
+    if (trans.isFlushOnQuery()) {
+      trans.flush();
+    }
+  }
+
   public EbeanServer getServer() {
     return server;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 24746bf2a..7f581ebc1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -88,14 +88,17 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
   }
 
   public void findEach(Consumer<T> consumer) {
+    flushJdbcBatchOnQuery();
     queryEngine.findEach(this, consumer);
   }
 
   public void findEachWhile(Predicate<T> consumer) {
+    flushJdbcBatchOnQuery();
     queryEngine.findEachWhile(this, consumer);
   }
 
   public List<T> findList() {
+    flushJdbcBatchOnQuery();
     return queryEngine.findList(this);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index a693cf15f..54f42ec87 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -56,35 +56,43 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
   }
 
   boolean findEachRow(RowConsumer mapper) {
+    flushJdbcBatchOnQuery();
     queryEngine.findEachRow(this, mapper);
     return true;
   }
 
   <T> List<T> findListMapper(RowMapper<T> mapper) {
+    flushJdbcBatchOnQuery();
     return queryEngine.findListMapper(this, mapper);
   }
 
   <T> T findOneMapper(RowMapper<T> mapper) {
+    flushJdbcBatchOnQuery();
     return queryEngine.findOneMapper(this, mapper);
   }
 
   public <T> List<T> findSingleAttributeList(Class<T> cls) {
+    flushJdbcBatchOnQuery();
     return queryEngine.findSingleAttributeList(this, cls);
   }
 
   public <T> T findSingleAttribute(Class<T> cls) {
+    flushJdbcBatchOnQuery();
     return queryEngine.findSingleAttribute(this, cls);
   }
 
   public void findEach(Consumer<SqlRow> consumer) {
+    flushJdbcBatchOnQuery();
     queryEngine.findEach(this, consumer);
   }
 
   public void findEachWhile(Predicate<SqlRow> consumer) {
+    flushJdbcBatchOnQuery();
     queryEngine.findEach(this, consumer);
   }
 
   public List<SqlRow> findList() {
+    flushJdbcBatchOnQuery();
     return queryEngine.findList(this);
   }
 
diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index dc04e0b79..6e956510a 100644
--- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -1,6 +1,8 @@
 package org.tests.batchinsert;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.DtoQuery2Test;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
@@ -105,6 +107,41 @@ public class TestBatchInsertFlush extends BaseTestCase {
     assertSql(sql.get(0)).contains("select count(*)");
   }
 
+  @Test
+  @Transactional(batchSize = 20)
+  public void transactional_flushOnSqlQuery() {
+
+    LoggedSqlCollector.start();
+
+    DB.save(new EBasicVer("b1"));
+    DB.save(new EBasicVer("b2"));
+
+    // trigger JDBC batch by default
+    DB.sqlQuery("select count(*) from e_basicver")
+      .mapToScalar(Integer.class)
+      .findOne();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertSql(sql.get(0)).contains("insert into e_basicver");
+  }
+
+  @Test
+  @Transactional(batchSize = 20)
+  public void transactional_flushOnDtoQuery() {
+
+    LoggedSqlCollector.start();
+
+    DB.save(new EBasicVer("b1"));
+    DB.save(new EBasicVer("b2"));
+
+    // trigger JDBC batch by default
+    DB.findDto(DtoQuery2Test.DCust.class, "select id, name from o_customer")
+    .findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertSql(sql.get(0)).contains("insert into e_basicver");
+  }
+
   @Test
   @Transactional(batch = PersistBatch.ALL)
   public void transactional_flushOnQuery() {

From f22a3221040ccc80cff70dbef5fc435c7b5510c8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Dec 2020 14:18:13 +1300
Subject: [PATCH 039/447] No effective change - Refactor tidy
 AbstractSqlQueryRequest after #2137

- Rename trans to transaction
- Tidy whitespace
---
 .../server/core/AbstractSqlQueryRequest.java  | 38 ++++++-------------
 .../server/core/DtoQueryRequest.java          |  2 +-
 .../server/core/RelationalQueryRequest.java   |  9 +----
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index a8a31d8d6..c12534146 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -27,7 +27,7 @@ public abstract class AbstractSqlQueryRequest {
 
   protected final SpiEbeanServer server;
 
-  protected SpiTransaction trans;
+  protected SpiTransaction transaction;
 
   private boolean createdTransaction;
 
@@ -47,18 +47,18 @@ public abstract class AbstractSqlQueryRequest {
   AbstractSqlQueryRequest(SpiEbeanServer server, SpiSqlBinding query, Transaction t) {
     this.server = server;
     this.query = query;
-    this.trans = (SpiTransaction) t;
+    this.transaction = (SpiTransaction) t;
   }
 
   /**
    * Create a transaction if none currently exists.
    */
   public void initTransIfRequired() {
-    if (trans == null) {
-      trans = server.currentServerTransaction();
-      if (trans == null || !trans.isActive()) {
+    if (transaction == null) {
+      transaction = server.currentServerTransaction();
+      if (transaction == null || !transaction.isActive()) {
         // create a local readOnly transaction
-        trans = server.createReadOnlyTransaction(null);
+        transaction = server.createReadOnlyTransaction(null);
         createdTransaction = true;
       }
     }
@@ -69,26 +69,18 @@ public abstract class AbstractSqlQueryRequest {
    */
   public void endTransIfRequired() {
     if (createdTransaction) {
-      trans.commit();
+      transaction.commit();
     }
   }
 
   protected void flushJdbcBatchOnQuery() {
-    if (trans.isFlushOnQuery()) {
-      trans.flush();
+    if (transaction.isFlushOnQuery()) {
+      transaction.flush();
     }
   }
 
-  public EbeanServer getServer() {
-    return server;
-  }
-
-  public SpiTransaction getTransaction() {
-    return trans;
-  }
-
   public boolean isLogSql() {
-    return trans.isLogSql();
+    return transaction.isLogSql();
   }
 
   /**
@@ -126,7 +118,6 @@ public abstract class AbstractSqlQueryRequest {
    * Prepare the SQL taking into account named bind parameters.
    */
   private void prepareSql() {
-
     String sql = query.getQuery();
     BindParams bindParams = query.getBindParams();
     if (!bindParams.isEmpty()) {
@@ -137,7 +128,6 @@ public abstract class AbstractSqlQueryRequest {
   }
 
   private String limitOffset(String sql) {
-
     int firstRow = query.getFirstRow();
     int maxRows = query.getMaxRows();
     if (firstRow > 0 || maxRows > 0) {
@@ -155,10 +145,8 @@ public abstract class AbstractSqlQueryRequest {
   }
 
   protected void executeAsSql(Binder binder) throws SQLException {
-
     prepareSql();
-    Connection conn = trans.getInternalConnection();
-
+    Connection conn = transaction.getInternalConnection();
     pstmt = conn.prepareStatement(sql);
     if (query.getTimeout() > 0) {
       pstmt.setQueryTimeout(query.getTimeout());
@@ -166,14 +154,12 @@ public abstract class AbstractSqlQueryRequest {
     if (query.getBufferFetchSizeHint() > 0) {
       pstmt.setFetchSize(query.getBufferFetchSizeHint());
     }
-
     BindParams bindParams = query.getBindParams();
     if (!bindParams.isEmpty()) {
       this.bindLog = binder.bind(bindParams, pstmt, conn);
     }
-
     if (isLogSql()) {
-      trans.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ")"));
+      transaction.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ")"));
     }
 
     setResultSet(pstmt.executeQuery(), null);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 7f581ebc1..0dd1857c3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -50,7 +50,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
       ormQuery.setManualId();
 
       // execute the underlying ORM query returning the ResultSet
-      SpiResultSet result = server.findResultSet(ormQuery, trans);
+      SpiResultSet result = server.findResultSet(ormQuery, transaction);
       this.pstmt = result.getStatement();
       this.sql = ormQuery.getGeneratedSql();
       setResultSet(result.getResultSet(), ormQuery.getQueryPlanKey());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 54f42ec87..7850139c7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -100,9 +100,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
    * Build the list of property names.
    */
   private String[] getPropertyNames() throws SQLException {
-
     ResultSetMetaData metaData = resultSet.getMetaData();
-
     int columnsPlusOne = metaData.getColumnCount() + 1;
     ArrayList<String> propNames = new ArrayList<>(columnsPlusOne - 1);
     for (int i = 1; i < columnsPlusOne; i++) {
@@ -115,9 +113,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
    * Read and return the next SqlRow.
    */
   public SqlRow createNewRow() throws SQLException {
-
     rows++;
-
     SqlRow sqlRow = queryEngine.createSqlRow(estimateCapacity);
     int index = 0;
     for (String propertyName : propertyNames) {
@@ -129,9 +125,9 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
   }
 
   public void logSummary() {
-    if (trans.isLogSummary()) {
+    if (transaction.isLogSummary()) {
       long micros = (System.nanoTime() - startNano) / 1000L;
-      trans.logSummary("SqlQuery  rows[" + rows + "] micros[" + micros + "] bind[" + bindLog + "]");
+      transaction.logSummary("SqlQuery  rows[" + rows + "] micros[" + micros + "] bind[" + bindLog + "]");
     }
   }
 
@@ -144,7 +140,6 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
   }
 
   public <T> List<T> mapList(RowMapper<T> mapper) throws SQLException {
-
     List<T> list = new ArrayList<>();
     while (next()) {
       list.add(mapper.map(resultSet, rows++));

From 400ae3cf4bbdf387d49fcbd58458e950e60c42a4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Dec 2020 14:58:04 +1300
Subject: [PATCH 040/447] #2138 - Mark Transaction.flushBatch() as deprecated -
 migrate to flush();

---
 .../src/main/java/io/ebean/Transaction.java      |  4 ++--
 .../server/core/PersistRequestBean.java          |  2 +-
 .../server/persist/MergeNodeAssocManyToMany.java |  4 ++--
 .../server/query/DefaultOrmQueryEngine.java      |  2 +-
 .../org/tests/insert/TestInsertDuplicateKey.java |  4 ++--
 .../xtra/TestInsertBatchThenFlushThenUpdate.java |  2 +-
 .../tests/transaction/TestSqlServerBatch.java    | 16 ++++++++--------
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java
index b2bce9abf..d4918e84e 100644
--- a/ebean-api/src/main/java/io/ebean/Transaction.java
+++ b/ebean-api/src/main/java/io/ebean/Transaction.java
@@ -519,11 +519,11 @@ public interface Transaction extends AutoCloseable {
   void flush() throws PersistenceException;
 
   /**
-   * This is a synonym for flush() and will be deprecated.
+   * Deprecated - migrate to flush().
    * <p>
    * flush() is preferred as it matches the JPA flush() method.
-   * </p>
    */
+  @Deprecated
   void flushBatch() throws PersistenceException;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 3311ad866..eb48fc2ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -388,7 +388,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   @Override
   public void preGetterTrigger(int propertyIndex) {
     if (flushBatchOnGetter(propertyIndex)) {
-      transaction.flushBatch();
+      transaction.flush();
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
index 4516cefd4..7fd74e8a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
@@ -56,7 +56,7 @@ class MergeNodeAssocManyToMany extends MergeNode {
     IntersectionTable intersectionTable = many.intersectionTable();
 
     if (!deletions.isEmpty()) {
-      transaction.flushBatch();
+      transaction.flush();
 
       SqlUpdate delete = intersectionTable.delete(server, false);
       for (EntityBean deletion : deletions) {
@@ -67,7 +67,7 @@ class MergeNodeAssocManyToMany extends MergeNode {
     }
 
     if (!additions.isEmpty()) {
-      transaction.flushBatch();
+      transaction.flush();
 
       SqlUpdate insert = intersectionTable.insert(server, false);
       for (EntityBean addition : additions) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
index 1c59a614e..b112c7986 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
@@ -58,7 +58,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
       // before we perform a query, we need to flush any
       // previous persist requests that are queued/batched.
       // The query may read data affected by those requests.
-      t.flushBatch();
+      t.flush();
     }
   }
 
diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
index 06edab471..0c728eaa3 100644
--- a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
+++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
@@ -24,7 +24,7 @@ public class TestInsertDuplicateKey extends BaseTestCase {
   public void clearDb() {
     server().find(Document.class).asDraft().where().contains("title", "UniqueKey").delete();
   }
-  
+
   @Test(expected = DuplicateKeyException.class)
   public void insert_duplicateKey() {
 
@@ -89,7 +89,7 @@ public class TestInsertDuplicateKey extends BaseTestCase {
       doc2.save();
 
       // flush at this point, fails
-      Ebean.getDefaultServer().currentTransaction().flushBatch();
+      Ebean.getDefaultServer().currentTransaction().flush();
     } catch (DuplicateKeyException e) {
       log.info("duplicate failed but just continue" + e.getMessage());
       try {
diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
index 6fe2e0d18..f42b1c2b7 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
@@ -40,7 +40,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
       // nothing flushed yet
       assertThat(LoggedSqlCollector.start()).isEmpty();
 
-      txn.flushBatch();
+      txn.flush();
 
       List<String> loggedSql1 = LoggedSqlCollector.start();
       assertThat(loggedSql1).hasSize(4);
diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java
index b6c1c7658..019193413 100644
--- a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java
+++ b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java
@@ -11,7 +11,7 @@ import org.tests.model.basic.ESimple;
 /**
  * This test tests a strange bug in the 6.2.0. sqlserver JDBC driver.
  * (Version 6.1.7.jre8-preview works)
- *
+ * <p>
  * https://github.com/Microsoft/mssql-jdbc/pull/374
  *
  * @author Roland Praml, FOCONIS AG
@@ -29,7 +29,7 @@ public class TestSqlServerBatch extends BaseTestCase {
 
       for (int i = 0; i < 10; i++) {
         ESimple model = new ESimple();
-        model.setName("baz "+i);
+        model.setName("baz " + i);
         Ebean.save(model);
       }
 
@@ -56,13 +56,13 @@ public class TestSqlServerBatch extends BaseTestCase {
       txn.setGetGeneratedKeys(false);
 
       // explicitly flush the JDBC batch buffer
-      txn.flushBatch();
+      txn.flush();
 
-        for (int i = 0; i < 10; i++) {
-          ESimple model = new ESimple();
-          model.setName(i % 2 == 0 ? null:"foobar");
-          Ebean.save(model);
-        }
+      for (int i = 0; i < 10; i++) {
+        ESimple model = new ESimple();
+        model.setName(i % 2 == 0 ? null : "foobar");
+        Ebean.save(model);
+      }
 
       // do not commit
     } finally {

From 6b2c48d4f68ea1b059b3ff148695b2d9849a60c4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 21 Dec 2020 16:40:19 +1300
Subject: [PATCH 041/447] #2135 - ebean doest not support Spring
 @Transactional(propagation = Propagation.REQUIRES_NEW)

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

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 5a2c6c4b1..e42ce2fe3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -634,7 +634,7 @@ public class TransactionManager implements SpiTransactionManager {
   public ScopedTransaction externalBeginTransaction(SpiTransaction transaction, TxScope txScope) {
     ScopedTransaction scopedTxn = new ScopedTransaction(scopeManager);
     scopedTxn.push(new ScopeTrans(rollbackOnChecked, false, transaction, txScope));
-    scopeManager.set(scopedTxn);
+    scopeManager.replace(scopedTxn);
     return scopedTxn;
   }
 

From fc1c9392aa1eae6bbcedafe582b11eba197fc8e9 Mon Sep 17 00:00:00 2001
From: Tobias <tobias@olsson.be>
Date: Mon, 21 Dec 2020 15:32:40 +0100
Subject: [PATCH 042/447] Failing testcase that shows wipe of all children on
 save

When adding a newly saved bean (A) to another bean (B), all children
in A are wiped on saving B.
---
 .../tests/cascade/TestOnlyKillOrphans.java    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java

diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java
new file mode 100644
index 000000000..3a510637c
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java
@@ -0,0 +1,43 @@
+package org.tests.cascade;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOnlyKillOrphans extends BaseTestCase {
+
+  @Test
+  public void test() {
+    final COOne one = setup();
+
+    assertThat(one.getChildren()).hasSize(2);
+
+    CORoot root = new CORoot("P1", one);
+    DB.insert(root);
+
+    // assert
+    CORoot check = DB.find(CORoot.class, root.getId());
+    assertThat(check.getOne().getChildren()).hasSize(2);
+    DB.delete(check);
+  }
+
+  private COOne setup() {
+    COOne one = new COOne("P0");
+    one.setChildren(createManies("M1", "M2"));
+    DB.insert(one);
+    return one;
+  }
+
+  private List<COOneMany> createManies(String... names) {
+    List<COOneMany> manies = new ArrayList<>();
+    for (String name : names) {
+      manies.add(new COOneMany(name));
+    }
+    return manies;
+  }
+}

From 583e10f5c6b0a222153eb1f2607cfd98137cb15e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Dec 2020 15:49:37 +1300
Subject: [PATCH 043/447] #2139 - Fix for - Failing testcase that shows wipe of
 all children on save (related to #2127)

---
 .../server/persist/SaveManyBeans.java          | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 114aa232e..70131db88 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -37,7 +37,7 @@ public class SaveManyBeans extends SaveManyBase {
   private final boolean saveRecurseSkippable;
   private final DeleteMode deleteMode;
   private final boolean untouchedBeanCollection;
-  private Collection<?> collection;
+  private final Collection<?> collection;
   private int sortOrder;
 
   SaveManyBeans(DefaultPersister persister, boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
@@ -49,6 +49,7 @@ public class SaveManyBeans extends SaveManyBase {
     this.saveRecurseSkippable = many.isSaveRecurseSkippable();
     this.deleteMode = targetDescriptor.isSoftDelete() ? DeleteMode.SOFT : DeleteMode.HARD;
     this.untouchedBeanCollection = untouchedBeanCollection();
+    this.collection = cascade ? BeanCollectionUtil.getActualEntries(value) : null;
   }
 
   /**
@@ -108,7 +109,6 @@ public class SaveManyBeans extends SaveManyBase {
   private void saveAssocManyDetails() {
     // 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();
     }
@@ -210,6 +210,18 @@ public class SaveManyBeans extends SaveManyBase {
     return true;
   }
 
+  private boolean hasNewOrDirtyBeans() {
+    if (collection == null) {
+      return false;
+    }
+    for (Object bean : collection) {
+      if (bean instanceof EntityBean && ((EntityBean) bean)._ebean_getIntercept().isNewOrDirty()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * Collect the Id values of the details to remove 'missing children' for stateless updates.
    */
@@ -337,7 +349,7 @@ public class SaveManyBeans extends SaveManyBase {
       return;
     }
     if (!(value instanceof BeanCollection<?>)) {
-      if (!insertedParent) {
+      if (!insertedParent && cascade && hasNewOrDirtyBeans()) {
         persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0);
       }
     } else {

From 5435055f5ca058f4a25677e7324a10e6262c8c0c Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Dec 2020 16:08:59 +1300
Subject: [PATCH 044/447] Add ebean-redis, ebean-postgis and ebean-core-type to
 ebean-bom

---
 ebean-bom/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 8fc89b69c..599ced1da 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -96,6 +96,12 @@
         <version>12.6.4-SNAPSHOT</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-core-type</artifactId>
+        <version>12.6.4-SNAPSHOT</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
@@ -147,6 +153,18 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgis</artifactId>
+        <version>12.6.4-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-redis</artifactId>
+        <version>12.6.4-SNAPSHOT</version>
+      </dependency>
+
     </dependencies>
 
   </dependencyManagement>

From 53386e9bf414e38661f92eefce68393173dc1dd2 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 22 Dec 2020 16:12:20 +1300
Subject: [PATCH 045/447] Update ebean-core-type name and description only

---
 ebean-core-type/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 94abe76e8..ef591ce69 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -8,6 +8,8 @@
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
+  <name>ebean core type</name>
+  <description>ebean scalar types api</description>
 
   <properties>
     <jackson-core.version>2.11.3</jackson-core.version>

From fe874c946db04afeca4ecf3a800fa5e4e3b14881 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Dec 2020 20:22:50 +1300
Subject: [PATCH 046/447] #2140 - Bump ebean-migration dependency of
 ebean-ddl-generator to 12.4.0 (update ebean-test)

---
 ebean-core/pom.xml                            |  2 +-
 ebean-ddl-generator/pom.xml                   |  2 +-
 ebean-test/pom.xml                            |  2 +-
 .../src/main/java/io/ebean/test/DbJson.java   |  1 -
 .../src/main/java/io/ebean/test/IOUtils.java  | 62 +++++++++++++++++++
 5 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 ebean-test/src/main/java/io/ebean/test/IOUtils.java

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 94223d0cf..d1c6bb031 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>12.2.0</version>
+      <version>12.4.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index bee92b994..1d94dbab8 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>12.2.0</version>
+      <version>12.4.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 992aff7fa..f9d1e012d 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.12</version>
+      <version>42.2.18</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/src/main/java/io/ebean/test/DbJson.java b/ebean-test/src/main/java/io/ebean/test/DbJson.java
index b7fae39bb..79de39099 100644
--- a/ebean-test/src/main/java/io/ebean/test/DbJson.java
+++ b/ebean-test/src/main/java/io/ebean/test/DbJson.java
@@ -1,7 +1,6 @@
 package io.ebean.test;
 
 import io.ebean.DB;
-import io.ebean.migration.util.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/ebean-test/src/main/java/io/ebean/test/IOUtils.java b/ebean-test/src/main/java/io/ebean/test/IOUtils.java
new file mode 100644
index 000000000..79b706706
--- /dev/null
+++ b/ebean-test/src/main/java/io/ebean/test/IOUtils.java
@@ -0,0 +1,62 @@
+package io.ebean.test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Utilities for IO.
+ */
+class IOUtils {
+
+  /**
+   * Reads the entire contents of the specified input stream and return them as UTF-8 string.
+   */
+  static String readUtf8(InputStream in) throws IOException {
+    return bytesToUtf8(read(in));
+  }
+
+  /**
+   * Reads the entire contents of the specified input stream and returns them as a byte array.
+   */
+  private static byte[] read(InputStream in) throws IOException {
+    ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+    pump(in, buffer);
+    return buffer.toByteArray();
+  }
+
+  /**
+   * Returns the UTF-8 string corresponding to the specified bytes.
+   */
+  private static String bytesToUtf8(byte[] data) {
+    return new String(data, StandardCharsets.UTF_8);
+  }
+
+  /**
+   * 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.
+   */
+  private 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 98b4ac50294329b49ce352bbd4ce3f0332f2f12e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Dec 2020 20:25:22 +1300
Subject: [PATCH 047/447] [maven-release-plugin] prepare release
 ebean-parent-12.6.4

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 8e64b12fc..2eed1b384 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 95eac64ee..417821d82 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.4</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 599ced1da..8a9f84166 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.4-SNAPSHOT</version>
+        <version>12.6.4</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index ef591ce69..d645724ee 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index d1c6bb031..5ae15240e 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.4</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 1d94dbab8..8ee261f20 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 08ffd9c8b..6c4189c1c 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 107bde2dc..71f705039 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.4</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index cb4eb6f77..84380e6e7 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 8efe9330f..1f6aca527 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.4</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 95e79de19..06b24a140 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index f9d1e012d..a7ca340d3 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.4</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index a7fc58de9..d3d1f3aac 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index dca243195..be206db85 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4-SNAPSHOT</version>
+      <version>12.6.4</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index df6bf9f04..a3f2dd2c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.4-SNAPSHOT</version>
+  <version>12.6.4</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.4</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 9d6d04a55..4d9aba79b 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4-SNAPSHOT</version>
+    <version>12.6.4</version>
   </parent>
 
   <name>querybean generator</name>

From 35a721039d93451624480ea212e1efe7637d44e3 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Dec 2020 20:25:47 +1300
Subject: [PATCH 048/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 2eed1b384..93f96505e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 417821d82..4be25a18d 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 8a9f84166..cfcfc2c7a 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.4</version>
+        <version>12.6.5-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index d645724ee..67f7dd439 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 5ae15240e..34bbf572c 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 8ee261f20..5094c8a07 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 6c4189c1c..ec760e5ce 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 71f705039..91c95fb6c 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 84380e6e7..fa0b76c37 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 1f6aca527..776a1e7e3 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 06b24a140..ee7ae7cbf 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index a7ca340d3..06ca2ac55 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index d3d1f3aac..808c06279 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index be206db85..f4de4cc1d 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.4</version>
+      <version>12.6.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index a3f2dd2c0..bb356e9f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.4</version>
+  <version>12.6.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 4d9aba79b..79faf918c 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.4</version>
+    <version>12.6.5-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 69e56be459376e7fb3cd6a1bea08b3664409e6b5 Mon Sep 17 00:00:00 2001
From: Tobias <tobias@olsson.be>
Date: Mon, 28 Dec 2020 15:35:15 +0100
Subject: [PATCH 049/447] Failing testcase that shows wipe of all old children
 on save

When adding a child to a newly saved bean (A), all other children are
killed on save of A.
---
 .../tests/cascade/TestOnlyKillOrphans.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java
index 3a510637c..8da56d1b1 100644
--- a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java
+++ b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java
@@ -6,6 +6,8 @@ import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,6 +28,23 @@ public class TestOnlyKillOrphans extends BaseTestCase {
     DB.delete(check);
   }
 
+  @Test
+  public void test2() {
+    final COOne one = setup();
+
+    assertThat(one.getChildren()).hasSize(2);
+
+    one.getChildren().add(new COOneMany("_M1"));
+
+    DB.save(one);
+
+    // assert
+    COOne check = DB.find(COOne.class, one.getId());
+    assertThat(check.getChildren().stream().map(it -> it.getName()).sorted().collect(Collectors.toList()))
+      .isEqualTo(Stream.of("M1", "M2", "_M1").sorted().collect(Collectors.toList()));
+    DB.delete(check);
+  }
+
   private COOne setup() {
     COOne one = new COOne("P0");
     one.setChildren(createManies("M1", "M2"));

From d8f4503d98138bc61c87eade9091e4bad92589c7 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Jan 2021 17:56:55 +1300
Subject: [PATCH 050/447] #2141 - Fix for failing test, revert of fix for #2127

---
 .../java/io/ebeaninternal/server/persist/SaveManyBeans.java | 6 +++---
 .../test/java/org/tests/cascade/TestDeleteO2MOrphans.java   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 70131db88..183956ef8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -349,9 +349,9 @@ public class SaveManyBeans extends SaveManyBase {
       return;
     }
     if (!(value instanceof BeanCollection<?>)) {
-      if (!insertedParent && cascade && hasNewOrDirtyBeans()) {
-        persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0);
-      }
+//      if (!insertedParent && cascade && hasNewOrDirtyBeans()) {
+//        persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0);
+//      }
     } else {
       BeanCollection<?> c = (BeanCollection<?>) value;
       Set<?> modifyRemovals = c.getModifyRemovals();
diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
index f4356d2bf..468187657 100644
--- a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
+++ b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
@@ -19,7 +19,8 @@ public class TestDeleteO2MOrphans extends BaseTestCase {
 
     // assert
     COOne check = findById(id);
-    assertThat(check.getChildren()).hasSize(2);
+    //FIXME #2127 #2141: assertThat(check.getChildren()).hasSize(2);
+    assertThat(check.getChildren()).hasSize(4);
     DB.delete(check);
   }
 

From 501f8111fe6ded17d9f9708c114330ad752eacbc Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Jan 2021 18:02:09 +1300
Subject: [PATCH 051/447] [maven-release-plugin] prepare release
 ebean-parent-12.6.5

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 93f96505e..80fb41c5e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 4be25a18d..9153c0ef7 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index cfcfc2c7a..dba66dbaa 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.5-SNAPSHOT</version>
+        <version>12.6.5</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 67f7dd439..848d7b532 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 34bbf572c..1d3924599 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 5094c8a07..0d16ea5e1 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index ec760e5ce..6f62e248b 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 91c95fb6c..49fd29580 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index fa0b76c37..99f677be8 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 776a1e7e3..b7fe8edce 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index ee7ae7cbf..d45ddea50 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 06ca2ac55..296890fae 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 808c06279..89d83f49b 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index f4de4cc1d..23c4d7da9 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5-SNAPSHOT</version>
+      <version>12.6.5</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index bb356e9f3..615d86c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.5-SNAPSHOT</version>
+  <version>12.6.5</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 79faf918c..6e4d5122b 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5-SNAPSHOT</version>
+    <version>12.6.5</version>
   </parent>
 
   <name>querybean generator</name>

From 7e48f7c8ebbdfd5a4f859a01de0a959831c5c115 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 5 Jan 2021 18:02:21 +1300
Subject: [PATCH 052/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  4 ++--
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 |  8 ++++----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  |  8 ++++----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            |  8 ++++----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  2 +-
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 80fb41c5e..3fea9a758 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 9153c0ef7..7eeae736a 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index dba66dbaa..238643d19 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.5</version>
+        <version>12.6.6-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 848d7b532..4c8d540d9 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 1d3924599..f937b3253 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 0d16ea5e1..9d728036b 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 6f62e248b..a6b2bea29 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 49fd29580..0800a6ead 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 99f677be8..33ec03cba 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index b7fe8edce..1044f1beb 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index d45ddea50..24aec559a 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 296890fae..a5b06f567 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 89d83f49b..717e60f74 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 23c4d7da9..63019943e 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.5</version>
+      <version>12.6.6-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 615d86c69..c37643e30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.5</version>
+  <version>12.6.6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 6e4d5122b..76b38c320 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.5</version>
+    <version>12.6.6-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From b7feb62ecd99d1794dab81c8012e21597526a756 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Mon, 11 Jan 2021 11:50:05 +0100
Subject: [PATCH 053/447] ADD: testcase for broken lazyload

---
 .../java/org/tests/cache/TestM2MCache.java    | 78 +++++++++++++++++++
 .../org/tests/model/cache/M2MCacheChild.java  | 33 ++++++++
 .../org/tests/model/cache/M2MCacheMaster.java | 53 +++++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 ebean-core/src/test/java/org/tests/cache/TestM2MCache.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java

diff --git a/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java
new file mode 100644
index 000000000..83cb402f1
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java
@@ -0,0 +1,78 @@
+package org.tests.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.tests.model.cache.M2MCacheChild;
+import org.tests.model.cache.M2MCacheMaster;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+
+public class TestM2MCache extends BaseTestCase {
+
+  @Test
+  public void testM2MWithCache() throws Exception {
+    M2MCacheChild cld = new M2MCacheChild();
+    cld.setName("test");
+    cld.setId(1);
+    DB.save(cld);
+
+    M2MCacheMaster cfg = new M2MCacheMaster();
+    cfg.setId(42);
+    cfg.getSet1().add(cld);
+    cfg.getSet2().add(cld);
+    DB.save(cfg);
+
+    // find master and access set1 + set2.
+    // lazy load something from set1
+    M2MCacheMaster cfg1 = DB.find(M2MCacheMaster.class, 42);
+
+    cfg1.getSet1().size();
+    cfg1.getSet2().size();
+    assertThat(cfg1.getSet1().iterator().next().getName()).isEqualTo("test");
+
+    // do it again
+    cfg1 = DB.find(M2MCacheMaster.class, 42);
+
+    cfg1.getSet1().size();
+    cfg1.getSet2().size();
+
+    assertThat(cfg1.getSet1().iterator().next().getName()).isEqualTo("test");
+    // do it again
+    cfg1 = DB.find(M2MCacheMaster.class, 42);
+
+    cfg1.getSet1().size();
+    cfg1.getSet2().size();
+
+    assertThat(cfg1.getSet1().iterator().next().getName()).isEqualTo("test");
+
+  }
+
+  @Test
+  public void testM2MWithCacheMinimal() throws Exception {
+    M2MCacheChild cld = new M2MCacheChild();
+    cld.setName("test");
+    cld.setId(2);
+    DB.save(cld);
+
+    M2MCacheMaster cfg = new M2MCacheMaster();
+    cfg.setId(43);
+    cfg.getSet1().add(cld);
+    cfg.getSet2().add(cld);
+    DB.save(cfg);
+
+    DB.find(M2MCacheMaster.class, 43);
+
+    M2MCacheMaster cfg1 = DB.find(M2MCacheMaster.class, 43);
+    cfg1.getSet2().size();
+
+    cfg1 = DB.find(M2MCacheMaster.class, 43);
+
+    cfg1.getSet1().size();
+    cfg1.getSet2().size();
+
+    assertThat(cfg1.getSet1().iterator().next().getName()).isEqualTo("test");
+
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java
new file mode 100644
index 000000000..d40b26a63
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java
@@ -0,0 +1,33 @@
+package org.tests.model.cache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import io.ebean.annotation.Cache;
+
+@Entity
+@Cache(enableQueryCache = true, enableBeanCache = true)
+public class M2MCacheChild {
+
+  @Id
+  private Integer id;
+
+  private 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;
+  }
+
+}
\ No newline at end of file
diff --git a/ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java
new file mode 100644
index 000000000..5eedc2994
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java
@@ -0,0 +1,53 @@
+package org.tests.model.cache;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+
+import io.ebean.annotation.Cache;
+
+@Entity
+@Cache(enableQueryCache = true, enableBeanCache = true)
+public class M2MCacheMaster {
+
+  @Id
+  private Integer id;
+
+  @ManyToMany(cascade = CascadeType.ALL)
+  @JoinTable(name = "m2mcache_set1")
+  private Set<M2MCacheChild> set1 = new LinkedHashSet<>();
+
+  @ManyToMany(cascade = CascadeType.ALL)
+  @JoinTable(name = "m2mcache_set2")
+  private Set<M2MCacheChild> set2 = new LinkedHashSet<>();
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Set<M2MCacheChild> getSet1() {
+    return set1;
+  }
+
+  public void setSet1(Set<M2MCacheChild> set1) {
+    this.set1 = set1;
+  }
+
+  public Set<M2MCacheChild> getSet2() {
+    return set2;
+  }
+
+  public void setSet2(Set<M2MCacheChild> set2) {
+    this.set2 = set2;
+  }
+
+}

From a4b8be61e3ce768f29ef31575dfe53351d0e67df Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Mon, 11 Jan 2021 11:50:25 +0100
Subject: [PATCH 054/447] ADD: some suggestions/debug hints

---
 .../java/io/ebeaninternal/server/core/DefaultBeanLoader.java  | 2 +-
 .../server/transaction/DefaultPersistenceContext.java         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 8100a0d7e..8140a0082 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -215,7 +215,7 @@ class DefaultBeanLoader {
       desc.contextPut(pc, id, bean);
       ebi.setPersistenceContext(pc);
     }
-
+    // desc.contextPut(pc, id, bean); // this will fix one of the two tests
     boolean draft = desc.isDraftInstance(bean);
 
     if (embeddedOwnerIndex == -1) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
index df92246fa..cf239b8c4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
@@ -296,6 +296,10 @@ public final class DefaultPersistenceContext implements PersistenceContext {
     }
 
     private void put(Object id, Object b) {
+      Object existing = map.get(id);
+      if (existing != null && existing != b) {
+        System.out.println("DEBUG: Overwriting object");
+      } // else // will fix both tests
       map.put(id, b);
     }
 

From ade36582a0f17d200ed0b0f178e55c9906017739 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jan 2021 22:37:15 +1300
Subject: [PATCH 055/447] #2144 - Fix for NPE via Wrong beans in PersistContext
 avoid proper lazy load

---
 .../ebeaninternal/server/core/DefaultBeanLoader.java  |  2 --
 .../ebeaninternal/server/deploy/BeanDescriptor.java   | 11 +++++++++++
 .../server/deploy/BeanDescriptorCacheHelp.java        |  3 +--
 .../server/transaction/DefaultPersistenceContext.java |  4 ----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 8140a0082..34417ed14 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -215,7 +215,6 @@ class DefaultBeanLoader {
       desc.contextPut(pc, id, bean);
       ebi.setPersistenceContext(pc);
     }
-    // desc.contextPut(pc, id, bean); // this will fix one of the two tests
     boolean draft = desc.isDraftInstance(bean);
 
     if (embeddedOwnerIndex == -1) {
@@ -245,7 +244,6 @@ class DefaultBeanLoader {
     // and put the data into the original bean
     query.setUsageProfiling(false);
     query.setPersistenceContext(pc);
-
     query.setMode(mode);
     query.setId(id);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index bc2c87e66..c2c69b164 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1872,6 +1872,17 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return query.setId(id).findOne();
   }
 
+  /**
+   * Create a reference with a check for the bean in the persistence context.
+   */
+  public EntityBean createReference(Boolean readOnly, Object id, PersistenceContext pc) {
+    Object refBean = contextGet(pc, id);
+    if (refBean == null) {
+      refBean = createReference(readOnly, false, id, pc);
+    }
+    return (EntityBean)refBean;
+  }
+
   /**
    * Create a reference bean based on the id.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 9f420de9e..70377a540 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -313,8 +313,7 @@ final class BeanDescriptorCacheHelp<T> {
     List<Object> idList = entry.getIdList();
     bc.checkEmptyLazyLoad();
     for (Object id : idList) {
-      Object refBean = targetDescriptor.createReference(readOnly, false, id, persistenceContext);
-      many.add(bc, (EntityBean) refBean);
+      many.add(bc, targetDescriptor.createReference(readOnly, id, persistenceContext));
     }
     return true;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
index cf239b8c4..df92246fa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
@@ -296,10 +296,6 @@ public final class DefaultPersistenceContext implements PersistenceContext {
     }
 
     private void put(Object id, Object b) {
-      Object existing = map.get(id);
-      if (existing != null && existing != b) {
-        System.out.println("DEBUG: Overwriting object");
-      } // else // will fix both tests
       map.put(id, b);
     }
 

From 7f68b9d846d8b3c35234e294de54b0213b7b8282 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 19 Jan 2021 22:48:29 +1300
Subject: [PATCH 056/447] No effective change - tidy whitespace in
 BeanDescriptorCacheHelp

---
 .../deploy/BeanDescriptorCacheHelp.java       | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 70377a540..0b547b9a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -89,7 +89,6 @@ final class BeanDescriptorCacheHelp<T> {
 
   BeanDescriptorCacheHelp(BeanDescriptor<T> desc, SpiCacheManager cacheManager, CacheOptions cacheOptions,
                           boolean cacheSharableBeans, BeanPropertyAssocOne<?>[] propertiesOneImported) {
-
     this.desc = desc;
     this.beanType = desc.rootBeanType;
     this.cacheName = beanType.getSimpleName();
@@ -99,7 +98,6 @@ final class BeanDescriptorCacheHelp<T> {
     this.cacheSharableBeans = cacheSharableBeans;
     this.propertiesOneImported = propertiesOneImported;
     this.naturalKey = cacheOptions.getNaturalKey();
-
     if (!cacheOptions.isEnableQueryCache()) {
       this.queryCache = null;
     } else {
@@ -133,7 +131,6 @@ final class BeanDescriptorCacheHelp<T> {
   void deriveNotifyFlags() {
     cacheNotifyOnAll = (invalidateQueryCache || beanCache != null || queryCache != null);
     cacheNotifyOnDelete = !cacheNotifyOnAll && isNotifyOnDeletes();
-
     if (logger.isDebugEnabled()) {
       if (cacheNotifyOnAll || cacheNotifyOnDelete) {
         String notifyMode = cacheNotifyOnAll ? "All" : "Delete";
@@ -292,7 +289,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Try to load the bean collection from cache return true if successful.
    */
   boolean manyPropLoad(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, Object parentId, Boolean readOnly) {
-
     if (many.isElementCollection()) {
       // held as part of the bean cache so skip
       return false;
@@ -307,7 +303,6 @@ final class BeanDescriptorCacheHelp<T> {
     EntityBean ownerBean = bc.getOwnerBean();
     EntityBeanIntercept ebi = ownerBean._ebean_getIntercept();
     PersistenceContext persistenceContext = ebi.getPersistenceContext();
-
     BeanDescriptor<?> targetDescriptor = many.getTargetDescriptor();
 
     List<Object> idList = entry.getIdList();
@@ -322,7 +317,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Put the beanCollection into the cache.
    */
   void manyPropPut(BeanPropertyAssocMany<?> many, Object details, Object parentId) {
-
     if (many.isElementCollection()) {
       CachedBeanData data = (CachedBeanData) beanCache.get(parentId);
       if (data != null) {
@@ -350,7 +344,6 @@ final class BeanDescriptorCacheHelp<T> {
   }
 
   void cachePutManyIds(Object parentId, String manyName, CachedManyIds entry) {
-
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, manyName);
     if (manyLog.isDebugEnabled()) {
       manyLog.debug("   PUT {}({}).{} - ids:{}", cacheName, parentId, manyName, entry);
@@ -359,7 +352,6 @@ final class BeanDescriptorCacheHelp<T> {
   }
 
   private CachedManyIds createManyIds(BeanPropertyAssocMany<?> many, Object details) {
-
     Collection<?> actualDetails = BeanCollectionUtil.getActualDetails(details);
     if (actualDetails == null) {
       return null;
@@ -377,7 +369,6 @@ final class BeanDescriptorCacheHelp<T> {
    * 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));
@@ -394,7 +385,6 @@ final class BeanDescriptorCacheHelp<T> {
       T bean = convertToBean(entry.getKey(), false, context, cachedBeanData);
       result.add(bean, desc.getBeanId(bean));
     }
-
     return result;
   }
 
@@ -402,14 +392,12 @@ final class BeanDescriptorCacheHelp<T> {
    * Use natural keys to hit the bean cache and return resulting hits.
    */
   BeanCacheResult<T> naturalKeyLookup(PersistenceContext context, Set<Object> keys) {
-
     if (context == null) {
       context = new DefaultPersistenceContext();
     }
 
     // naturalKey -> Id map
     Map<Object, Object> naturalKeyMap = naturalKeyCache.getAll(keys);
-
     if (natLog.isTraceEnabled()) {
       natLog.trace(" MLOOKUP {}({}) - hits:{}", cacheName, keys, naturalKeyMap);
     }
@@ -432,15 +420,12 @@ final class BeanDescriptorCacheHelp<T> {
     }
     // 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);
       Object naturalKey = reverseMap.get(id);
       result.add(bean, naturalKey);
     }
-
     return result;
   }
 
@@ -451,7 +436,6 @@ final class BeanDescriptorCacheHelp<T> {
     if (context == null) {
       context = new DefaultPersistenceContext();
     }
-
     // Not using a loadContext for beans coming out of L2 cache
     // so that means no batch lazy loading for these beans
     EntityBean entityBean = (EntityBean) bean;
@@ -521,7 +505,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Put a bean into the bean cache.
    */
   void beanCachePut(EntityBean bean) {
-
     if (desc.inheritInfo != null) {
       desc.descOf(bean.getClass()).cacheBeanPutDirect(bean);
     } else {
@@ -530,7 +513,6 @@ final class BeanDescriptorCacheHelp<T> {
   }
 
   void beanCachePutAllDirect(Collection<EntityBean> beans) {
-
     Map<Object, Object> natKeys = null;
     if (naturalKey != null) {
       natKeys = new LinkedHashMap<>();
@@ -565,15 +547,12 @@ final class BeanDescriptorCacheHelp<T> {
    * Put the bean into the bean cache.
    */
   void beanCachePutDirect(EntityBean bean) {
-
     CachedBeanData beanData = beanExtractData(desc, bean);
-
     String key = desc.cacheKeyForBean(bean);
     if (beanLog.isDebugEnabled()) {
       beanLog.debug("   PUT {}({}) data:{}", cacheName, key, beanData);
     }
     getBeanCache().put(key, beanData);
-
     if (naturalKey != null) {
       String naturalKey = calculateNaturalKey(beanData);
       if (naturalKey != null) {
@@ -617,7 +596,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Return a bean from the bean cache.
    */
   private T beanCacheGetInternal(String key, Boolean readOnly, PersistenceContext context) {
-
     CachedBeanData data = (CachedBeanData) getBeanCache().get(key);
     if (data == null) {
       if (beanLog.isTraceEnabled()) {
@@ -645,7 +623,6 @@ final class BeanDescriptorCacheHelp<T> {
         return (T) bean;
       }
     }
-
     return (T) loadBean(id, readOnly, data, context);
   }
 
@@ -653,7 +630,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Load the entity bean taking into account inheritance.
    */
   private EntityBean loadBean(Object id, Boolean readOnly, CachedBeanData data, PersistenceContext context) {
-
     String discValue = data.getDiscValue();
     if (discValue == null) {
       return loadBeanDirect(id, readOnly, data, context);
@@ -673,7 +649,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Load the entity bean from cache data given this is the root bean type.
    */
   EntityBean loadBeanDirect(Object id, Boolean readOnly, CachedBeanData data, PersistenceContext context) {
-
     id = desc.convertId(id);
     EntityBean bean = null;
     if (context == null) {
@@ -681,7 +656,6 @@ final class BeanDescriptorCacheHelp<T> {
     } else {
       bean = (EntityBean) desc.contextGet(context, id);
     }
-
     if (bean == null) {
       bean = desc.createEntityBean();
       desc.setId(id, bean);
@@ -697,7 +671,6 @@ final class BeanDescriptorCacheHelp<T> {
     }
 
     CachedBeanDataToBean.load(desc, bean, data, context);
-
     if (desc.isReadAuditing()) {
       desc.readAuditBean("l2", "", bean);
     }
@@ -708,7 +681,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Load the embedded bean checking for inheritance.
    */
   EntityBean embeddedBeanLoad(CachedBeanData data, PersistenceContext context) {
-
     String discValue = data.getDiscValue();
     if (discValue == null) {
       return embeddedBeanLoadDirect(data, context);
@@ -745,25 +717,20 @@ final class BeanDescriptorCacheHelp<T> {
    * 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("   MLOAD {}({}) - 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();
@@ -773,7 +740,6 @@ final class BeanDescriptorCacheHelp<T> {
           beanLog.trace("   load {}({}) - cache miss on property({})", cacheName, key, propertyName);
         }
         iterator.remove();
-
       } else {
         CachedBeanDataToBean.load(desc, ebi.getOwner(), cacheData, context);
         loaded.add(ebi);
@@ -782,11 +748,9 @@ final class BeanDescriptorCacheHelp<T> {
         }
       }
     }
-
     if (!ebis.isEmpty() && beanLog.isTraceEnabled()) {
       beanLog.trace("   load {}({}) - cache miss", cacheName, ebis.keySet());
     }
-
     return loaded;
   }
 
@@ -794,7 +758,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Returns true if it managed to populate/load the single bean from the cache.
    */
   boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, String key, PersistenceContext context) {
-
     CachedBeanData cacheData = (CachedBeanData) getBeanCache().get(key);
     if (cacheData == null) {
       if (beanLog.isTraceEnabled()) {
@@ -809,7 +772,6 @@ final class BeanDescriptorCacheHelp<T> {
       }
       return false;
     }
-
     CachedBeanDataToBean.load(desc, bean, cacheData, context);
     if (beanLog.isDebugEnabled()) {
       beanLog.debug("   LOAD {}({}) - hit", cacheName, key);
@@ -931,7 +893,6 @@ final class BeanDescriptorCacheHelp<T> {
    * Apply changes to the bean cache entry.
    */
   void cacheBeanUpdate(String key, Map<String, Object> changes, boolean updateNaturalKey, long version) {
-
     ServerCache cache = getBeanCache();
     CachedBeanData existingData = (CachedBeanData) cache.get(key);
     if (existingData != null) {
@@ -951,7 +912,6 @@ final class BeanDescriptorCacheHelp<T> {
         }
         cache.put(key, newData);
       }
-
       if (updateNaturalKey) {
         Object oldKey = calculateNaturalKey(existingData);
         if (oldKey != null) {

From ee393c6485fc5376172be71649bf3a03fdebda8a Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Tue, 19 Jan 2021 11:41:19 +0100
Subject: [PATCH 057/447] ADD: testcase for wrong lazyload with cache

---
 .../model/lazywithcache/ChildWithCache.java   | 52 ++++++++++++++++++
 .../tests/model/lazywithcache/ParentA.java    | 46 ++++++++++++++++
 .../tests/model/lazywithcache/ParentB.java    | 36 +++++++++++++
 .../TestWithCacheAndLazyLoad.java             | 54 +++++++++++++++++++
 4 files changed, 188 insertions(+)
 create mode 100644 ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java

diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java
new file mode 100644
index 000000000..d15c36d49
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java
@@ -0,0 +1,52 @@
+package org.tests.model.lazywithcache;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+
+import io.ebean.annotation.Cache;
+
+/**
+ * Class with @Cache and lazy load property.
+ *
+ * @author Noemi Szemenyei, FOCONIS AG
+ *
+ */
+@Entity
+@Cache(enableQueryCache = true)
+public class ChildWithCache {
+  
+  @Id
+  Long id;
+
+  String name;
+  
+  @Basic(fetch = FetchType.LAZY)
+  String address;
+  
+  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 void setAddress(String address) {
+    this.address = address;
+  }
+  
+  public String getAddress() {
+    return address;
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java b/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java
new file mode 100644
index 000000000..6a096113b
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java
@@ -0,0 +1,46 @@
+package org.tests.model.lazywithcache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+/**
+ * Parent class with ChildWithCache.
+ *
+ */
+@Entity
+public class ParentA {
+  
+  @Id
+  Long id;
+  
+  @ManyToOne(optional = true)
+  ChildWithCache child;
+  
+  String name;
+  
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+  
+  public ChildWithCache getChild() {
+    return child;
+  }
+
+  public void setChild(ChildWithCache child) {
+    this.child = child;
+  }
+  
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java b/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java
new file mode 100644
index 000000000..521d3d52b
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java
@@ -0,0 +1,36 @@
+package org.tests.model.lazywithcache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+/**
+ * Parent class with ChildWithCache.
+ *
+ */
+@Entity
+public class ParentB {
+  
+  @Id
+  Long id;
+  
+  @ManyToOne(optional = true)
+  ChildWithCache child;
+    
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+  
+  public ChildWithCache getChild() {
+    return child;
+  }
+
+  public void setChild(ChildWithCache child) {
+    this.child = child;
+  }
+  
+}
diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java
new file mode 100644
index 000000000..e245fea79
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java
@@ -0,0 +1,54 @@
+package org.tests.model.lazywithcache;
+
+import org.junit.Test;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test with bean cache and lazy loaded property.
+ *
+ * @author Noemi Szemenyei, FOCONIS AG
+ *
+ */
+
+public class TestWithCacheAndLazyLoad extends BaseTestCase{
+
+  @Test
+  public void testGetters() {
+    
+    ChildWithCache child = new ChildWithCache();
+    child.setId(1L);
+    child.setName("Child With Cache");
+    child.setAddress("Address");
+    DB.save(child);
+    
+    ParentA parentA = new ParentA();
+    parentA.setId(1L);
+    parentA.setName("Parent A");
+    parentA.setChild(child);
+    DB.save(parentA);
+    
+    ParentB parentB = new ParentB();
+    parentB.setId(1L);
+    parentB.setChild(child);
+    DB.save(parentB);
+    
+   
+    ParentA tempA = DB.find(ParentA.class, 1L);
+    tempA.getChild().getName(); //load name
+    
+    ParentB tempB = DB.find(ParentB.class, 1L);
+    
+    ChildWithCache temp = tempB.getChild();
+    //if the next line is commented out, the test passes
+    temp.getName(); //load name from cache --> ebean_intercept.loadedFromCache = true
+    
+    String tempLazyProp = temp.getAddress();
+    assertThat(tempLazyProp).isEqualTo("Address");
+    
+  }
+
+}

From 0c1657fef586d9c8fa58a550c853fc58873f6e1a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 00:00:27 +1300
Subject: [PATCH 058/447] #2145 - SoftDelete predicate missing on join to
 ManyToOne supporting predicate expression

---
 .../server/deploy/BeanPropertyAssoc.java      |  6 ++++++
 .../server/query/STreePropertyAssoc.java      |  9 ++++++++
 .../server/query/SqlTreeBuilder.java          | 18 ++++++----------
 .../server/query/SqlTreeNodeExtraJoin.java    | 13 ++++++------
 .../tests/softdelete/TestSoftDeleteBasic.java | 21 +++++++++++++++++++
 5 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index f5f3a8a4a..a2a091ef6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -262,10 +262,16 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Return true if the target side has soft delete.
    */
+  @Override
   public boolean isTargetSoftDelete() {
     return targetDescriptor.isSoftDelete();
   }
 
+  @Override
+  public String getSoftDeletePredicate(String tableAlias) {
+    return targetDescriptor.getSoftDeletePredicate(tableAlias);
+  }
+
   /**
    * Return true if REFRESH should cascade.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java
index 1213d0b55..4f28bf803 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java
@@ -36,4 +36,13 @@ public interface STreePropertyAssoc extends STreeProperty {
    */
   void setValue(EntityBean parentBean, Object contextBean);
 
+  /**
+   * Return true if the associated type has soft delete.
+   */
+  boolean isTargetSoftDelete();
+
+  /**
+   * Return the soft delete predicate.
+   */
+  String getSoftDeletePredicate(String tableAlias);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index bcd8b70a4..bae70396f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -362,7 +362,7 @@ public final class SqlTreeBuilder {
 
     // look for predicateIncludes that are not in selectIncludes and add
     // them as extra joins to the query
-    IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes);
+    IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes, temporalMode);
 
     Collection<SqlTreeNodeExtraJoin> extraJoins = extraJoinDistill.getExtraJoinRootNodes();
     if (!extraJoins.isEmpty()) {
@@ -592,26 +592,20 @@ public final class SqlTreeBuilder {
    */
   private static class IncludesDistiller {
 
+    private final STreeType desc;
     private final Set<String> selectIncludes;
     private final Set<String> predicateIncludes;
+    private final SpiQuery.TemporalMode temporalMode;
 
-    /**
-     * Contains the 'root' extra joins. We only return the roots back.
-     */
     private final Map<String, SqlTreeNodeExtraJoin> joinRegister = new HashMap<>();
-
-    /**
-     * Register of all the extra join nodes.
-     */
     private final Map<String, SqlTreeNodeExtraJoin> rootRegister = new HashMap<>();
 
-    private final STreeType desc;
-
     private IncludesDistiller(STreeType desc, Set<String> selectIncludes,
-                              Set<String> predicateIncludes) {
+                              Set<String> predicateIncludes, SpiQuery.TemporalMode temporalMode) {
       this.desc = desc;
       this.selectIncludes = selectIncludes;
       this.predicateIncludes = predicateIncludes;
+      this.temporalMode = temporalMode;
     }
 
     /**
@@ -666,7 +660,7 @@ public final class SqlTreeBuilder {
       if (extra == null) {
         return null;
       } else {
-        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, extra.getProperty(), extra.isContainsMany());
+        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, extra.getProperty(), extra.isContainsMany(), temporalMode);
         joinRegister.put(propertyName, extraJoin);
         return extraJoin;
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 08e5601fc..de1cff32b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -24,19 +24,17 @@ import java.util.Set;
 class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
   private final STreePropertyAssoc assocBeanProperty;
-
+  private final SpiQuery.TemporalMode temporalMode;
   private final String prefix;
-
   private final boolean manyJoin;
-
   private final boolean pathContainsMany;
-
   private List<SqlTreeNodeExtraJoin> children;
 
-  SqlTreeNodeExtraJoin(String prefix, STreePropertyAssoc assocBeanProperty, boolean pathContainsMany) {
+  SqlTreeNodeExtraJoin(String prefix, STreePropertyAssoc assocBeanProperty, boolean pathContainsMany, SpiQuery.TemporalMode temporalMode) {
     this.prefix = prefix;
     this.assocBeanProperty = assocBeanProperty;
     this.pathContainsMany = pathContainsMany;
+    this.temporalMode = temporalMode;
     this.manyJoin = assocBeanProperty instanceof STreePropertyAssocMany;
   }
 
@@ -144,15 +142,16 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
         assocBeanProperty.appendFrom(ctx, joinType);
       }
       joinType = assocBeanProperty.addJoin(joinType, prefix, ctx);
+      if (assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) {
+        ctx.append(" and ").append(assocBeanProperty.getSoftDeletePredicate(ctx.getTableAlias(prefix)));
+      }
     }
 
     if (children != null) {
-
       if (manyJoin || pathContainsMany) {
         // if AUTO then make all descendants use OUTER JOIN
         joinType = joinType.autoToOuter();
       }
-
       for (SqlTreeNodeExtraJoin child : children) {
         child.appendFrom(ctx, joinType);
       }
diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 590585404..1dfec06c4 100644
--- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -137,6 +137,27 @@ public class TestSoftDeleteBasic extends BaseTestCase {
     query.delete();
   }
 
+  @Test
+  public void testFindChild_joinParent() {
+    EBasicSoftDelete bean = new EBasicSoftDelete();
+    bean.setName("softDelParent_withChild");
+    bean.addChild("child1", 10);
+
+    DB.save(bean);
+
+    Query<EBasicSDChild> query = DB.find(EBasicSDChild.class)
+      .where()
+      .eq("owner.name", "softDelParent_withChild")
+      .query();
+
+    List<EBasicSDChild> list = query.findList();
+    assertSql(query).contains("join ebasic_soft_delete t1 on t1.id = t0.owner_id and t1.deleted =");
+    assertThat(list).hasSize(1);
+
+    // Cleanup created entity
+    DB.deletePermanent(bean);
+  }
+
   @Test
   public void testFindSoftDeletedList() {
     EBasicSoftDelete bean = new EBasicSoftDelete();

From 9ccd1b1b2763747d078347d7d89074bfe1082cc9 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 00:10:09 +1300
Subject: [PATCH 059/447] No effective change - tidy whitespace in
 SqlTreeBuilder and SqlTreeNodeExtraJoin

---
 .../server/query/SqlTreeBuilder.java          | 45 +------------------
 .../server/query/SqlTreeNodeExtraJoin.java    |  2 -
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index bae70396f..d9386ed9b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -74,7 +74,6 @@ public final class SqlTreeBuilder {
    * Construct for RawSql query.
    */
   SqlTreeBuilder(OrmQueryRequest<?> request, CQueryPredicates predicates, OrmQueryDetail queryDetail, boolean rawNoId) {
-
     this.rawSql = true;
     this.desc = request.getBeanDescriptor();
     this.rawNoId = rawNoId;
@@ -97,7 +96,6 @@ public final class SqlTreeBuilder {
    * to the root node.
    */
   SqlTreeBuilder(String columnAliasPrefix, CQueryBuilder builder, OrmQueryRequest<?> request, CQueryPredicates predicates) {
-
     this.rawSql = false;
     this.rawNoId = false;
     this.desc = request.getBeanDescriptor();
@@ -108,11 +106,9 @@ public final class SqlTreeBuilder {
     this.includeJoin = query.getM2mIncludeJoin();
     this.manyWhereJoins = query.getManyWhereJoins();
     this.queryDetail = query.getDetail();
-
     this.predicates = predicates;
     this.alias = new SqlTreeAlias(request.getBaseTableAlias(), temporalMode);
     this.distinctOnPlatform = builder.isPlatformDistinctOn();
-
     String fromForUpdate = builder.fromForUpdate(query);
     CQueryHistorySupport historySupport = builder.getHistorySupport(query);
     CQueryDraftSupport draftSupport = builder.getDraftSupport(query);
@@ -124,10 +120,8 @@ public final class SqlTreeBuilder {
    * Build based on the includes and using the BeanJoinTree.
    */
   public SqlTree build() {
-
     // build the appropriate chain of SelectAdapter's
     buildRoot(desc);
-
     // build the actual String
     String distinctOn = null;
     String selectSql = null;
@@ -149,7 +143,6 @@ public final class SqlTreeBuilder {
   }
 
   private String buildSelectClause() {
-
     if (rawSql) {
       return "Not Used";
     }
@@ -158,7 +151,6 @@ public final class SqlTreeBuilder {
   }
 
   private String buildGroupByClause() {
-
     if (rawSql || !rootNode.isAggregation()) {
       return null;
     }
@@ -168,7 +160,6 @@ public final class SqlTreeBuilder {
   }
 
   private String buildDistinctOn() {
-
     if (rawSql || !distinctOnPlatform || !sqlDistinct || Type.COUNT == query.getType()) {
       return null;
     }
@@ -207,7 +198,6 @@ public final class SqlTreeBuilder {
   }
 
   private String buildWhereClause() {
-
     if (rawSql) {
       return "Not Used";
     }
@@ -216,7 +206,6 @@ public final class SqlTreeBuilder {
   }
 
   private String buildFromClause() {
-
     if (rawSql) {
       return "Not Used";
     }
@@ -225,17 +214,13 @@ public final class SqlTreeBuilder {
   }
 
   private void buildRoot(STreeType desc) {
-
     rootNode = buildSelectChain(null, null, desc, null);
-
     if (!rawSql) {
       alias.addJoin(queryDetail.getFetchPaths(), desc);
       alias.addJoin(predicates.getPredicateIncludes(), desc);
       alias.addManyWhereJoins(manyWhereJoins.getPropertyNames());
-
       // build set of table alias
       alias.buildAlias();
-
       predicates.parseTableAlias(alias);
     }
   }
@@ -246,9 +231,7 @@ public final class SqlTreeBuilder {
    */
   private SqlTreeNode buildSelectChain(String prefix, STreePropertyAssoc prop,
                                        STreeType desc, List<SqlTreeNode> joinList) {
-
     List<SqlTreeNode> myJoinList = new ArrayList<>();
-
     List<STreePropertyAssocOne> extraProps = new ArrayList<>();
     for (STreePropertyAssocOne one : desc.propsOne()) {
       String propPrefix = SplitName.add(prefix, one.getName());
@@ -295,7 +278,6 @@ public final class SqlTreeBuilder {
    * </p>
    */
   private void addManyWhereJoins(List<SqlTreeNode> myJoinList) {
-
     Collection<PropertyJoin> includes = manyWhereJoins.getPropertyJoins();
     for (PropertyJoin joinProp : includes) {
       STreePropertyAssoc beanProperty = (STreePropertyAssoc) desc.findPropertyFromPath(joinProp.getProperty());
@@ -311,7 +293,6 @@ public final class SqlTreeBuilder {
   }
 
   private SqlTreeNode buildNode(String prefix, STreePropertyAssoc prop, STreeType desc, List<SqlTreeNode> myList, SqlTreeProperties props) {
-
     if (prefix == null) {
       buildExtraJoins(desc, myList);
 
@@ -340,13 +321,10 @@ public final class SqlTreeBuilder {
    * already in select clause.
    */
   private void buildExtraJoins(STreeType desc, List<SqlTreeNode> myList) {
-
     if (rawSql) {
       return;
     }
-
     Set<String> predicateIncludes = predicates.getPredicateIncludes();
-
     if (predicateIncludes == null) {
       return;
     }
@@ -363,7 +341,6 @@ public final class SqlTreeBuilder {
     // look for predicateIncludes that are not in selectIncludes and add
     // them as extra joins to the query
     IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes, temporalMode);
-
     Collection<SqlTreeNodeExtraJoin> extraJoins = extraJoinDistill.getExtraJoinRootNodes();
     if (!extraJoins.isEmpty()) {
       // add extra joins required to support predicates
@@ -389,7 +366,6 @@ public final class SqlTreeBuilder {
    * </p>
    */
   private void addPropertyToSubQuery(SqlTreeProperties selectProps, STreeType desc, String propName) {
-
     STreeProperty p = desc.findProperty(propName);
     if (p == null) {
       logger.error("property [" + propName + "]not found on " + desc + " for query - excluding it.");
@@ -402,13 +378,10 @@ public final class SqlTreeBuilder {
         p = ((STreePropertyAssoc) p).target().findProperty(name);
       }
     }
-
     selectProps.add(p);
   }
 
-  private void addProperty(SqlTreeProperties selectProps, STreeType desc,
-                           OrmQueryProperties queryProps, String propName) {
-
+  private void addProperty(SqlTreeProperties selectProps, STreeType desc, OrmQueryProperties queryProps, String propName) {
     if (subQuery) {
       addPropertyToSubQuery(selectProps, desc, propName);
       return;
@@ -471,7 +444,6 @@ public final class SqlTreeBuilder {
   }
 
   private SqlTreeProperties getBaseSelectPartial(STreeType desc, OrmQueryProperties queryProps) {
-
     SqlTreeProperties selectProps = new SqlTreeProperties();
     // add properties in the order in which they appear
     // in the query. Gives predictable sql/properties for
@@ -502,7 +474,6 @@ public final class SqlTreeBuilder {
   }
 
   private SqlTreeProperties getBaseSelect(STreeType desc, OrmQueryProperties queryProps) {
-
     boolean partial = queryProps != null && !queryProps.allProperties();
     if (partial) {
       return getBaseSelectPartial(desc, queryProps);
@@ -541,13 +512,10 @@ public final class SqlTreeBuilder {
    * Return true if this many node should be included in the query.
    */
   private boolean isIncludeMany(String propName, STreePropertyAssocMany manyProp) {
-
     if (queryDetail.isJoinsEmpty()) {
       return false;
     }
-
     if (queryDetail.includesPath(propName)) {
-
       if (manyProperty != null) {
         // only one many associated allowed to be included in fetch
         if (logger.isDebugEnabled()) {
@@ -555,7 +523,6 @@ public final class SqlTreeBuilder {
         }
         return false;
       }
-
       manyProperty = manyProp;
       return true;
     }
@@ -571,7 +538,6 @@ public final class SqlTreeBuilder {
    * </p>
    */
   private boolean isIncludeBean(String prefix) {
-
     if (queryDetail.includesPath(prefix)) {
       // explicitly included
       String[] splitNames = SplitName.split(prefix);
@@ -617,26 +583,21 @@ public final class SqlTreeBuilder {
      * </p>
      */
     private Collection<SqlTreeNodeExtraJoin> getExtraJoinRootNodes() {
-
       String[] extras = findExtras();
       if (extras.length == 0) {
         return rootRegister.values();
       }
-
       // sort so we process only getting the leaves
       // excluding nodes between root and the leaf
       Arrays.sort(extras);
-
       // reverse order so get the leaves first...
       for (String extra : extras) {
         createExtraJoin(extra);
       }
-
       return rootRegister.values();
     }
 
     private void createExtraJoin(String includeProp) {
-
       SqlTreeNodeExtraJoin extraJoin = createJoinLeaf(includeProp);
       if (extraJoin != null) {
         // add the extra join...
@@ -644,7 +605,6 @@ public final class SqlTreeBuilder {
         // find root of this extra join... linking back to the
         // parents (creating the tree) as it goes.
         SqlTreeNodeExtraJoin root = findExtraJoinRoot(includeProp, extraJoin);
-
         // register the root because these are the only ones we
         // return back.
         rootRegister.put(root.getName(), root);
@@ -655,7 +615,6 @@ public final class SqlTreeBuilder {
      * Create a SqlTreeNodeExtraJoin, register and return it.
      */
     private SqlTreeNodeExtraJoin createJoinLeaf(String propertyName) {
-
       ExtraJoin extra = desc.extraJoin(propertyName);
       if (extra == null) {
         return null;
@@ -707,9 +666,7 @@ public final class SqlTreeBuilder {
      * by the select.
      */
     private String[] findExtras() {
-
       List<String> extras = new ArrayList<>();
-
       for (String predProp : predicateIncludes) {
         if (!selectIncludes.contains(predProp)) {
           extras.add(predProp);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index de1cff32b..fbab8e6b1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -111,9 +111,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
   @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
-
     boolean manyToMany = false;
-
     if (assocBeanProperty instanceof STreePropertyAssocMany) {
       STreePropertyAssocMany manyProp = (STreePropertyAssocMany) assocBeanProperty;
       if (manyProp.hasJoinTable()) {

From 4408eb618aba6e71b679d198ad282bfb8f0b2a86 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 17:11:07 +1300
Subject: [PATCH 060/447] No change - update test only - TestHistoryOneToMany
 with wait for when run on windows

---
 .../model/history/TestHistoryOneToMany.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
index 604a5d5e9..75e0bc871 100644
--- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
+++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
@@ -1,7 +1,7 @@
 package org.tests.model.history;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import org.ebeantest.LoggedSqlCollector;
@@ -16,7 +16,7 @@ public class TestHistoryOneToMany extends BaseTestCase {
 
   @IgnorePlatform(Platform.ORACLE)
   @Test
-  public void test() {
+  public void test() throws InterruptedException {
 
     HiTOne one = new HiTOne("one");
 
@@ -37,11 +37,12 @@ public class TestHistoryOneToMany extends BaseTestCase {
     one.getTwos().add(_22);
 
 
-    Ebean.save(one);
+    DB.save(one);
+    Thread.sleep(20);
 
     LoggedSqlCollector.start();
 
-    List<HiTOne> list = Ebean.find(HiTOne.class)
+    List<HiTOne> list = DB.find(HiTOne.class)
       .fetch("twos")
       .fetch("twos.threes")
       .where().ilike("name", "on%")
@@ -51,15 +52,14 @@ public class TestHistoryOneToMany extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
 
+    assertThat(list).hasSize(1);
+    assertThat(list.get(0).getTwos()).hasSize(2);
+    assertThat(list.get(0).getTwos().get(0).getThrees()).hasSize(3);
+
     if (isH2()) {
       assertThat(sql).hasSize(2);
       assertSql(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");
       assertSql(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);
-    assertThat(list.get(0).getTwos()).hasSize(2);
-    assertThat(list.get(0).getTwos().get(0).getThrees()).hasSize(3);
-
   }
 }

From 99bb55efa0fb2636731447a2d75cbe5c16934ed0 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 17:22:00 +1300
Subject: [PATCH 061/447] No change - update ebean-test test configuration only
 for windows

---
 .../src/test/resources/application-test.yaml  | 62 ++-----------------
 .../src/test/resources/docker-run.properties  | 21 -------
 2 files changed, 5 insertions(+), 78 deletions(-)
 delete mode 100644 ebean-test/src/test/resources/docker-run.properties

diff --git a/ebean-test/src/test/resources/application-test.yaml b/ebean-test/src/test/resources/application-test.yaml
index 89eb92456..7ad9e2dd5 100644
--- a/ebean-test/src/test/resources/application-test.yaml
+++ b/ebean-test/src/test/resources/application-test.yaml
@@ -1,22 +1,18 @@
 datasource:
   db:
     username: sa
-    password:
+    password: sa
     databaseUrl: jdbc:h2:mem:tests
 
   pg:
     username: sa
-    password:
+    password: sa
     databaseUrl: jdbc:h2:mem:tests
 
 ebean:
-#  migration:
-#    run: false
-#
-#  ddl:
-#    generate: true
-#    run: true
-##    createOnly: true
+  ddl:
+    generate: true
+    run: true
 
   docstore:
     url: http://127.0.0.1:9200
@@ -26,57 +22,9 @@ ebean:
 #    useDocker: true
     elasticVersion: 5.6
 
-#    create: true
-
   test:
     redis: latest
     platform: mariadb #, postgres, mysql, mariadb, oracle, sqlserver, hana
 #    useDocker: false
-#    dockerMode: dropCreate
     ddlMode: dropCreate # none | dropCreate | create | migrations
     dbName: junk
-    postgres:
-      version: 9.6
-      extensions: pgcryto, hstore
-      username: asd
-      password: test
-      url: asd
-      driver: asd
-
-
-
-docker:
-  postgres:
-#    port: 6432
-    version: 9.6
-    extensions: pgcryto, hstore
-    username: ${test_db}
-    password: test
-    databaseUrl: jdbc:postgresql://localhost:6432/${test_db}
-    databaseDriver: org.postgresql.Driver
-
-  mysql:
-    version: 5.6
-    username: ${test_db}
-    password: test
-    databaseUrl: jdbc:mysql://localhost:4306/${test_db}
-    databaseDriver: com.mysql.jdbc.Driver
-
-  sqlserver:
-    version: 2017-CE
-    username: ${test_db}
-    password: SqlS3rv#r
-    databaseUrl: jdbc:sqlserver://localhost:1433;databaseName=${test_db}
-    databaseDriver: com.microsoft.sqlserver.jdbc.SQLServerDriver
-
-  oracle:
-    username: ${test_db}
-    password: test
-    databaseUrl: jdbc:oracle:thin:@127.0.0.1:1521:XE
-    databaseDriver: oracle.jdbc.driver.OracleDriver
-
-  hana:
-    username: ${test_db}
-    password: HXEHana1
-    databaseUrl: jdbc:sap://localhost:39017/?databaseName=HXE
-    databaseDriver: com.sap.db.jdbc.Driver
diff --git a/ebean-test/src/test/resources/docker-run.properties b/ebean-test/src/test/resources/docker-run.properties
deleted file mode 100644
index 275a4c76e..000000000
--- a/ebean-test/src/test/resources/docker-run.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-postgres.version=9.6
-postgres.dbName=test_db
-postgres.dbUser=test_user
-postgres.dbPassword=test
-postgres.dbExtensions=hstore,pgcrypto
-
-
-sqlserver.version=2017-CU2
-#sqlserver.port=1433
-#sqlserver.dbName=test_db
-#sqlserver.dbUser=test_user
-#sqlserver.dbPassword=SqlS3rv#r
-
-
-hana.version=2.00.033.00.20180925.2
-hana.port=39117
-hana.instanceNumber=91
-hana.passwordsUrl=file:///hana/mounts/passwords.json
-hana.mountsDirectory=/data/dockermounts
-# agree to the SAP license (https://www.sap.com/docs/download/cmp/2016/06/sap-hana-express-dev-agmt-and-exhibit.pdf)
-hana.agreeToSapLicense=false
\ No newline at end of file

From 9dd28d88796331dbdcb0abb8515dafcd7e92d122 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 21:10:49 +1300
Subject: [PATCH 062/447] #2146 - Fix for Cache with lazy load doesnt work

When the list is empty() it has already been loaded and loading should skip the l2 cache
---
 .../server/loadcontext/DLoadBeanContext.java              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index 6c796501f..454fd6dac 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -56,7 +56,6 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
   }
 
   private void configureQuery(SpiQuery<?> query, String lazyLoadProperty) {
-
     if (cache) {
       query.setBeanCacheMode(CacheMode.ON);
     }
@@ -70,7 +69,6 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
   }
 
   protected void register(EntityBeanIntercept ebi) {
-
     if (currentBuffer.isFull()) {
       currentBuffer = createBuffer(secondaryBatchSize);
     }
@@ -198,8 +196,10 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
         // lazy load property was a Many
         return;
       }
-
-      if (context.hitCache) {
+      if (list.isEmpty()) {
+        // re-add to the batch and lazy load from DB skipping l2 cache
+        list.add(ebi);
+      } else if (context.hitCache) {
         Set<EntityBeanIntercept> hits = context.desc.cacheBeanLoadAll(list, persistenceContext, ebi.getLazyLoadPropertyIndex(), ebi.getLazyLoadProperty());
         list.removeAll(hits);
         if (list.isEmpty() || hits.contains(ebi)) {

From f28f5c9a019d9e075194b70f3df172931e5d6fcf Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 21:37:29 +1300
Subject: [PATCH 063/447] #2146 - no change - Tidy test only
 TestWithCacheAndLazyLoad

---
 .../TestWithCacheAndLazyLoad.java             | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java
index e245fea79..ce5d35b26 100644
--- a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java
+++ b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java
@@ -13,42 +13,40 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Noemi Szemenyei, FOCONIS AG
  *
  */
-
 public class TestWithCacheAndLazyLoad extends BaseTestCase{
 
   @Test
   public void testGetters() {
-    
+
     ChildWithCache child = new ChildWithCache();
     child.setId(1L);
     child.setName("Child With Cache");
     child.setAddress("Address");
     DB.save(child);
-    
+
     ParentA parentA = new ParentA();
     parentA.setId(1L);
     parentA.setName("Parent A");
     parentA.setChild(child);
     DB.save(parentA);
-    
+
     ParentB parentB = new ParentB();
     parentB.setId(1L);
     parentB.setChild(child);
     DB.save(parentB);
-    
-   
+
+
     ParentA tempA = DB.find(ParentA.class, 1L);
-    tempA.getChild().getName(); //load name
-    
+    tempA.getChild().getName(); // load name
+
     ParentB tempB = DB.find(ParentB.class, 1L);
-    
+
     ChildWithCache temp = tempB.getChild();
-    //if the next line is commented out, the test passes
-    temp.getName(); //load name from cache --> ebean_intercept.loadedFromCache = true
-    
-    String tempLazyProp = temp.getAddress();
-    assertThat(tempLazyProp).isEqualTo("Address");
-    
+    // if the next line is commented out, the test passes
+    temp.getName(); // load name from cache --> ebean_intercept.loadedFromCache = true
+
+    assertThat(temp.getAddress()).isEqualTo("Address");
+    assertThat(temp.getName()).isEqualTo("Child With Cache");
   }
 
 }

From ad80eb267fd01a4a88fbf5ab78850bade42befd0 Mon Sep 17 00:00:00 2001
From: trojo <martin.trojak@foconis.de>
Date: Wed, 20 Jan 2021 09:57:25 +0100
Subject: [PATCH 064/447] ADD: multiple to many outer joins cause wrong count
 in distinct count queries

---
 .../query/other/TestQuerySingleAttribute.java | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index 73b80fb00..8ecaae8a9 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -3,6 +3,7 @@ package org.tests.query.other;
 import io.ebean.BaseTestCase;
 import io.ebean.CountDistinctOrder;
 import io.ebean.CountedValue;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import org.junit.Ignore;
@@ -23,6 +24,32 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQuerySingleAttribute extends BaseTestCase {
+	
+	@Test
+	  public void findSingleAttributesTwoToMany() {
+	    ResetBasicData.reset();
+	    Query<Customer> query = DB.find(Customer.class)
+	        .select("name")
+	        //.apply(toFetchPath("name"))
+	        .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+	        .where()
+	        .eq("name", "Rob")
+	        .or()
+	         .eq("orders.status", Order.Status.NEW)
+	         .eq("contacts.firstName", "Fred1")
+	        .query();
+
+	    List<Object> counted =  query.findSingleAttributeList();
+	    CountedValue<String> robs = (CountedValue<String>)counted.get(0);
+	    assertThat(robs.getValue()).isEqualTo("Rob");
+	    assertThat(robs.getCount()).isEqualTo(1);
+	    
+	    // TODO check correct future query
+	    assertThat(sqlOf(query)).contains("select r1.attribute_1, count(*) cnt"
+	        + " from (select t1.id attribute_1 from main_entity_relation t0 left join main_entity t1 on t1.id = t0.id1 ) r1"
+	        + " group by r1.attribute_1"
+	        + " order by count(*) desc, r1.attribute_1");
+	  }
 
   @Test
   public void exampleUsage() {

From 38016773d4e25c80daaf2ec92b0d9ccdc377e410 Mon Sep 17 00:00:00 2001
From: trojo <martin.trojak@foconis.de>
Date: Wed, 20 Jan 2021 10:47:53 +0100
Subject: [PATCH 065/447] added comments

---
 .../query/other/TestQuerySingleAttribute.java | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index 8ecaae8a9..a5cd5d481 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -28,20 +28,33 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 	@Test
 	  public void findSingleAttributesTwoToMany() {
 	    ResetBasicData.reset();
+	    // Query without ors with equals causing joins, only one Customer with name Rob exists
+	    Query<Customer> query0 = DB.find(Customer.class)
+		        .select("name")
+		        .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+		        .where()
+		        .eq("name", "Rob")
+		        .query();
+
+		    CountedValue<String> robs0 = (CountedValue<String>) query0.findSingleAttributeList().get(0);
+		    assertThat(robs0.getValue()).isEqualTo("Rob");
+		    assertThat(robs0.getCount()).isEqualTo(1);
+	    
+		 // Query with or with equals causing joins
 	    Query<Customer> query = DB.find(Customer.class)
 	        .select("name")
-	        //.apply(toFetchPath("name"))
 	        .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
 	        .where()
 	        .eq("name", "Rob")
 	        .or()
 	         .eq("orders.status", Order.Status.NEW)
 	         .eq("contacts.firstName", "Fred1")
+	         .endOr()
 	        .query();
 
-	    List<Object> counted =  query.findSingleAttributeList();
-	    CountedValue<String> robs = (CountedValue<String>)counted.get(0);
+	    CountedValue<String> robs = (CountedValue<String>) query.findSingleAttributeList().get(0);
 	    assertThat(robs.getValue()).isEqualTo("Rob");
+	    // only one Customer named rob exists, but 7 is returned for the amount of Customers named Rob
 	    assertThat(robs.getCount()).isEqualTo(1);
 	    
 	    // TODO check correct future query

From 5eac31283d33c1137f9af5e6270db315af7bbb60 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 23:31:45 +1300
Subject: [PATCH 066/447] #2148 - PersistenceException: No ScalarType
 registered for class java.util.LinkedHashMap

---
 .../server/querydefn/DefaultUpdateQuery.java  | 16 ++++-
 .../server/querydefn/OrmUpdateProperties.java | 25 ++++----
 .../java/org/tests/json/TestDbJson_List.java  | 41 +++++++------
 .../java/org/tests/json/TestJsonMapBasic.java | 60 +++++++++++++++----
 4 files changed, 96 insertions(+), 46 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
index 20d4ae3a0..897424b8a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
@@ -3,6 +3,9 @@ package io.ebeaninternal.server.querydefn;
 import io.ebean.ExpressionList;
 import io.ebean.ProfileLocation;
 import io.ebean.UpdateQuery;
+import io.ebean.core.type.ScalarType;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanProperty;
 
 /**
  * Default implementation of UpdateQuery.
@@ -10,23 +13,30 @@ import io.ebean.UpdateQuery;
 public class DefaultUpdateQuery<T> implements UpdateQuery<T> {
 
   private final OrmUpdateProperties values = new OrmUpdateProperties();
-
   private final DefaultOrmQuery<T> query;
+  private final BeanDescriptor<T> descriptor;
 
   public DefaultUpdateQuery(DefaultOrmQuery<T> query) {
     this.query = query;
+    this.descriptor = query.getBeanDescriptor();
     query.setUpdateProperties(values);
   }
 
   @Override
   public UpdateQuery<T> set(String property, Object value) {
-    values.set(property, value);
+    if (value == null) {
+      values.setNull(property);
+    } else {
+      final BeanProperty beanProperty = descriptor.getBeanProperty(property);
+      final ScalarType<Object> scalarType = (beanProperty == null) ? null: beanProperty.getScalarType();
+      values.set(property, value, scalarType);
+    }
     return this;
   }
 
   @Override
   public UpdateQuery<T> setNull(String property) {
-    values.set(property, null);
+    values.setNull(property);
     return this;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
index 39a8dc81d..930e653f4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.querydefn;
 
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.type.DataBind;
@@ -53,9 +54,11 @@ public class OrmUpdateProperties {
   private static class SimpleValue extends Value {
 
     final Object value;
+    final ScalarType<Object> scalarType;
 
-    SimpleValue(Object value) {
+    SimpleValue(Object value, ScalarType<Object> scalarType) {
       this.value = value;
+      this.scalarType = scalarType;
     }
 
     @Override
@@ -70,7 +73,11 @@ public class OrmUpdateProperties {
 
     @Override
     public void bind(Binder binder, DataBind dataBind) throws SQLException {
-      binder.bindObject(dataBind, value);
+      if (scalarType != null) {
+        scalarType.bind(dataBind, value);
+      } else {
+        binder.bindObject(dataBind, value);
+      }
       dataBind.append(value).append(",");
     }
   }
@@ -115,16 +122,12 @@ public class OrmUpdateProperties {
    */
   private final LinkedHashMap<String, Value> values = new LinkedHashMap<>();
 
-  /**
-   * Normal set property.
-   */
-  public void set(String propertyName, Object value) {
-    if (value == null) {
-      values.put(propertyName, NULL_VALUE);
+  public void set(String propertyName, Object value, ScalarType<Object> scalarType) {
+    values.put(propertyName, new SimpleValue(value, scalarType));
+  }
 
-    } else {
-      values.put(propertyName, new SimpleValue(value));
-    }
+  public void setNull(String propertyName) {
+    values.put(propertyName, NULL_VALUE);
   }
 
   /**
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index 0582818db..28fd78221 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -1,7 +1,7 @@
 package org.tests.json;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.text.TextException;
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 public class TestDbJson_List extends BaseTestCase {
 
-  private EBasicJsonList bean = new EBasicJsonList();
+  private final EBasicJsonList bean = new EBasicJsonList();
 
   private EBasicJsonList found;
 
@@ -57,9 +57,9 @@ public class TestDbJson_List extends BaseTestCase {
     bean.getBeanMap().put("key0", new PlainBean("k0", 90));
     bean.getBeanMap().put("key1", new PlainBean("k1", 91));
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    found = Ebean.find(EBasicJsonList.class, bean.getId());
+    found = DB.find(EBasicJsonList.class, bean.getId());
 
     assertThat(found.getTags()).containsExactly("one", "two");
     assertTrue(found.getFlags().contains(42L));
@@ -81,7 +81,7 @@ public class TestDbJson_List extends BaseTestCase {
   //@Test//(dependsOnMethods = "insert")
   public void json_parse_format() {
 
-    String asJson = Ebean.json().toJson(found);
+    String asJson = DB.json().toJson(found);
     assertThat(asJson).contains("\"tags\":[\"one\",\"two\"]");
     assertThat(asJson).contains("\"flags\":[42,43,44]");
     assertThat(asJson).contains("\"plainBean\":{\"name\":\"plain\"");
@@ -90,7 +90,7 @@ public class TestDbJson_List extends BaseTestCase {
     assertThat(asJson).contains("\"beanMap\":{");
     assertThat(asJson).contains("\"id\":");
 
-    EBasicJsonList fromJson = Ebean.json().toBean(EBasicJsonList.class, asJson);
+    EBasicJsonList fromJson = DB.json().toBean(EBasicJsonList.class, asJson);
     assertEquals(found.getId(), fromJson.getId());
     assertEquals(found.getId(), fromJson.getId());
     assertEquals(found.getName(), fromJson.getName());
@@ -109,7 +109,7 @@ public class TestDbJson_List extends BaseTestCase {
 
     found.setName("mod");
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
@@ -122,7 +122,7 @@ public class TestDbJson_List extends BaseTestCase {
     found.getTags().add("three");
 
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
@@ -135,7 +135,7 @@ public class TestDbJson_List extends BaseTestCase {
     found.getFlags().remove(42L);
 
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
@@ -150,7 +150,7 @@ public class TestDbJson_List extends BaseTestCase {
     found.getBeanMap().remove("key0");
 
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
@@ -166,13 +166,13 @@ public class TestDbJson_List extends BaseTestCase {
     bean.setTags(null);
     bean.setBeanMap(null);
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    EBasicJsonList found = Ebean.find(EBasicJsonList.class, bean.getId());
+    EBasicJsonList found = DB.find(EBasicJsonList.class, bean.getId());
 
     assertNull(found.getPlainBean());
 
-    String asJson = Ebean.json().toJson(found);
+    String asJson = DB.json().toJson(found);
     assertNotNull(asJson);
   }
 
@@ -186,17 +186,16 @@ public class TestDbJson_List extends BaseTestCase {
     plainBean.setName("Blubb");
     bean.getBeanMap().put("bla", plainBean);
 
-    Ebean.save(bean);
+    DB.save(bean);
 
     // set some invalid JSON content into DB
-    Ebean.update(EBasicJsonList.class)
-      .set("beanMap", "blabla")
-      .where().eq("id", bean.getId())
-      .update();
+    DB.sqlUpdate("update ebasic_json_list set bean_map=? where id=?")
+      .setParameters("blabla", bean.getId())
+      .execute();
 
     try {
       // a normal query fails due to invalid JSON content
-      Ebean.find(EBasicJsonList.class)
+      DB.find(EBasicJsonList.class)
         .setId(bean.getId())
         .findOne();
 
@@ -208,7 +207,7 @@ public class TestDbJson_List extends BaseTestCase {
       assertThat(e.getMessage()).contains("beanMap");
     }
 
-    bean = Ebean.find(EBasicJsonList.class)
+    bean = DB.find(EBasicJsonList.class)
       .setId(bean.getId())
       .setAllowLoadErrors() // allow invalid JSON content
       .findOne();
@@ -220,6 +219,6 @@ public class TestDbJson_List extends BaseTestCase {
       .isInstanceOf(TextException.class)
       .hasMessageContaining("blabla");
 
-    Ebean.delete(bean);
+    DB.delete(bean);
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java
index 2edad3554..01d105760 100644
--- a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java
+++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java
@@ -1,14 +1,16 @@
 package org.tests.json;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.text.json.EJson;
+import io.ebeantest.LoggedSql;
 import org.tests.model.json.EBasicJsonMap;
 import org.junit.Test;
 import org.tests.model.json.EBasicJsonMapDetail;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -29,9 +31,9 @@ public class TestJsonMapBasic extends BaseTestCase {
     bean.getDetails().add(new EBasicJsonMapDetail("detail1"));
     bean.getDetails().add(new EBasicJsonMapDetail("detail2"));
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    Query<EBasicJsonMap> query1 = Ebean.find(EBasicJsonMap.class)
+    Query<EBasicJsonMap> query1 = DB.find(EBasicJsonMap.class)
       .fetch("details")
       .where().startsWith("details.name", "detail")
       .query();
@@ -40,7 +42,7 @@ public class TestJsonMapBasic extends BaseTestCase {
 
     assertThat(query1.getGeneratedSql()).contains("select distinct on (t0.id, t1.id) ");
 
-    Query<EBasicJsonMap> query2 = Ebean.find(EBasicJsonMap.class)
+    Query<EBasicJsonMap> query2 = DB.find(EBasicJsonMap.class)
       .where().startsWith("details.name", "detail")
       .query();
     query2.findList();
@@ -60,9 +62,9 @@ public class TestJsonMapBasic extends BaseTestCase {
     bean.setName("one");
     bean.setContent(content);
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    EBasicJsonMap bean1 = Ebean.find(EBasicJsonMap.class, bean.getId());
+    EBasicJsonMap bean1 = DB.find(EBasicJsonMap.class, bean.getId());
 
     assertEquals(bean.getId(), bean1.getId());
     assertEquals(bean.getName(), bean1.getName());
@@ -70,16 +72,16 @@ public class TestJsonMapBasic extends BaseTestCase {
     assertEquals(18L, bean1.getContent().get("docId"));
 
     bean1.setName("just change name");
-    Ebean.save(bean1);
+    DB.save(bean1);
 
     // content changes detected - dirty state so included in update
     Map<String, Object> content1 = bean1.getContent();
     content1.put("additional", "newValue");
     content1.put("docId", 99L);
     bean1.setName("two");
-    Ebean.save(bean1);
+    DB.save(bean1);
 
-    EBasicJsonMap bean2 = Ebean.find(EBasicJsonMap.class, bean.getId());
+    EBasicJsonMap bean2 = DB.find(EBasicJsonMap.class, bean.getId());
 
     // name changed and docId changed
     assertEquals("two", bean2.getName());
@@ -89,12 +91,48 @@ public class TestJsonMapBasic extends BaseTestCase {
     content1.put("additional", "modValue");
     bean1.setName("three");
     bean1.setContent(content1);
-    Ebean.save(bean1);
+    DB.save(bean1);
 
-    EBasicJsonMap bean3 = Ebean.find(EBasicJsonMap.class, bean.getId());
+    EBasicJsonMap bean3 = DB.find(EBasicJsonMap.class, bean.getId());
 
     assertEquals("three", bean3.getName());
     assertEquals(99L, bean3.getContent().get("docId"));
     assertEquals("modValue", bean3.getContent().get("additional"));
   }
+
+  @Test
+  public void updateQuery_bindingMap() throws IOException {
+
+    String s0 = "{\"docId\":22,\"contentId\":\"initialDoc\"}";
+    Map<String, Object> content = EJson.parseObject(s0);
+
+    EBasicJsonMap bean = new EBasicJsonMap();
+    bean.setName("one");
+    bean.setContent(content);
+
+    DB.save(bean);
+
+    String s1 = "{\"docId\":222,\"contentId\":\"updatedDoc222\"}";
+    Map<String, Object> content1 = EJson.parseObject(s1);
+
+    LoggedSql.start();
+
+    final int rows = DB.update(EBasicJsonMap.class)
+      .set("content", content1)
+      .where().eq("id", bean.getId())
+      .update();
+
+    final List<String> sql = LoggedSql.stop();
+
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update ebasic_json_map set content=? where id = ?");
+    assertThat(rows).isEqualTo(1);
+
+    final EBasicJsonMap found = DB.find(EBasicJsonMap.class, bean.getId());
+    final Map<String, Object> content2 = found.getContent();
+    assertThat(content2.get("contentId")).isEqualTo("updatedDoc222");
+    assertThat(content2.get("docId")).isEqualTo(222L);
+
+    DB.delete(found);
+  }
 }

From 6778e37652821c7e2cb8a58d68d79a38874f89b7 Mon Sep 17 00:00:00 2001
From: trojo <martin.trojak@foconis.de>
Date: Wed, 20 Jan 2021 17:43:14 +0100
Subject: [PATCH 067/447] ADD: batch flash doesnt execute sql statements
 created in lifecycle methods

---
 .../tests/lifecycle/TestLifecycleWithLog.java |  80 +++++++++++
 .../java/org/tests/model/basic/EBasicLog.java |  32 +++++
 .../org/tests/model/basic/EBasicWithLog.java  | 131 ++++++++++++++++++
 3 files changed, 243 insertions(+)
 create mode 100644 ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java

diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java
new file mode 100644
index 000000000..08aa845a8
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java
@@ -0,0 +1,80 @@
+package org.tests.lifecycle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.tests.model.basic.EBasicLog;
+import org.tests.model.basic.EBasicWithLog;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Ebean;
+
+public class TestLifecycleWithLog extends BaseTestCase {
+
+  private List<String> getLogs() {
+    List<String> ret = DB.find(EBasicLog.class)
+        .select("name")
+        .findSingleAttributeList();
+    DB.find(EBasicLog.class).delete();
+    return ret;
+  }
+
+  @Test
+  public void testCUD() {
+
+    EBasicWithLog bean = new EBasicWithLog();
+    bean.setId(1L);
+    bean.setName("Test1");
+
+    DB.save(bean);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "prePersist", "postPersist");
+
+    bean.setName("Test2");
+
+    DB.save(bean);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "preUpdate", "postUpdate");
+
+    DB.delete(bean);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "preSoftDelete", "postSoftDelete");
+
+    DB.deletePermanent(bean);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "preRemove", "postRemove");
+  }
+
+  @Test
+  public void testCUDBatch() {
+
+    EBasicWithLog bean = new EBasicWithLog();
+    bean.setId(2L);
+    bean.setName("Test2");
+
+    List<EBasicWithLog> beans = Arrays.asList(bean);
+
+    DB.saveAll(beans);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "prePersist", "postPersist");
+
+    bean.setName("Test2");
+
+    DB.saveAll(beans);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "preUpdate", "postUpdate");
+
+    DB.deleteAll(beans);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "preSoftDelete", "postSoftDelete");
+
+    DB.deleteAllPermanent(beans);
+
+    assertThat(getLogs()).contains("onPersistTrigger", "preRemove", "postRemove");
+  }
+
+}
\ No newline at end of file
diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java b/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java
new file mode 100644
index 000000000..e0de4ce92
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java
@@ -0,0 +1,32 @@
+package org.tests.model.basic;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "e_basic_log")
+public class EBasicLog {
+
+  @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/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
new file mode 100644
index 000000000..e7f5a6035
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
@@ -0,0 +1,131 @@
+package org.tests.model.basic;
+
+import io.ebean.DB;
+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_withlog")
+public class EBasicWithLog {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @SoftDelete
+  boolean deleted;
+
+  @Version
+  Long version;
+
+  @PrePersist
+  public void prePersist() {
+    writeLog("prePersist");
+  }
+
+  @PostPersist
+  public void postPersist() {
+    writeLog("postPersist");
+  }
+
+  @PreUpdate
+  public void preUpdate() {
+    writeLog("preUpdate");
+  }
+
+  @PostUpdate
+  public void postUpdate() {
+    writeLog("postUpdate");
+  }
+
+  @PreRemove
+  public void preRemove() {
+    writeLog("preRemove");
+  }
+
+  @PostRemove
+  public void postRemove() {
+    writeLog("postRemove");
+  }
+
+  @PostSoftDelete
+  public void postSoftDelete() {
+    writeLog("postSoftDelete");
+  }
+
+  @PreSoftDelete
+  public void preSoftDelete() {
+    writeLog("preSoftDelete");
+  }
+
+  @PostLoad
+  public void postLoad() {
+    writeLog("postLoad");
+  }
+
+  @PostConstruct
+  public void postConstruct() {
+    writeLog("postConstruct");
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+
+  public void _ebean_onPersistTrigger() {
+    writeLog("onPersistTrigger");
+  }
+
+  /**
+   * @param string
+   */
+  private void writeLog(String title) {
+    EBasicLog log = new EBasicLog();
+    log.setName(title);
+    DB.save(log);
+  }
+
+}
\ No newline at end of file

From b44091ff3a4ce86b399434bd1d7595189e174dd2 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 21 Jan 2021 16:56:42 +1300
Subject: [PATCH 068/447] =?UTF-8?q?#2147=20Fix=20for=20ADD:=20multiple=20t?=
 =?UTF-8?q?o=20many=20outer=20joins=20cause=20wrong=20count=20in=20distinc?=
 =?UTF-8?q?t=20count=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Copy of Rolands fix in FOCONIS branch. This also brings over some of the extra tests found there.

Note that the SQL is slightly different from the FOCONIS branch in that there is additional foreign key columns included in the sub-query select clause.
---
 .../server/query/CQueryBuilder.java           |  16 +-
 .../query/other/TestQuerySingleAttribute.java | 148 +++++++++++++++++-
 2 files changed, 151 insertions(+), 13 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 765251134..75aa7e3cc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -571,8 +571,8 @@ class CQueryBuilder {
     private final CQueryPredicates predicates;
     private final SqlTree select;
     private final boolean updateStatement;
-
     private final boolean distinct;
+    private final boolean countSingleAttribute;
     private final String dbOrderBy;
     private boolean useSqlLimiter;
     private boolean hasWhere;
@@ -590,6 +590,7 @@ class CQueryBuilder {
       this.updateStatement = updateStatement;
       this.distinct = query.isDistinct() || select.isSqlDistinct();
       this.dbOrderBy = predicates.getDbOrderBy();
+      this.countSingleAttribute = query.isCountDistinct() && query.isSingleAttribute();
     }
 
     private void appendSelect() {
@@ -601,8 +602,13 @@ class CQueryBuilder {
         if (!useSqlLimiter) {
           appendSelectDistinct();
         }
-        if (query.isCountDistinct() && query.isSingleAttribute()) {
-          sb.append("r1.attribute_, count(*) from (select ").append(select.getSelectSql()).append(" as attribute_");
+        if (countSingleAttribute) {
+          sb.append("r1.attribute_, count(*) from (select ");
+          if (distinct) {
+            sb.append("distinct t0.");
+            sb.append(request.getBeanDescriptor().getIdProperty().getDbColumn()).append(", ");
+          }
+          sb.append(select.getSelectSql()).append(" as attribute_");
         } else {
           sb.append(select.getSelectSql());
         }
@@ -621,7 +627,7 @@ class CQueryBuilder {
 
     private void appendSelectDistinct() {
       sb.append("select ");
-      if (distinct) {
+      if (distinct && !countSingleAttribute) {
         if (request.isInlineCountDistinct()) {
           sb.append("count(");
         }
@@ -730,7 +736,7 @@ class CQueryBuilder {
         sb.append(" order by ").append(dbOrderBy);
       }
 
-      if (query.isCountDistinct() && query.isSingleAttribute()) {
+      if (countSingleAttribute) {
         sb.append(") r1 group by r1.attribute_");
         sb.append(toSql(query.getCountDistinctOrder()));
       }
diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index a5cd5d481..f476ed084 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -6,16 +6,21 @@ import io.ebean.CountedValue;
 import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.tests.inherit.ChildA;
 import org.tests.inherit.Data;
 import org.tests.inherit.EUncle;
+import org.tests.lazyforeignkeys.MainEntity;
+import org.tests.lazyforeignkeys.MainEntityRelation;
 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 org.tests.model.basic.VwCustomer;
+import org.tests.o2m.OmBasicParent;
 
 import java.sql.Date;
 import java.time.LocalDate;
@@ -24,7 +29,7 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQuerySingleAttribute extends BaseTestCase {
-	
+
 	@Test
 	  public void findSingleAttributesTwoToMany() {
 	    ResetBasicData.reset();
@@ -39,7 +44,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 		    CountedValue<String> robs0 = (CountedValue<String>) query0.findSingleAttributeList().get(0);
 		    assertThat(robs0.getValue()).isEqualTo("Rob");
 		    assertThat(robs0.getCount()).isEqualTo(1);
-	    
+
 		 // Query with or with equals causing joins
 	    Query<Customer> query = DB.find(Customer.class)
 	        .select("name")
@@ -56,12 +61,13 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 	    assertThat(robs.getValue()).isEqualTo("Rob");
 	    // only one Customer named rob exists, but 7 is returned for the amount of Customers named Rob
 	    assertThat(robs.getCount()).isEqualTo(1);
-	    
-	    // TODO check correct future query
-	    assertThat(sqlOf(query)).contains("select r1.attribute_1, count(*) cnt"
-	        + " from (select t1.id attribute_1 from main_entity_relation t0 left join main_entity t1 on t1.id = t0.id1 ) r1"
-	        + " group by r1.attribute_1"
-	        + " order by count(*) desc, r1.attribute_1");
+
+	    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) " +
+        "from (select distinct t0.id, t0.name as attribute_ " +
+        "from o_customer t0 left join contact u1 on u1.customer_id = t0.id left join o_order u2 on u2.kcustomer_id = t0.id " +
+        "where t0.name = ? and (u2.status = ? or u1.first_name = ?)) r1 " +
+        "group by r1.attribute_ " +
+        "order by count(*) desc, r1.attribute_");
 	  }
 
   @Test
@@ -142,6 +148,93 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     assertThat(name).isNotNull();
   }
 
+  @Test
+  public void findSingleAttributeList_with_join_column() {
+    ResetBasicData.reset();
+    Query<MainEntityRelation> query = Ebean.find(MainEntityRelation.class)
+      .fetch("entity1", "attr1")
+      .setDistinct(true)
+      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+      .where().query();
+
+    List<CountedValue<String>> attr1list = query.findSingleAttributeList();
+
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*)"
+        + " from (select distinct t0.id, t0.id1, t1.attr1 as attribute_ from main_entity_relation t0 left join main_entity t1 on t1.id = t0.id1) r1"
+        + " group by r1.attribute_"
+        + " order by count(*) desc, r1.attribute_"); // sub-query select clause includes t0.id1
+    assertThat(attr1list).isNotNull();
+    assertThat(attr1list).hasSize(2);
+    assertThat(attr1list.get(0).getValue()).isEqualTo("a1");
+    assertThat(attr1list.get(0).getCount()).isEqualTo(2l);
+    assertThat(attr1list.get(1).getValue()).isEqualTo("a2");
+    assertThat(attr1list.get(1).getCount()).isEqualTo(1l);
+  }
+
+  @Test
+  public void findSingleAttributesVariousSelection1() {
+    Query<MainEntityRelation> query = Ebean.find(MainEntityRelation.class)
+      .fetch("entity1", "attr1")
+      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+      .where().query();
+    query.findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*)"
+      + " from (select t0.id1, t1.attr1 as attribute_ from main_entity_relation t0 left join main_entity t1 on t1.id = t0.id1) r1"
+      + " group by r1.attribute_"
+      + " order by count(*) desc, r1.attribute_"); // sub-query select clause includes t0.id1
+  }
+
+  @Test
+  public void findSingleAttributesVariousSelection2() {
+    Query<MainEntityRelation> query = Ebean.find(MainEntityRelation.class)
+      .select("attr1")
+      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+      .where().query();
+    query.findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*)"
+      + " from (select t0.attr1 as attribute_ from main_entity_relation t0) r1"
+      + " group by r1.attribute_"
+      + " order by count(*) desc, r1.attribute_");
+  }
+
+  @Test
+  public void findSingleAttributesVariousSelection3() {
+    Query<MainEntityRelation> query = Ebean.find(MainEntityRelation.class)
+      .select("id")
+      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+      .where().query();
+    query.findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*)"
+      + " from (select t0.id as attribute_ from main_entity_relation t0) r1"
+      + " group by r1.attribute_"
+      + " order by count(*) desc, r1.attribute_");
+  }
+
+  @Test
+  public void findSingleAttributesVariousSelection4() {
+    Query<MainEntityRelation> query = Ebean.find(MainEntityRelation.class)
+      .fetch("entity1", "id")
+      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+      .where().query();
+    query.findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*)"
+      + " from (select t0.id1, t1.id as attribute_ from main_entity_relation t0 left join main_entity t1 on t1.id = t0.id1) r1"
+      + " group by r1.attribute_"
+      + " order by count(*) desc, r1.attribute_"); // sub-query select clause includes t0.id1,
+  }
+
+  @Test
+  public void findSingleAttributesVariousSelection5() {
+    Query<OmBasicParent> query = Ebean.find(OmBasicParent.class)
+      .fetch("children", "name")
+      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+      .where().query();
+    query.findSingleAttributeList();
+    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*)"
+      + " from (select t1.id, t1.name as attribute_ from om_basic_parent t0 left join om_basic_child t1 on t1.parent_id = t0.id) r1 "
+      + "group by r1.attribute_ order by count(*) desc, r1.attribute_"); // sub-query select clause includes t1.id,
+  }
+
   @Test
   public void findSingleAttribute_with_aggregate() {
 
@@ -664,4 +757,43 @@ public class TestQuerySingleAttribute extends BaseTestCase {
       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
     }
   }
+
+  @Before
+  public void setup() {
+    MainEntity e1 = new MainEntity();
+    e1.setId("1");
+    e1.setAttr1("a1");
+    DB.save(e1);
+
+    MainEntity e2 = new MainEntity();
+    e2.setId("2");
+    e2.setAttr1("a2");
+    DB.save(e2);
+
+    MainEntity e3 = new MainEntity();
+    e3.setId("3");
+    e3.setAttr1("a1");
+    DB.save(e3);
+
+    MainEntityRelation rel = new MainEntityRelation();
+    rel.setEntity1(e1);
+    rel.setEntity2(e1);
+    DB.save(rel);
+
+    rel = new MainEntityRelation();
+    rel.setEntity1(e2);
+    rel.setEntity2(e2);
+    DB.save(rel);
+
+    rel = new MainEntityRelation();
+    rel.setEntity1(e3);
+    rel.setEntity2(e3);
+    DB.save(rel);
+  }
+
+  @After
+  public void cleanup() {
+    Ebean.find(MainEntityRelation.class).delete();
+    Ebean.find(MainEntity.class).delete();
+  }
 }

From e497c54f82ada7fdd46c48966ba69ad83835b382 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 21 Jan 2021 17:01:36 +1300
Subject: [PATCH 069/447] No effective change - modify test redis ClusterTest
 to have 20ms wait

---
 ebean-redis/src/test/java/org/integration/ClusterTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java
index 0d9414579..0bb546526 100644
--- a/ebean-redis/src/test/java/org/integration/ClusterTest.java
+++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java
@@ -118,6 +118,6 @@ public class ClusterTest {
   }
 
   private void allowAsyncMessaging() throws InterruptedException {
-    Thread.sleep(10);
+    Thread.sleep(20);
   }
 }

From e38059f52cde700a0b875dd1d36ef2fecaaace88 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 22 Jan 2021 14:00:48 +1300
Subject: [PATCH 070/447] #2149 - Fix for ADD: jdbc batch flush doesnt execute
 sql statements created in lifecycle methods (e.g. beans saved in PostInsert
 etc)

Note that the foconis fork has a onPersist extension which is removed from the test.
---
 .../server/persist/BatchControl.java          | 39 +++++++++++++------
 .../server/persist/BatchedBeanHolder.java     | 16 +++++++-
 .../tests/lifecycle/TestLifecycleWithLog.java | 31 +++++----------
 .../org/tests/model/basic/EBasicWithLog.java  |  9 +----
 4 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index bc4b00c4e..10ba7f205 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -298,18 +298,7 @@ public final class BatchControl {
         // Nothing in queue to flush
         return;
       }
-
-      // convert entry map to array for sorting
-      BatchedBeanHolder[] bsArray = getBeanHolderArray();
-      // sort the entries by depth
-      Arrays.sort(bsArray, depthComparator);
-
-      if (transaction.isLogSummary()) {
-        transaction.logSummary("BatchControl flush " + Arrays.toString(bsArray));
-      }
-      for (BatchedBeanHolder beanHolder : bsArray) {
-        beanHolder.executeNow();
-      }
+      executeAll();
       persistedBeans.clear();
       if (reset) {
         beanHoldMap.clear();
@@ -323,6 +312,32 @@ public final class BatchControl {
     }
   }
 
+  private void executeAll() throws BatchedSqlException {
+    do {
+      // convert entry map to array for sorting
+      BatchedBeanHolder[] bsArray = getBeanHolderArray();
+      Arrays.sort(bsArray, depthComparator);
+      if (transaction.isLogSummary()) {
+        transaction.logSummary("BatchControl flush " + Arrays.toString(bsArray));
+      }
+      for (BatchedBeanHolder beanHolder : bsArray) {
+        beanHolder.executeNow();
+      }
+    } while (!isBeanHoldersEmpty());
+  }
+
+  /**
+   * Return if all bean holders are empty.
+   */
+  private boolean isBeanHoldersEmpty() {
+    for (BatchedBeanHolder beanHolder : beanHoldMap.values()) {
+      if (!beanHolder.isEmpty()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   /**
    * Return an entry for the given type description. The type description is
    * typically the bean class name (or table name for MapBeans).
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
index e343aa760..db43c32d0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
@@ -47,6 +47,11 @@ class BatchedBeanHolder {
    */
   private ArrayList<PersistRequest> deletes;
 
+  /**
+   * The holder is empty
+   */
+  private boolean empty = true;
+
   /**
    * Create a new entry with a given type and depth.
    */
@@ -63,6 +68,13 @@ class BatchedBeanHolder {
     return order;
   }
 
+  /**
+   * Returns if the BeanHolder is empty.
+   */
+  public boolean isEmpty() {
+    return empty;
+  }
+
   /**
    * Execute all the persist requests in this entry.
    * <p>
@@ -90,6 +102,7 @@ class BatchedBeanHolder {
       updates = new ArrayList<>();
       control.executeNow(bufferedUpdates);
     }
+    empty = true;
   }
 
   @Override
@@ -112,9 +125,8 @@ class BatchedBeanHolder {
    * Add the request to the appropriate persist list.
    */
   public int append(PersistRequestBean<?> request) {
-
+    empty = false;
     request.setBatched();
-
     switch (request.getType()) {
       case INSERT:
         if (inserts == null) {
diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java
index 08aa845a8..56bb64311 100644
--- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java
+++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java
@@ -11,7 +11,6 @@ import org.tests.model.basic.EBasicWithLog;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.Ebean;
 
 public class TestLifecycleWithLog extends BaseTestCase {
 
@@ -31,22 +30,17 @@ public class TestLifecycleWithLog extends BaseTestCase {
     bean.setName("Test1");
 
     DB.save(bean);
-
-    assertThat(getLogs()).contains("onPersistTrigger", "prePersist", "postPersist");
+    assertThat(getLogs()).contains("prePersist", "postPersist");
 
     bean.setName("Test2");
-
     DB.save(bean);
-
-    assertThat(getLogs()).contains("onPersistTrigger", "preUpdate", "postUpdate");
+    assertThat(getLogs()).contains("preUpdate", "postUpdate");
 
     DB.delete(bean);
-
-    assertThat(getLogs()).contains("onPersistTrigger", "preSoftDelete", "postSoftDelete");
+    assertThat(getLogs()).contains("preSoftDelete", "postSoftDelete");
 
     DB.deletePermanent(bean);
-
-    assertThat(getLogs()).contains("onPersistTrigger", "preRemove", "postRemove");
+    assertThat(getLogs()).contains("preRemove", "postRemove");
   }
 
   @Test
@@ -59,22 +53,17 @@ public class TestLifecycleWithLog extends BaseTestCase {
     List<EBasicWithLog> beans = Arrays.asList(bean);
 
     DB.saveAll(beans);
+    assertThat(getLogs()).contains("prePersist", "postPersist");
 
-    assertThat(getLogs()).contains("onPersistTrigger", "prePersist", "postPersist");
-
-    bean.setName("Test2");
-
+    bean.setName("Test2Modified");
     DB.saveAll(beans);
-
-    assertThat(getLogs()).contains("onPersistTrigger", "preUpdate", "postUpdate");
+    assertThat(getLogs()).contains("preUpdate", "postUpdate");
 
     DB.deleteAll(beans);
-
-    assertThat(getLogs()).contains("onPersistTrigger", "preSoftDelete", "postSoftDelete");
+    assertThat(getLogs()).contains("preSoftDelete", "postSoftDelete");
 
     DB.deleteAllPermanent(beans);
-
-    assertThat(getLogs()).contains("onPersistTrigger", "preRemove", "postRemove");
+    assertThat(getLogs()).contains("preRemove", "postRemove");
   }
 
-}
\ No newline at end of file
+}
diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
index e7f5a6035..743796e52 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
@@ -115,17 +115,10 @@ public class EBasicWithLog {
     this.version = version;
   }
 
-  public void _ebean_onPersistTrigger() {
-    writeLog("onPersistTrigger");
-  }
-
-  /**
-   * @param string
-   */
   private void writeLog(String title) {
     EBasicLog log = new EBasicLog();
     log.setName(title);
     DB.save(log);
   }
 
-}
\ No newline at end of file
+}

From 9ea55052147932f5b71a8437f89b53a095060019 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 24 Jan 2021 17:40:13 +1300
Subject: [PATCH 071/447] Bump to ebean agent 12.6.6

---
 ebean-bom/pom.xml                  | 4 ++--
 ebean-core/pom.xml                 | 2 +-
 ebean-ddl-generator/pom.xml        | 2 +-
 kotlin-querybean-generator/pom.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 238643d19..357665578 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,8 +18,8 @@
     <ebean-migration.version>12.4.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.6.2</ebean-agent.version>
-    <ebean-maven-plugin.version>12.6.2</ebean-maven-plugin.version>
+    <ebean-agent.version>12.6.6</ebean-agent.version>
+    <ebean-maven-plugin.version>12.6.6</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index f937b3253..be3e7870a 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -301,7 +301,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.5.0</version>
+        <version>12.6.6</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 9d728036b..c50f8c4a4 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -77,7 +77,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.5.0</version>
+        <version>12.6.6</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 63019943e..311abbab8 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -144,7 +144,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.5.0</version>
+        <version>12.6.6</version>
         <executions>
           <execution>
             <id>test</id>

From 7ec5fe6a8558d441ab5092879beb3524899870dd Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 24 Jan 2021 17:42:38 +1300
Subject: [PATCH 072/447] [maven-release-plugin] prepare release
 ebean-parent-12.6.6

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 3fea9a758..96ada2b98 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 7eeae736a..ed237d874 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.6</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 357665578..a78c78cc4 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.6-SNAPSHOT</version>
+        <version>12.6.6</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 4c8d540d9..d3d45a2d4 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index be3e7870a..fe48156c1 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.6</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index c50f8c4a4..3122c45a1 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index a6b2bea29..a0ac86b55 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 0800a6ead..226f1c854 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.6</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 33ec03cba..37c42fe00 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 1044f1beb..5bd86b3fd 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.6</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 24aec559a..a99766abf 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index a5b06f567..2b48a0e80 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.6</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 717e60f74..e61c19f3c 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 311abbab8..b7c41f940 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6-SNAPSHOT</version>
+      <version>12.6.6</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index c37643e30..7e59aad5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.6-SNAPSHOT</version>
+  <version>12.6.6</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.6</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 76b38c320..eb36ba675 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6-SNAPSHOT</version>
+    <version>12.6.6</version>
   </parent>
 
   <name>querybean generator</name>

From fca54dbbe32e98683f4e4a7db6b3467de765013b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 24 Jan 2021 17:42:50 +1300
Subject: [PATCH 073/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 96ada2b98..4150e1cb3 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index ed237d874..95e695ce8 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.6</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index a78c78cc4..b3b611006 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.6</version>
+        <version>12.6.7-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index d3d45a2d4..18e8f5bb8 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index fe48156c1..1c5a407b8 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.6</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 3122c45a1..c6039a3ca 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index a0ac86b55..b7229936c 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 226f1c854..d6fe25f67 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.6</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 37c42fe00..23f8507e5 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 5bd86b3fd..1ad6f044f 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.6</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index a99766abf..68c9e2d98 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 2b48a0e80..7eb65fb64 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.6</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index e61c19f3c..5732d2910 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index b7c41f940..5d6336d29 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.6</version>
+      <version>12.6.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 7e59aad5f..c9e885454 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.6</version>
+  <version>12.6.7-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.6</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index eb36ba675..52c966bea 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.6</version>
+    <version>12.6.7-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 0be98d798924b8fedfa94ab0124f1f5a8b266fef Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 3 Feb 2021 14:51:42 +1300
Subject: [PATCH 074/447] Fix to only cancel query once  (#2152)

Change DefaultOrmQuery.cancel() to call underlying jdbc cancel once

- Refactor tidy already cancelled check (pre query execution)
- Remove unnecessary extra transaction.end() call on future query execution (as already handled by CallableQueryList etc)
---
 .../io/ebeaninternal/server/query/CQuery.java | 24 +++++--------------
 .../server/query/CQueryEngine.java            |  6 -----
 .../server/querydefn/DefaultOrmQuery.java     | 14 ++---------
 .../tests/query/TestQueryFindFutureList.java  | 20 +++++++++-------
 4 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index f92960419..861ccc337 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -296,10 +296,10 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
       this.cancelled = true;
       if (pstmt != null) {
         try {
+          logger.debug("Cancelling query");
           pstmt.cancel();
         } catch (SQLException e) {
-          String msg = "Error cancelling query";
-          throw new PersistenceException(msg, e);
+          throw new PersistenceException("Error cancelling query", e);
         }
       }
     } finally {
@@ -322,7 +322,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   private boolean prepareBindExecuteQueryWithOption(boolean forwardOnlyHint) throws SQLException {
-
     ResultSet resultSet = prepareResultSet(forwardOnlyHint);
     if (resultSet == null) {
       return false;
@@ -334,19 +333,12 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   ResultSet prepareResultSet(boolean forwardOnlyHint) throws SQLException {
     lock.lock();
     try {
-      if (cancelled || query.isCancelled()) {
-        // cancelled before we started
-        cancelled = true;
-        return null;
+      if (cancelled) {
+        throw new SQLException("Query cancelled");
       }
-
       startNano = System.nanoTime();
-
-      // prepare
       SpiTransaction t = request.getTransaction();
       profileOffset = t.profileOffset();
-      Connection conn = t.getInternalConnection();
-
       if (query.isRawSql()) {
         ResultSet suppliedResultSet = query.getRawSql().getResultSet();
         if (suppliedResultSet != null) {
@@ -356,6 +348,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
         }
       }
 
+      Connection conn = t.getInternalConnection();
       if (forwardOnlyHint) {
         // Use forward only hints for large resultSet processing (Issue 56, MySql specific)
         pstmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
@@ -363,18 +356,13 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
       } else {
         pstmt = conn.prepareStatement(sql);
       }
-
       if (query.getTimeout() > 0) {
         pstmt.setQueryTimeout(query.getTimeout());
       }
       if (query.getBufferFetchSizeHint() > 0) {
         pstmt.setFetchSize(query.getBufferFetchSizeHint());
       }
-
-      DataBind dataBind = queryPlan.bindEncryptedProperties(pstmt, conn);
-      bindLog = predicates.bind(dataBind);
-
-      // executeQuery
+      bindLog = predicates.bind(queryPlan.bindEncryptedProperties(pstmt, conn));
       return pstmt.executeQuery();
     } finally {
       lock.unlock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index f462050fb..945b343ca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -401,12 +401,6 @@ public class CQueryEngine {
       if (cquery != null) {
         cquery.close();
       }
-      if (request.getQuery().isFutureFetch()) {
-        // end the transaction for futureFindIds
-        // as it had it's own transaction
-        logger.debug("Future fetch completed!");
-        request.getTransaction().end();
-      }
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 39d7b350d..2f73bceb7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -751,7 +751,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public NaturalKeyQueryData<T> naturalKey() {
-
     if (whereExpressions == null) {
       return null;
     }
@@ -767,7 +766,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
         return null;
       }
     }
-
     return data;
   }
 
@@ -815,7 +813,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.m2mIncludeJoin = m2mIncludeJoin;
     copy.profilingListener = profilingListener;
     copy.profileLocation = profileLocation;
-
     copy.baseTable = baseTable;
     copy.rootTableAlias = rootTableAlias;
     copy.distinct = distinct;
@@ -1100,7 +1097,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public ObjectGraphNode setOrigin(CallOrigin callOrigin) {
-
     // create a 'origin' which links this query to the profiling information
     ObjectGraphOrigin o = new ObjectGraphOrigin(calculateOriginQueryHash(), callOrigin, beanType.getName());
     parentNode = new ObjectGraphNode(o, null);
@@ -1241,7 +1237,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    */
   @Override
   public CQueryPlanKey prepare(SpiOrmQueryRequest<T> request) {
-
     prepareExpressions(request);
     prepareForPaging();
     queryPlanKey = createQueryPlanKey();
@@ -1252,7 +1247,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * Prepare the expressions (compile sub-queries etc).
    */
   private void prepareExpressions(BeanQueryRequest<?> request) {
-
     if (whereExpressions != null) {
       whereExpressions.prepareExpression(request);
     }
@@ -1267,7 +1261,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * case, this is not a distinct query
    */
   private void prepareForPaging() {
-
     // add the rawSql statement - if any
     if (orderByIsEmpty()) {
       if (rawSql != null && rawSql.getSql() != null) {
@@ -1678,7 +1671,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
         return this;
       }
     }
-
     if (bindParams == null) {
       bindParams = new BindParams();
     }
@@ -1972,7 +1964,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (namedParams == null) {
       namedParams = new HashMap<>();
     }
-
     return namedParams.computeIfAbsent(name, ONamedParam::new);
   }
 
@@ -2066,8 +2057,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   public void cancel() {
     lock.lock();
     try {
-      cancelled = true;
-      if (cancelableQuery != null) {
+      if (!cancelled && cancelableQuery != null) {
+        cancelled = true;
         cancelableQuery.cancel();
       }
     } finally {
@@ -2095,7 +2086,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    */
   @Override
   public Set<String> validate(BeanType<T> desc) {
-
     SpiExpressionValidation validation = new SpiExpressionValidation(desc);
     if (whereExpressions != null) {
       whereExpressions.validate(validation);
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java
index 6fb623e06..074603e41 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java
@@ -1,7 +1,7 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.FutureList;
 import io.ebean.Transaction;
 import org.tests.model.basic.Order;
@@ -22,17 +22,19 @@ public class TestQueryFindFutureList extends BaseTestCase {
     ResetBasicData.reset();
 
     // warm the connection pool
-    Transaction t0 = Ebean.getServer(null).createTransaction();
-    Transaction t1 = Ebean.getServer(null).createTransaction();
-    Transaction t2 = Ebean.getServer(null).createTransaction();
+    Transaction t0 = DB.createTransaction();
+    Transaction t1 = DB.createTransaction();
+    Transaction t2 = DB.createTransaction();
     t0.end();
     t1.end();
     t2.end();
 
-    FutureList<Order> futureList = Ebean.find(Order.class).findFutureList();
+    FutureList<Order> futureList = DB.find(Order.class).findFutureList();
 
     Thread.sleep(10);
     futureList.cancel(true);
+    // calling again is ignored
+    futureList.cancel(true);
 
     // don't shutdown immediately
     Thread.sleep(50);
@@ -43,12 +45,12 @@ public class TestQueryFindFutureList extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    FutureList<Order> futureList = Ebean.find(Order.class).findFutureList();
+    FutureList<Order> futureList = DB.find(Order.class).findFutureList();
 
     // wait for it to complete
     List<Order> orders = futureList.getUnchecked();
 
-    assertEquals(Ebean.find(Order.class).findCount(), orders.size());
+    assertEquals(DB.find(Order.class).findCount(), orders.size());
   }
 
   @Test
@@ -56,12 +58,12 @@ public class TestQueryFindFutureList extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    FutureList<Order> futureList = Ebean.find(Order.class).findFutureList();
+    FutureList<Order> futureList = DB.find(Order.class).findFutureList();
 
     // wait for it to complete
     List<Order> orders = futureList.getUnchecked(1, TimeUnit.SECONDS);
 
-    assertEquals(Ebean.find(Order.class).findCount(), orders.size());
+    assertEquals(DB.find(Order.class).findCount(), orders.size());
   }
 
 }

From dd080c5933fce8f7a63481a47a91482ae41a5ce8 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Feb 2021 15:19:34 +1300
Subject: [PATCH 075/447] Test only change - refactor update TestBeanState

---
 .../org/tests/batchload/TestBeanState.java    | 73 ++++++++++++++++++
 .../org/tests/batchload/TestLoadOnDirty.java  | 74 -------------------
 2 files changed, 73 insertions(+), 74 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/batchload/TestBeanState.java
 delete mode 100644 ebean-core/src/test/java/org/tests/batchload/TestLoadOnDirty.java

diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java
new file mode 100644
index 000000000..0d2c2b60f
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java
@@ -0,0 +1,73 @@
+package org.tests.batchload;
+
+import io.ebean.BaseTestCase;
+import io.ebean.BeanState;
+import io.ebean.DB;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+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;
+import static org.junit.Assert.*;
+
+
+public class TestBeanState extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    ResetBasicData.reset();
+
+    List<Customer> custs = DB.find(Customer.class).findList();
+
+    Customer customer = DB.find(Customer.class).setId(custs.get(0).getId()).select("name")
+      .setUseCache(false)
+      .findOne();
+
+    BeanState beanState = DB.getBeanState(customer);
+    assertFalse(beanState.isNew());
+    assertFalse(beanState.isDirty());
+    assertFalse(beanState.isNewOrDirty());
+    assertNotNull(beanState.getLoadedProps());
+
+    customer.setName("dirtyNameProp");
+    assertTrue(beanState.isDirty());
+    assertThat(beanState.getChangedProps()).containsOnly("name");
+
+    EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept();
+    boolean[] dirtyProperties = ebi.getDirtyProperties();
+    for (int i = 0; i < dirtyProperties.length; i++) {
+      if (dirtyProperties[i]) {
+        String dirtyPropertyName = ebi.getProperty(i);
+        assertEquals("name", dirtyPropertyName);
+      }
+    }
+
+    customer.setStatus(Customer.Status.INACTIVE);
+
+    assertTrue(beanState.isDirty());
+    assertThat(beanState.getChangedProps()).containsOnly("name", "status");
+  }
+
+  @Test
+  public void setDisableLazyLoad_expect_lazyLoadingDisabled() {
+
+    ResetBasicData.reset();
+
+    List<Customer> custs = DB.find(Customer.class).order("id").findList();
+
+    Customer customer = DB.find(Customer.class)
+      .setId(custs.get(0).getId())
+      .select("id")
+      .setUseCache(false)
+      .findOne();
+
+    BeanState beanState = DB.getBeanState(customer);
+    beanState.setDisableLazyLoad(true);
+    assertNull(customer.getName());
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLoadOnDirty.java b/ebean-core/src/test/java/org/tests/batchload/TestLoadOnDirty.java
deleted file mode 100644
index 67d35f440..000000000
--- a/ebean-core/src/test/java/org/tests/batchload/TestLoadOnDirty.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.tests.batchload;
-
-import io.ebean.BaseTestCase;
-import io.ebean.BeanState;
-import io.ebean.Ebean;
-import io.ebean.bean.EntityBean;
-import io.ebean.bean.EntityBeanIntercept;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.List;
-
-public class TestLoadOnDirty extends BaseTestCase {
-
-  @Test
-  public void test() {
-
-    ResetBasicData.reset();
-
-    List<Customer> custs = Ebean.find(Customer.class).findList();
-
-    Customer customer = Ebean.find(Customer.class).setId(custs.get(0).getId()).select("name")
-      .setUseCache(false)
-      .findOne();
-
-    BeanState beanState = Ebean.getBeanState(customer);
-    Assert.assertTrue(!beanState.isNew());
-    Assert.assertTrue(!beanState.isDirty());
-    Assert.assertTrue(!beanState.isNewOrDirty());
-    Assert.assertNotNull(beanState.getLoadedProps());
-
-    customer.setName("dirtyNameProp");
-    Assert.assertTrue(beanState.isDirty());
-    Assert.assertTrue(beanState.getChangedProps().contains("name"));
-    Assert.assertEquals(1, beanState.getChangedProps().size());
-
-    EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept();
-    boolean[] dirtyProperties = ebi.getDirtyProperties();
-    for (int i = 0; i < dirtyProperties.length; i++) {
-      if (dirtyProperties[i]) {
-        String dirtyPropertyName = ebi.getProperty(i);
-        Assert.assertEquals("name", dirtyPropertyName);
-      }
-    }
-
-    customer.setStatus(Customer.Status.INACTIVE);
-
-    Assert.assertTrue(beanState.isDirty());
-    Assert.assertTrue(beanState.getChangedProps().contains("status"));
-    Assert.assertTrue(beanState.getChangedProps().contains("name"));
-    Assert.assertEquals(2, beanState.getChangedProps().size());
-
-  }
-
-  @Test
-  public void testDisableLazyLoad() {
-
-    ResetBasicData.reset();
-
-    List<Customer> custs = Ebean.find(Customer.class).order("id").findList();
-
-    Customer customer = Ebean.find(Customer.class)
-      .setId(custs.get(0).getId())
-      .select("id")
-      .setUseCache(false)
-      .findOne();
-
-    BeanState beanState = Ebean.getBeanState(customer);
-    beanState.setDisableLazyLoad(true);
-    Assert.assertNull(customer.getName());
-  }
-}

From d57657c2091be6e70af9154a4adc9734b90bcc34 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Feb 2021 15:45:19 +1300
Subject: [PATCH 076/447] #2127 - Fix for - Adding a new list of children to
 @OneToMany with orphanRemoval true does not delete existing orphans

Modifies EntityBeanIntercept preSetterMany to set the changed state on the many property and use this in SaveManyBeans to detect when the existing beans need orphan removal
---
 .../io/ebean/bean/EntityBeanIntercept.java    | 10 ++-
 .../server/persist/SaveManyBeans.java         | 22 ++-----
 .../org/tests/batchload/TestBeanState.java    | 64 +++++++++++++++++++
 .../tests/cascade/TestDeleteO2MOrphans.java   |  3 +-
 4 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index b49c6f8ae..12f3fda8f 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -931,10 +931,14 @@ public final class EntityBeanIntercept implements Serializable {
    * OneToMany and ManyToMany only set loaded state.
    */
   public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
-    if (readOnly) {
-      throw new IllegalStateException("This bean is readOnly");
+    if (state == STATE_NEW) {
+      setLoadedProperty(propertyIndex);
+    } else {
+      if (readOnly) {
+        throw new IllegalStateException("This bean is readOnly");
+      }
+      setChangedProperty(propertyIndex);
     }
-    setLoadedProperty(propertyIndex);
   }
 
   private void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 183956ef8..f273b9dbc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -210,18 +210,6 @@ public class SaveManyBeans extends SaveManyBase {
     return true;
   }
 
-  private boolean hasNewOrDirtyBeans() {
-    if (collection == null) {
-      return false;
-    }
-    for (Object bean : collection) {
-      if (bean instanceof EntityBean && ((EntityBean) bean)._ebean_getIntercept().isNewOrDirty()) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * Collect the Id values of the details to remove 'missing children' for stateless updates.
    */
@@ -344,14 +332,18 @@ public class SaveManyBeans extends SaveManyBase {
     transaction.depth(-1);
   }
 
+  private boolean isChangedProperty() {
+    return parentBean._ebean_getIntercept().isChangedProperty(many.getPropertyIndex());
+  }
+
   private void removeAssocManyOrphans() {
     if (value == null) {
       return;
     }
     if (!(value instanceof BeanCollection<?>)) {
-//      if (!insertedParent && cascade && hasNewOrDirtyBeans()) {
-//        persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0);
-//      }
+      if (!insertedParent && cascade && isChangedProperty()) {
+        persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 0);
+      }
     } else {
       BeanCollection<?> c = (BeanCollection<?>) value;
       Set<?> modifyRemovals = c.getModifyRemovals();
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java
index 0d2c2b60f..28161dc3d 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java
@@ -9,6 +9,7 @@ import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -70,4 +71,67 @@ public class TestBeanState extends BaseTestCase {
     beanState.setDisableLazyLoad(true);
     assertNull(customer.getName());
   }
+
+  @Test
+  public void getChangedProps_when_setManyProperty() {
+
+    ResetBasicData.reset();
+
+    Customer customer = DB.find(Customer.class).order("id").setMaxRows(1).findOne();
+
+    BeanState beanState = DB.getBeanState(customer);
+    assertThat(beanState.getChangedProps()).isEmpty();
+
+    customer.setContacts(new ArrayList<>());
+    assertThat(beanState.getChangedProps()).containsOnly("contacts");
+  }
+
+  @Test
+  public void getChangedProps_when_setManyProperty_onNewBean() {
+
+    Customer customer = new Customer();
+
+    BeanState beanState = DB.getBeanState(customer);
+    assertThat(beanState.getChangedProps()).isEmpty();
+
+    // when new state, then loaded
+    customer.setContacts(new ArrayList<>());
+    assertThat(beanState.getChangedProps()).isEmpty();
+    assertThat(beanState.getLoadedProps()).containsOnly("contacts");
+
+    // set loaded state, then marked as changed
+    beanState.setLoaded();
+    customer.setContacts(new ArrayList<>());
+    assertThat(beanState.getLoadedProps()).containsOnly("contacts");
+    assertThat(beanState.getChangedProps()).containsOnly("contacts");
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void readOnly_when_setManyProperty() {
+
+    Customer customer = new Customer();
+    customer.setContacts(new ArrayList<>());
+
+    BeanState beanState = DB.getBeanState(customer);
+    beanState.setLoaded();
+    beanState.setReadOnly(true);
+
+    // act, try to mutate read only bean
+    customer.setContacts(new ArrayList<>());
+  }
+
+
+  @Test(expected = IllegalStateException.class)
+  public void readOnly_when_setProperty() {
+
+    Customer customer = new Customer();
+    customer.setName("a");
+
+    BeanState beanState = DB.getBeanState(customer);
+    beanState.setLoaded();
+    beanState.setReadOnly(true);
+
+    // act, try to mutate read only bean
+    customer.setName("b");
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
index 468187657..f4356d2bf 100644
--- a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
+++ b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java
@@ -19,8 +19,7 @@ public class TestDeleteO2MOrphans extends BaseTestCase {
 
     // assert
     COOne check = findById(id);
-    //FIXME #2127 #2141: assertThat(check.getChildren()).hasSize(2);
-    assertThat(check.getChildren()).hasSize(4);
+    assertThat(check.getChildren()).hasSize(2);
     DB.delete(check);
   }
 

From b3d439ed113727b568427581e7918016f5c7c374 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Feb 2021 13:00:50 +1300
Subject: [PATCH 077/447] Bump tile-maven-plugin to 2.19

---
 ebean-autotune/pom.xml            | 2 +-
 ebean-externalmapping-xml/pom.xml | 2 +-
 ebean-postgis/pom.xml             | 2 +-
 ebean-querybean/pom.xml           | 2 +-
 ebean-redis/pom.xml               | 2 +-
 ebean-test/pom.xml                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 95e695ce8..5892fda8e 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index d6fe25f67..7364bff24 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -84,7 +84,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 23f8507e5..1240f27fe 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -102,7 +102,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 1ad6f044f..3cd58500d 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -101,7 +101,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 68c9e2d98..35d45e38a 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 7eb65fb64..0c3632dd5 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -146,7 +146,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>

From ab9cdd8f5b89adbe85991dba4f12cf7bf5c2f809 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Feb 2021 13:52:29 +1300
Subject: [PATCH 078/447] #2153 - QueryBeans: OneToMany Map property is handled
 as PScalar instead of TQAssocBean

---
 .../java/org/example/domain/BaseModel.java    | 12 +++----
 .../test/java/org/example/domain/Contact.java | 21 ++++++------
 .../java/org/example/domain/ContactOther.java | 32 +++++++++++++++++++
 .../test/java/org/querytest/QContactTest.java | 15 +++++++++
 .../generator/ProcessingContext.java          |  9 ++++++
 .../generator/ProcessingContext.java          |  5 +++
 6 files changed, 78 insertions(+), 16 deletions(-)
 create mode 100644 ebean-querybean/src/test/java/org/example/domain/ContactOther.java
 create mode 100644 ebean-querybean/src/test/java/org/querytest/QContactTest.java

diff --git a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java
index 593aa1ce4..211d3141c 100644
--- a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java
+++ b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java
@@ -1,8 +1,8 @@
 package org.example.domain;
 
 import io.ebean.Model;
-import io.ebean.annotation.CreatedTimestamp;
-import io.ebean.annotation.UpdatedTimestamp;
+import io.ebean.annotation.WhenCreated;
+import io.ebean.annotation.WhenModified;
 
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
@@ -11,10 +11,10 @@ import java.sql.Timestamp;
 
 /**
  * Base domain object with Id, version, whenCreated and whenUpdated.
- * 
+ *
  * <p>
  * Extending Model to enable the 'active record' style.
- * 
+ *
  * <p>
  * whenCreated and whenUpdated are generally useful for maintaining external search services (like
  * elasticsearch) and audit.
@@ -28,10 +28,10 @@ public abstract class BaseModel extends Model {
   @Version
   Long version;
 
-  @CreatedTimestamp
+  @WhenCreated
   Timestamp whenCreated;
 
-  @UpdatedTimestamp
+  @WhenModified
   Timestamp whenUpdated;
 
   public Long getId() {
diff --git a/ebean-querybean/src/test/java/org/example/domain/Contact.java b/ebean-querybean/src/test/java/org/example/domain/Contact.java
index e47f66248..00035d80a 100644
--- a/ebean-querybean/src/test/java/org/example/domain/Contact.java
+++ b/ebean-querybean/src/test/java/org/example/domain/Contact.java
@@ -2,13 +2,10 @@ package org.example.domain;
 
 import io.ebean.annotation.DbArray;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Contact entity bean.
@@ -22,28 +19,32 @@ public class Contact extends BaseModel {
 
   @Column(length=50)
   String firstName;
-  
+
   @Column(length=50)
   String lastName;
-  
+
   @Column(length=200)
   String email;
 
   @Column(length=20)
   String phone;
-  
+
   @ManyToOne(optional=false)
   Customer customer;
 
   @OneToMany(mappedBy = "contact")
   List<ContactNote> notes;
 
+  @OneToMany(cascade = CascadeType.PERSIST)
+  @MapKey(name="key")
+  Map<String,ContactOther> others;
+
   /**
    * Default constructor.
    */
   public Contact() {
   }
-  
+
   /**
    * Construct with a firstName and lastName.
    */
@@ -51,7 +52,7 @@ public class Contact extends BaseModel {
     this.firstName = firstName;
     this.lastName = lastName;
   }
-  
+
   public String getFirstName() {
     return firstName;
   }
diff --git a/ebean-querybean/src/test/java/org/example/domain/ContactOther.java b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java
new file mode 100644
index 000000000..731def6d6
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java
@@ -0,0 +1,32 @@
+package org.example.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * Contact entity bean.
+ */
+@Entity
+@Table(name="be_contact_other")
+public class ContactOther extends BaseModel {
+
+  String key;
+
+  int something;
+
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(String key) {
+    this.key = key;
+  }
+
+  public int getSomething() {
+    return something;
+  }
+
+  public void setSomething(int something) {
+    this.something = something;
+  }
+}
diff --git a/ebean-querybean/src/test/java/org/querytest/QContactTest.java b/ebean-querybean/src/test/java/org/querytest/QContactTest.java
new file mode 100644
index 000000000..ff37f789e
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/querytest/QContactTest.java
@@ -0,0 +1,15 @@
+package org.querytest;
+
+import org.example.domain.query.QContact;
+import org.junit.Test;
+
+public class QContactTest {
+
+  @Test
+  public void test_oneToManyMap() {
+
+    new QContact()
+      .others.fetch()
+      .findList();
+  }
+}
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index 327f67746..dc045bcf6 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -330,6 +330,15 @@ class ProcessingContext implements Constants {
             }
           }
         }
+      } else if (typeArguments.size() == 2) {
+        TypeMirror argType = typeArguments.get(1);
+        if (argType.getKind() == TypeKind.WILDCARD) {
+          argType = ((WildcardType) argType).getExtendsBound();
+        }
+        Element argElement = typeUtils.asElement(argType);
+        if (isEntityOrEmbedded(argElement)) {
+          return createPropertyTypeAssoc(typeDef(argElement.asType()));
+        }
       }
     }
 
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index faec817bf..6e41747d0 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -341,6 +341,11 @@ class ProcessingContext implements Constants {
           }
         }
       }
+    } else if (typeArguments.size() == 2) {
+      Element argElement = typeUtils.asElement(typeArguments.get(1));
+      if (isEntityOrEmbedded(argElement)) {
+        return createPropertyTypeAssoc(typeDef(argElement.asType()));
+      }
     }
     return null;
   }

From 53aacabce7fadb4b74072e4a05ffef383c163b22 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Feb 2021 15:10:03 +1300
Subject: [PATCH 079/447] #2154 - QueryBeans: TargetEntity is not evaluated
 during bean generation resulting in bad query beans

---
 .../java/org/example/domain/AreaImpl.java     | 35 ++++++++++++++++++
 .../java/org/example/domain/CityImpl.java     | 36 +++++++++++++++++++
 .../java/org/example/domain/CountryImpl.java  | 18 ++++++++++
 .../test/java/org/querytest/TargetTest.java   | 24 +++++++++++++
 .../generator/ProcessingContext.java          | 30 +++++++---------
 .../generator/ProcessingContext.java          | 18 +++++-----
 6 files changed, 134 insertions(+), 27 deletions(-)
 create mode 100644 ebean-querybean/src/test/java/org/example/domain/AreaImpl.java
 create mode 100644 ebean-querybean/src/test/java/org/example/domain/CityImpl.java
 create mode 100644 ebean-querybean/src/test/java/org/example/domain/CountryImpl.java
 create mode 100644 ebean-querybean/src/test/java/org/querytest/TargetTest.java

diff --git a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java
new file mode 100644
index 000000000..940f9eb83
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java
@@ -0,0 +1,35 @@
+package org.example.domain;
+
+import org.example.domain.target.ACity;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Entity
+public class AreaImpl {
+
+  @Id
+  long id;
+
+  @OneToMany(targetEntity = CityImpl.class, cascade = CascadeType.ALL)
+  List<ACity> cities;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public List<ACity> getCities() {
+    return cities;
+  }
+
+  public void setCities(List<ACity> cities) {
+    this.cities = cities;
+  }
+}
diff --git a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java
new file mode 100644
index 000000000..b42949671
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java
@@ -0,0 +1,36 @@
+package org.example.domain;
+
+import org.example.domain.target.ACity;
+import org.example.domain.target.ACountry;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class CityImpl implements ACity {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ManyToOne(targetEntity = CountryImpl.class)
+  ACountry country;
+
+  @Override
+  public long id() {
+    return id;
+  }
+
+  @Override
+  public String name() {
+    return null;
+  }
+
+  @Override
+  public ACountry country() {
+    return country;
+  }
+
+}
diff --git a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java
new file mode 100644
index 000000000..ed8ac7759
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java
@@ -0,0 +1,18 @@
+package org.example.domain;
+
+import org.example.domain.target.ACountry;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class CountryImpl implements ACountry {
+
+  @Id
+  String code;
+
+  @Override
+  public String code() {
+    return code;
+  }
+}
diff --git a/ebean-querybean/src/test/java/org/querytest/TargetTest.java b/ebean-querybean/src/test/java/org/querytest/TargetTest.java
new file mode 100644
index 000000000..8e83e5c05
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/querytest/TargetTest.java
@@ -0,0 +1,24 @@
+package org.querytest;
+
+import org.example.domain.query.QAreaImpl;
+import org.example.domain.query.QCityImpl;
+import org.junit.Test;
+
+public class TargetTest {
+
+  @Test
+  public void test_oneToMany() {
+    
+    new QAreaImpl()
+      .cities.fetch()
+      .findList();
+  }
+
+  @Test
+  public void test_manyToOne() {
+
+    new QCityImpl()
+      .country.fetch()
+      .findList();
+  }
+}
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index dc045bcf6..5580c3b09 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -303,12 +303,19 @@ class ProcessingContext implements Constants {
       return new PropertyTypeEnum(fullType, Split.shortName(fullType));
     }
 
+    // look for targetEntity annotation attribute
+    final String targetEntity = readTargetEntity(field);
+    if (targetEntity != null) {
+      final TypeElement element = elementUtils.getTypeElement(targetEntity);
+      if (isEntityOrEmbedded(element)) {
+        return createPropertyTypeAssoc(typeDef(element.asType()));
+      }
+    }
     if (isEntityOrEmbedded(fieldType)) {
       //  public QAssocContact<QCustomer> contacts;
       return createPropertyTypeAssoc(typeDef(typeMirror));
     }
 
-    PropertyType result = null;
     if (typeMirror.getKind() == TypeKind.DECLARED) {
       DeclaredType declaredType = (DeclaredType) typeMirror;
       List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
@@ -319,16 +326,7 @@ class ProcessingContext implements Constants {
         }
         Element argElement = typeUtils.asElement(argType);
         if (isEntityOrEmbedded(argElement)) {
-          result = createPropertyTypeAssoc(typeDef(argElement.asType()));
-        } else {
-          // look for targetEntity annotation attribute
-          final String targetEntity = readTargetEntity(field);
-          if (targetEntity != null) {
-            final TypeElement element = elementUtils.getTypeElement(targetEntity);
-            if (isEntityOrEmbedded(element)) {
-              result = createPropertyTypeAssoc(typeDef(element.asType()));
-            }
-          }
+          return createPropertyTypeAssoc(typeDef(argElement.asType()));
         }
       } else if (typeArguments.size() == 2) {
         TypeMirror argType = typeArguments.get(1);
@@ -342,14 +340,10 @@ class ProcessingContext implements Constants {
       }
     }
 
-    if (result != null) {
-      return result;
+    if (typeInstanceOf(typeMirror, "java.lang.Comparable")) {
+      return new PropertyTypeScalarComparable(typeMirror.toString());
     } else {
-      if (typeInstanceOf(typeMirror, "java.lang.Comparable")) {
-        return new PropertyTypeScalarComparable(typeMirror.toString());
-      } else {
-        return new PropertyTypeScalar(typeMirror.toString());
-      }
+      return new PropertyTypeScalar(typeMirror.toString());
     }
   }
 
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index 6e41747d0..6eae281b6 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -286,6 +286,15 @@ class ProcessingContext implements Constants {
       return new PropertyTypeEnum(fullType, Split.shortName(fullType));
     }
 
+    // look for targetEntity annotation attribute
+    final String targetEntity = readTargetEntity(field);
+    if (targetEntity != null) {
+      final TypeElement element = elementUtils.getTypeElement(targetEntity);
+      if (isEntityOrEmbedded(element)) {
+        return createPropertyTypeAssoc(typeDef(element.asType()));
+      }
+    }
+
     if (isEntityOrEmbedded(fieldType)) {
       //  public QAssocContact<QCustomer> contacts;
       return createPropertyTypeAssoc(typeDef(typeMirror));
@@ -331,15 +340,6 @@ class ProcessingContext implements Constants {
       Element argElement = typeUtils.asElement(typeArguments.get(0));
       if (isEntityOrEmbedded(argElement)) {
         return createPropertyTypeAssoc(typeDef(argElement.asType()));
-      } else {
-        // look for targetEntity annotation attribute
-        final String targetEntity = readTargetEntity(field);
-        if (targetEntity != null) {
-          final TypeElement element = elementUtils.getTypeElement(targetEntity);
-          if (isEntityOrEmbedded(element)) {
-            return createPropertyTypeAssoc(typeDef(element.asType()));
-          }
-        }
       }
     } else if (typeArguments.size() == 2) {
       Element argElement = typeUtils.asElement(typeArguments.get(1));

From 74d907bbce3f55d9b8ef268a89486fef217664d8 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Feb 2021 15:12:28 +1300
Subject: [PATCH 080/447] Refactor kotlin querybean generator ProcessingContext
 extract asElement() method

---
 .../querybean/generator/ProcessingContext.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index 5580c3b09..b01075a53 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -321,19 +321,13 @@ class ProcessingContext implements Constants {
       List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
       if (typeArguments.size() == 1) {
         TypeMirror argType = typeArguments.get(0);
-        if (argType.getKind() == TypeKind.WILDCARD) {
-          argType = ((WildcardType) argType).getExtendsBound();
-        }
-        Element argElement = typeUtils.asElement(argType);
+        Element argElement = asElement(argType);
         if (isEntityOrEmbedded(argElement)) {
           return createPropertyTypeAssoc(typeDef(argElement.asType()));
         }
       } else if (typeArguments.size() == 2) {
         TypeMirror argType = typeArguments.get(1);
-        if (argType.getKind() == TypeKind.WILDCARD) {
-          argType = ((WildcardType) argType).getExtendsBound();
-        }
-        Element argElement = typeUtils.asElement(argType);
+        Element argElement = asElement(argType);
         if (isEntityOrEmbedded(argElement)) {
           return createPropertyTypeAssoc(typeDef(argElement.asType()));
         }
@@ -347,6 +341,13 @@ class ProcessingContext implements Constants {
     }
   }
 
+  private Element asElement(TypeMirror argType) {
+    if (argType.getKind() == TypeKind.WILDCARD) {
+      argType = ((WildcardType) argType).getExtendsBound();
+    }
+    return typeUtils.asElement(argType);
+  }
+
   private boolean typeInstanceOf(final TypeMirror typeMirror, final CharSequence desiredInterface) {
     TypeElement typeElement = (TypeElement) typeUtils.asElement(typeMirror);
     if (typeElement == null || typeElement.getQualifiedName().contentEquals("java.lang.Object")) {

From 2672dff51203a4d07165a32c6c1132e3a75df1ef Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Feb 2021 15:28:55 +1300
Subject: [PATCH 081/447] #2155 - QueryBeans: Change to use own @Generated with
 retention RUNTIME

---
 .../java/io/ebean/typequery/Generated.java    | 22 ++++++++++++++++++
 .../ebean/querybean/generator/Constants.java  |  5 +---
 .../generator/ProcessingContext.java          | 19 ---------------
 .../generator/SimpleModuleInfoWriter.java     |  9 ++------
 .../generator/SimpleQueryBeanWriter.java      | 14 +++--------
 .../ebean/querybean/generator/Constants.java  |  6 ++---
 .../generator/ProcessingContext.java          | 23 -------------------
 .../generator/SimpleModuleInfoWriter.java     |  9 ++------
 .../generator/SimpleQueryBeanWriter.java      | 13 +++--------
 9 files changed, 35 insertions(+), 85 deletions(-)
 create mode 100644 ebean-querybean/src/main/java/io/ebean/typequery/Generated.java

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java b/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java
new file mode 100644
index 000000000..918e0d1b4
--- /dev/null
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java
@@ -0,0 +1,22 @@
+package io.ebean.typequery;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks generated query bean source code.
+ * <p>
+ * This is code generated by the query bean generator (annotation processor).
+ */
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Generated {
+
+  /**
+   * The name of the generator used to generate this source.
+   */
+  String value();
+
+}
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
index 79827d405..e0431f9b0 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
@@ -3,11 +3,8 @@ package io.ebean.querybean.generator;
 interface Constants {
 
   String AT_GENERATED = "@Generated(\"io.ebean.querybean.kotlin-generator\")";
-
   String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")";
-
-  String GENERATED_9 = "javax.annotation.processing.Generated";
-  String GENERATED_8 = "javax.annotation.Generated";
+  String GENERATED = "io.ebean.typequery.Generated";
 
   String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass";
   String INHERITANCE = "javax.persistence.Inheritance";
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index b01075a53..d08242ef4 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -50,7 +50,6 @@ class ProcessingContext implements Constants {
   private final Filer filer;
   private final Messager messager;
   private final Elements elementUtils;
-  private final String generatedAnnotation;
 
   private final PropertyTypeMap propertyTypeMap = new PropertyTypeMap();
 
@@ -99,9 +98,6 @@ class ProcessingContext implements Constants {
     this.filer = processingEnv.getFiler();
     this.messager = processingEnv.getMessager();
     this.elementUtils = processingEnv.getElementUtils();
-
-    boolean jdk8 = processingEnv.getSourceVersion().compareTo(SourceVersion.RELEASE_8) <= 0;
-    this.generatedAnnotation = generatedAnnotation(jdk8);
     this.generatedSources = initGeneratedSources(processingEnv);
     this.readModuleInfo = new ReadModuleInfo(this);
   }
@@ -122,13 +118,6 @@ class ProcessingContext implements Constants {
     return elementUtils.getTypeElement(EBEAN_COMPONENT);
   }
 
-  private String generatedAnnotation(boolean jdk8) {
-    if (jdk8) {
-      return isTypeAvailable(GENERATED_8) ? GENERATED_8 : null;
-    }
-    return isTypeAvailable(GENERATED_9) ? GENERATED_9 : null;
-  }
-
   private String initGeneratedSources(ProcessingEnvironment processingEnv) {
     String generatedDir = processingEnv.getOptions().get("kapt.kotlin.generated");
     return (generatedDir != null) ? generatedDir : "target/generated-sources/kapt/compile";
@@ -430,14 +419,6 @@ class ProcessingContext implements Constants {
     messager.printMessage(Diagnostic.Kind.NOTE, String.format(msg, args));
   }
 
-  boolean isGeneratedAvailable() {
-    return generatedAnnotation != null;
-  }
-
-  String getGeneratedAnnotation() {
-    return generatedAnnotation;
-  }
-
   void readModuleInfo() {
     String factory = loadMetaInfServices();
     if (factory != null) {
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index a8f734968..926aad8ae 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -90,10 +90,7 @@ class SimpleModuleInfoWriter {
     writer.append("import java.util.ArrayList;").eol();
     writer.append("import java.util.Collections;").eol();
     writer.append("import java.util.List;").eol();
-    final String generated = processingContext.getGeneratedAnnotation();
-    if (generated != null) {
-      writer.append("import %s;", generated).eol();
-    }
+    writer.append("import %s;", Constants.GENERATED).eol();
     writer.eol();
     writer.append("import io.ebean.config.ModuleInfo;").eol();
     writer.append("import io.ebean.config.ModuleInfoLoader;").eol();
@@ -102,9 +99,7 @@ class SimpleModuleInfoWriter {
   }
 
   void buildAtContextModule(Append writer) {
-    if (processingContext.isGeneratedAvailable()) {
-      writer.append(Constants.AT_GENERATED).eol();
-    }
+    writer.append(Constants.AT_GENERATED).eol();
     writer.append("@ModuleInfo(");
     if (processingContext.hasOtherClasses()) {
       writer.append("other={%s}, ", otherClasses());
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
index 7c5fb4ba8..8524a59f9 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
@@ -88,11 +88,7 @@ class SimpleQueryBeanWriter {
   }
 
   private void gatherPropertyDetails() {
-
-    final String generated = processingContext.getGeneratedAnnotation();
-    if (generated != null) {
-      importTypes.add(generated);
-    }
+    importTypes.add(Constants.GENERATED);
     importTypes.add(beanFullName);
     importTypes.add(Constants.TQROOTBEAN);
     importTypes.add(Constants.TYPEQUERYBEAN);
@@ -282,9 +278,7 @@ class SimpleQueryBeanWriter {
       writer.append(" * ").eol();
       writer.append(" * THIS IS A GENERATED OBJECT, DO NOT MODIFY THIS CLASS.").eol();
       writer.append(" */").eol();
-      if (processingContext.isGeneratedAvailable()) {
-        writer.append(Constants.AT_GENERATED).eol();
-      }
+      writer.append(Constants.AT_GENERATED).eol();
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
       lang().beginAssocClass(writer, shortName, origShortName);
 
@@ -294,9 +288,7 @@ class SimpleQueryBeanWriter {
       writer.append(" * ").eol();
       writer.append(" * THIS IS A GENERATED OBJECT, DO NOT MODIFY THIS CLASS.").eol();
       writer.append(" */").eol();
-      if (processingContext.isGeneratedAvailable()) {
-        writer.append(Constants.AT_GENERATED).eol();
-      }
+      writer.append(Constants.AT_GENERATED).eol();
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
       lang().beginClass(writer, shortName);
     }
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
index 959c08721..2b27a034c 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
@@ -5,9 +5,7 @@ interface Constants {
   String AT_GENERATED = "@Generated(\"io.ebean.querybean.generator\")";
 
   String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")";
-
-  String GENERATED_9 = "javax.annotation.processing.Generated";
-  String GENERATED_8 = "javax.annotation.Generated";
+  String GENERATED = "io.ebean.typequery.Generated";
 
   String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass";
   String INHERITANCE = "javax.persistence.Inheritance";
@@ -35,4 +33,4 @@ interface Constants {
   String METAINF_MANIFEST = "META-INF/ebean-generated-info.mf";
   String METAINF_SERVICES_MODULELOADER = "META-INF/services/io.ebean.config.ModuleInfoLoader";
 
-}
\ No newline at end of file
+}
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index 6eae281b6..fe73814e2 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -46,7 +46,6 @@ class ProcessingContext implements Constants {
   private final Filer filer;
   private final Messager messager;
   private final Elements elementUtils;
-  private final String generatedAnnotation;
 
   private final PropertyTypeMap propertyTypeMap = new PropertyTypeMap();
 
@@ -95,9 +94,6 @@ class ProcessingContext implements Constants {
     this.filer = processingEnv.getFiler();
     this.messager = processingEnv.getMessager();
     this.elementUtils = processingEnv.getElementUtils();
-
-    boolean jdk8 = processingEnv.getSourceVersion().compareTo(SourceVersion.RELEASE_8) <= 0;
-    this.generatedAnnotation = generatedAnnotation(jdk8);
     this.readModuleInfo = new ReadModuleInfo(this);
   }
 
@@ -117,17 +113,6 @@ class ProcessingContext implements Constants {
     return elementUtils.getTypeElement(EBEAN_COMPONENT);
   }
 
-  private String generatedAnnotation(boolean jdk8) {
-    if (jdk8) {
-      return isTypeAvailable(GENERATED_8) ? GENERATED_8 : null;
-    }
-    return isTypeAvailable(GENERATED_9) ? GENERATED_9 : null;
-  }
-
-  private boolean isTypeAvailable(String canonicalName) {
-    return null != elementUtils.getTypeElement(canonicalName);
-  }
-
   /**
    * Gather all the fields (properties) for the given bean element.
    */
@@ -413,14 +398,6 @@ class ProcessingContext implements Constants {
     messager.printMessage(Diagnostic.Kind.NOTE, String.format(msg, args));
   }
 
-  boolean isGeneratedAvailable() {
-    return generatedAnnotation != null;
-  }
-
-  String getGeneratedAnnotation() {
-    return generatedAnnotation;
-  }
-
   void readModuleInfo() {
     String factory = loadMetaInfServices();
     if (factory != null) {
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index c48896a50..b9c1b606e 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -89,10 +89,7 @@ class SimpleModuleInfoWriter {
     writer.append("import java.util.ArrayList;").eol();
     writer.append("import java.util.Collections;").eol();
     writer.append("import java.util.List;").eol();
-    final String generated = processingContext.getGeneratedAnnotation();
-    if (generated != null) {
-      writer.append("import %s;", generated).eol();
-    }
+    writer.append("import %s;", Constants.GENERATED).eol();
     writer.eol();
     writer.append("import io.ebean.config.ModuleInfo;").eol();
     writer.append("import io.ebean.config.ModuleInfoLoader;").eol();
@@ -100,9 +97,7 @@ class SimpleModuleInfoWriter {
   }
 
   void buildAtContextModule(Append writer) {
-    if (processingContext.isGeneratedAvailable()) {
-      writer.append(Constants.AT_GENERATED).eol();
-    }
+    writer.append(Constants.AT_GENERATED).eol();
     writer.append("@ModuleInfo(");
     if (processingContext.hasOtherClasses()) {
       writer.append("other={%s}, ", otherClasses());
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
index a54ddc840..78fd99779 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
@@ -62,10 +62,7 @@ class SimpleQueryBeanWriter {
   }
 
   private void gatherPropertyDetails() {
-    final String generated = processingContext.getGeneratedAnnotation();
-    if (generated != null) {
-      importTypes.add(generated);
-    }
+    importTypes.add(Constants.GENERATED);
     importTypes.add(beanFullName);
     importTypes.add(Constants.TQROOTBEAN);
     importTypes.add(Constants.TYPEQUERYBEAN);
@@ -301,9 +298,7 @@ class SimpleQueryBeanWriter {
       writer.append(" * ").eol();
       writer.append(" * THIS IS A GENERATED OBJECT, DO NOT MODIFY THIS CLASS.").eol();
       writer.append(" */").eol();
-      if (processingContext.isGeneratedAvailable()) {
-        writer.append(Constants.AT_GENERATED).eol();
-      }
+      writer.append(Constants.AT_GENERATED).eol();
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
       writer.append("public class Q%s<R> extends TQAssocBean<%s,R> {", shortName, origShortName).eol();
 
@@ -313,9 +308,7 @@ class SimpleQueryBeanWriter {
       writer.append(" * ").eol();
       writer.append(" * THIS IS A GENERATED OBJECT, DO NOT MODIFY THIS CLASS.").eol();
       writer.append(" */").eol();
-      if (processingContext.isGeneratedAvailable()) {
-        writer.append(Constants.AT_GENERATED).eol();
-      }
+      writer.append(Constants.AT_GENERATED).eol();
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
       writer.append("public class Q%s extends TQRootBean<%1$s,Q%1$s> {", shortName).eol();
     }

From 8ecc407cb0a04320adedeeedc1eda72989430f03 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Feb 2021 19:25:42 +1300
Subject: [PATCH 082/447] #2154 - Fix tests for QueryBeans: TargetEntity is not
 evaluated during bean generation resulting in bad query beans

---
 .../src/test/java/org/example/domain/AreaImpl.java     |  2 +-
 .../src/test/java/org/example/domain/CityImpl.java     |  4 ++--
 .../src/test/java/org/example/domain/CountryImpl.java  |  2 +-
 .../src/test/java/org/example/domain/api/ACity.java    | 10 ++++++++++
 .../src/test/java/org/example/domain/api/ACountry.java |  5 +++++
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 ebean-querybean/src/test/java/org/example/domain/api/ACity.java
 create mode 100644 ebean-querybean/src/test/java/org/example/domain/api/ACountry.java

diff --git a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java
index 940f9eb83..2ae8785d2 100644
--- a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java
+++ b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java
@@ -1,6 +1,6 @@
 package org.example.domain;
 
-import org.example.domain.target.ACity;
+import org.example.domain.api.ACity;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
diff --git a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java
index b42949671..643914429 100644
--- a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java
+++ b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java
@@ -1,7 +1,7 @@
 package org.example.domain;
 
-import org.example.domain.target.ACity;
-import org.example.domain.target.ACountry;
+import org.example.domain.api.ACity;
+import org.example.domain.api.ACountry;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java
index ed8ac7759..6f8797df8 100644
--- a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java
+++ b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java
@@ -1,6 +1,6 @@
 package org.example.domain;
 
-import org.example.domain.target.ACountry;
+import org.example.domain.api.ACountry;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/ebean-querybean/src/test/java/org/example/domain/api/ACity.java b/ebean-querybean/src/test/java/org/example/domain/api/ACity.java
new file mode 100644
index 000000000..b72fa1f18
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/example/domain/api/ACity.java
@@ -0,0 +1,10 @@
+package org.example.domain.api;
+
+public interface ACity {
+
+  long id();
+
+  String name();
+
+  ACountry country();
+}
diff --git a/ebean-querybean/src/test/java/org/example/domain/api/ACountry.java b/ebean-querybean/src/test/java/org/example/domain/api/ACountry.java
new file mode 100644
index 000000000..4a9541a3d
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/example/domain/api/ACountry.java
@@ -0,0 +1,5 @@
+package org.example.domain.api;
+
+public interface ACountry {
+  String code();
+}

From bc33e059062b90d167573c421a216930cf075216 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 11 Feb 2021 17:20:28 +1300
Subject: [PATCH 083/447] #2158 - Oracle - automatic platform selection doesn't
 select older Oracle11Platform via jdbc metadata major version

---
 .../ebeaninternal/server/core/DatabasePlatformFactory.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 18c1051a0..55cf5b19a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -157,7 +157,7 @@ public class DatabasePlatformFactory {
     final int minorVersion = metaData.getDatabaseMinorVersion();
 
     if (dbProductName.contains("oracle")) {
-      return new OraclePlatform();
+      return oracleVersion(majorVersion);
     } else if (dbProductName.contains("microsoft")) {
       throw new IllegalArgumentException("For SqlServer please explicitly choose either sqlserver16 or sqlserver17 as the platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for more details");
     } else if (dbProductName.contains("h2")) {
@@ -188,6 +188,10 @@ public class DatabasePlatformFactory {
     return new DatabasePlatform();
   }
 
+  private DatabasePlatform oracleVersion(int majorVersion) {
+    return majorVersion < 12 ? new Oracle11Platform() : new OraclePlatform();
+  }
+
   private DatabasePlatform mysqlVersion(int majorVersion, int minorVersion) {
     if (majorVersion <= 5 && minorVersion <= 5) {
       return new MySql55Platform();

From ac1dd4cbabc6db4d5cfa29a9e87842362fb72a86 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 11 Feb 2021 17:28:05 +1300
Subject: [PATCH 084/447] #2158 Refactor to use try with resources with
 Connection for platform selection via jdbc metaData

---
 .../server/core/DatabasePlatformFactory.java        | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 55cf5b19a..a96907848 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -131,19 +131,10 @@ public class DatabasePlatformFactory {
    * Use JDBC DatabaseMetaData to determine the platform.
    */
   private DatabasePlatform byDataSource(DataSource dataSource) {
-
-    Connection connection = null;
-    try {
-      connection = dataSource.getConnection();
-      DatabaseMetaData metaData = connection.getMetaData();
-
-      return byDatabaseMeta(metaData, connection);
-
+    try (Connection connection = dataSource.getConnection()) {
+      return byDatabaseMeta(connection.getMetaData(), connection);
     } catch (SQLException ex) {
       throw new PersistenceException(ex);
-
-    } finally {
-      JdbcClose.close(connection);
     }
   }
 

From d3a09b93c02f585d3aaff29bd096d37bd5828e66 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Feb 2021 16:30:28 +1300
Subject: [PATCH 085/447] #2156 - Using @OneToOne(targetEntity...) with
 Interface field results in BeanNotRegisteredException (#2160)

---
 .../deploy/meta/DeployBeanPropertyAssoc.java  |  5 +++
 .../meta/DeployBeanPropertyAssocMany.java     | 13 -------
 .../server/deploy/parse/AnnotationAssoc.java  | 39 +++++++++++++++++++
 .../deploy/parse/AnnotationAssocManys.java    | 29 +-------------
 .../deploy/parse/AnnotationAssocOnes.java     | 32 ++++-----------
 .../deploy/parse/DeployCreateProperties.java  |  8 ----
 .../org/tests/basic/TestManyOneInterface.java |  2 +-
 .../org/tests/model/interfaces/Address.java   |  4 ++
 .../org/tests/model/interfaces/IPersona.java  |  6 +++
 .../org/tests/model/interfaces/Persona.java   | 39 +++++++++++++++++++
 .../model/interfaces/TestTargetEntity.java    | 38 ++++++++++++++++++
 11 files changed, 142 insertions(+), 73 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/interfaces/Persona.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
index a7e060004..472a71db3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
@@ -176,4 +176,9 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
   public void setFetchPreference(int fetchPreference) {
     this.fetchPreference = fetchPreference;
   }
+
+  @SuppressWarnings("unchecked")
+  public void setTargetType(Class<?> targetType) {
+    this.targetType = (Class<T>)targetType;
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index 7ed3ff164..606a6d215 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -65,19 +65,6 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
     this.manyType = manyType;
   }
 
-  /**
-   * When generics is not used for manyType you can specify via annotations.
-   * <p>
-   * Really only expect this for Scala due to a Scala compiler bug at the moment.
-   * Otherwise I'd probably not bother support this.
-   * </p>
-   */
-  @SuppressWarnings("unchecked")
-  public void setTargetType(Class<?> cls) {
-    this.targetType = (Class<T>) cls;
-  }
-
-
   /**
    * Return the many type.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java
new file mode 100644
index 000000000..525034f41
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssoc.java
@@ -0,0 +1,39 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import io.ebean.config.BeanNotRegisteredException;
+import io.ebeaninternal.server.deploy.BeanDescriptorManager;
+import io.ebeaninternal.server.deploy.BeanTable;
+import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
+
+abstract class AnnotationAssoc extends AnnotationParser {
+
+  final BeanDescriptorManager factory;
+
+  AnnotationAssoc(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig, BeanDescriptorManager factory) {
+    super(info, readConfig);
+    this.factory = factory;
+  }
+
+  void setTargetType(Class<?> targetType, DeployBeanPropertyAssoc<?> prop) {
+    if (!targetType.equals(void.class)) {
+      prop.setTargetType(targetType);
+    }
+  }
+
+  void setBeanTable(DeployBeanPropertyAssoc<?> prop) {
+    BeanTable assoc = getBeanTable(prop);
+    if (assoc == null) {
+      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(prop.getTargetType(), prop.getFullBeanName()));
+    }
+    prop.setBeanTable(assoc);
+  }
+
+  BeanTable getBeanTable(DeployBeanPropertyAssoc<?> prop) {
+    return factory.getBeanTable(prop.getTargetType());
+  }
+
+  private String errorMsgMissingBeanTable(Class<?> type, String from) {
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? See https://ebean.io/docs/trouble-shooting#not-registered";
+  }
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index e0dae8abc..91c949a0f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -44,16 +44,10 @@ import static io.ebean.util.StringHelper.isNull;
 /**
  * Read the deployment annotation for Assoc Many beans.
  */
-class AnnotationAssocManys extends AnnotationParser {
+class AnnotationAssocManys extends AnnotationAssoc {
 
-  private final BeanDescriptorManager factory;
-
-  /**
-   * Create with the DeployInfo.
-   */
   AnnotationAssocManys(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig, BeanDescriptorManager factory) {
-    super(info, readConfig);
-    this.factory = factory;
+    super(info, readConfig, factory);
   }
 
   /**
@@ -435,11 +429,6 @@ class AnnotationAssocManys extends AnnotationParser {
     prop.setInverseJoin(inverseDest);
   }
 
-
-  private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    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) {
 
     manyProp.setMappedBy(propAnn.mappedBy());
@@ -462,20 +451,6 @@ class AnnotationAssocManys extends AnnotationParser {
     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());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 8d4d178f1..6750633cb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -33,18 +33,15 @@ import javax.validation.constraints.NotNull;
 /**
  * Read the deployment annotations for Associated One beans.
  */
-public class AnnotationAssocOnes extends AnnotationParser {
+public class AnnotationAssocOnes extends AnnotationAssoc {
 
   private static final Logger log = LoggerFactory.getLogger(AnnotationAssocOnes.class);
 
-  private final BeanDescriptorManager factory;
-
   /**
    * Create with the deploy Info.
    */
   AnnotationAssocOnes(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig, BeanDescriptorManager factory) {
-    super(info, readConfig);
-    this.factory = factory;
+    super(info, readConfig, factory);
   }
 
   /**
@@ -191,25 +188,11 @@ 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.io/docs/trouble-shooting#not-registered";
-  }
-
-  private BeanTable beanTable(DeployBeanPropertyAssoc<?> prop) {
-    BeanTable assoc = factory.getBeanTable(prop.getPropertyType());
-    if (assoc == null) {
-      throw new BeanNotRegisteredException(errorMsgMissingBeanTable(prop.getPropertyType(), prop.getFullBeanName()));
-    }
-    return assoc;
-  }
-
-  private void readManyToOne(ManyToOne propAnn, DeployBeanProperty prop) {
-
-    DeployBeanPropertyAssocOne<?> beanProp = (DeployBeanPropertyAssocOne<?>) prop;
+  private void readManyToOne(ManyToOne propAnn, DeployBeanPropertyAssocOne<?> beanProp) {
 
     setCascadeTypes(propAnn.cascade(), beanProp.getCascadeInfo());
-
-    beanProp.setBeanTable(beanTable(beanProp));
+    setTargetType(propAnn.targetEntity(), beanProp);
+    setBeanTable(beanProp);
     beanProp.setDbInsertable(true);
     beanProp.setDbUpdateable(true);
     beanProp.setNullable(propAnn.optional());
@@ -232,7 +215,8 @@ public class AnnotationAssocOnes extends AnnotationParser {
     }
 
     setCascadeTypes(propAnn.cascade(), prop.getCascadeInfo());
-    prop.setBeanTable(beanTable(prop));
+    setTargetType(propAnn.targetEntity(), prop);
+    setBeanTable(prop);
   }
 
   private boolean readOrphanRemoval(OneToOne property) {
@@ -261,7 +245,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
     BeanTable baseBeanTable = factory.getBeanTable(info.getDescriptor().getBeanType());
 
     String localPrimaryKey = baseBeanTable.getIdColumn();
-    String foreignColumn = beanTable(prop).getIdColumn();
+    String foreignColumn = getBeanTable(prop).getIdColumn();
 
     prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localPrimaryKey, foreignColumn, false, false));
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 691fa7cf5..6fb54b46d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -145,14 +145,6 @@ public class DeployCreateProperties {
   private DeployBeanProperty createProp(DeployBeanDescriptor<?> desc, Field field) {
 
     Class<?> propertyType = field.getType();
-
-    ManyToOne manyToOne = AnnotationUtil.get(field, ManyToOne.class);
-    if (manyToOne != null) {
-      Class<?> tt = manyToOne.targetEntity();
-      if (!tt.equals(void.class)) {
-        propertyType = tt;
-      }
-    }
     if (isSpecialScalarType(field)) {
       return new DeployBeanProperty(desc, propertyType, field.getGenericType());
     }
diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java
index ab847eb93..c27e6fc02 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java
@@ -16,7 +16,7 @@ public class TestManyOneInterface extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    IAddress a = new Address();
+    IAddress a = new Address("hello");
 
     IPerson p = new Person();
 
diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Address.java b/ebean-core/src/test/java/org/tests/model/interfaces/Address.java
index a4f9885bb..052ef63f8 100644
--- a/ebean-core/src/test/java/org/tests/model/interfaces/Address.java
+++ b/ebean-core/src/test/java/org/tests/model/interfaces/Address.java
@@ -15,6 +15,10 @@ public class Address implements IAddress {
 
   private String street;
 
+  public Address(String street) {
+    this.street = street;
+  }
+
   public long getOid() {
     return oid;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java b/ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java
new file mode 100644
index 000000000..321047319
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java
@@ -0,0 +1,6 @@
+package org.tests.model.interfaces;
+
+public interface IPersona {
+
+  String persona();
+}
diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Persona.java b/ebean-core/src/test/java/org/tests/model/interfaces/Persona.java
new file mode 100644
index 000000000..015d8ada0
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/interfaces/Persona.java
@@ -0,0 +1,39 @@
+package org.tests.model.interfaces;
+
+import javax.persistence.*;
+
+@Entity
+public class Persona implements IPersona {
+
+  @Id
+  private long id;
+
+  @Version
+  private int version;
+
+  private final String persona;
+
+  @OneToOne(orphanRemoval = true, fetch = FetchType.LAZY, targetEntity = Person.class)
+  private IPerson person;
+
+  public Persona(String persona) {
+    this.persona = persona;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  @Override
+  public String persona() {
+    return persona;
+  }
+
+  public void setPerson(IPerson person) {
+    this.person = person;
+  }
+
+  public IPerson getPerson() {
+    return person;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java b/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java
new file mode 100644
index 000000000..9db04f045
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java
@@ -0,0 +1,38 @@
+package org.tests.model.interfaces;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestTargetEntity extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    Person person = setup();
+
+    Persona persona = new Persona("junk");
+    persona.setPerson(person);
+    DB.save(persona);
+
+    Persona found = DB.find(Persona.class, persona.getId());
+    assertThat(found).isNotNull();
+    assertThat(found.persona()).isEqualTo("junk");
+    assertThat(found.getPerson().getDefaultAddress().getStreet()).isEqualTo("street");
+
+    DB.delete(persona);
+    DB.delete(person);
+    DB.delete(person.getDefaultAddress());
+  }
+
+  private Person setup() {
+    Address address = new Address("street");
+    DB.save(address);
+    Person person = new Person();
+    person.setDefaultAddress(address);
+    DB.save(person);
+    return person;
+  }
+}

From 213562fcf1cbca0745d3daf7ad66eb5b79ee0e94 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Feb 2021 16:34:24 +1300
Subject: [PATCH 086/447] No change - update ddl review for h2

---
 .../src/test/ddl-review/h2-create-all.sql     | 88 ++++++++++++++++++-
 .../src/test/ddl-review/h2-drop-all.sql       | 42 ++++++++-
 2 files changed, 128 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/test/ddl-review/h2-create-all.sql b/ebean-core/src/test/ddl-review/h2-create-all.sql
index dc5f4879f..50d49a3ac 100644
--- a/ebean-core/src/test/ddl-review/h2-create-all.sql
+++ b/ebean-core/src/test/ddl-review/h2-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2020-12-07T09:40:50.461215Z
+-- Generated by ebean unknown at 2021-02-12T03:32:14.253435800Z
 create table asimple_bean (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -486,6 +486,13 @@ create table child_person (
   constraint pk_child_person primary key (identifier)
 );
 
+create table child_with_cache (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  address                       varchar(255),
+  constraint pk_child_with_cache primary key (id)
+);
+
 create table cke_client (
   cod_cpny                      integer not null,
   cod_client                    varchar(100) not null,
@@ -1168,6 +1175,12 @@ create table ebasic_json_unmapped (
   constraint pk_ebasic_json_unmapped primary key (id)
 );
 
+create table e_basic_log (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_e_basic_log primary key (id)
+);
+
 create table e_basic_ndc (
   id                            integer generated by default as identity not null,
   name                          varchar(255),
@@ -1227,6 +1240,14 @@ create table e_basic_with_ex (
   constraint pk_e_basic_with_ex primary key (id)
 );
 
+create table e_basic_withlog (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  deleted                       boolean default false not null,
+  version                       bigint not null,
+  constraint pk_e_basic_withlog primary key (id)
+);
+
 create table e_basicverucon (
   id                            integer generated by default as identity not null,
   name                          varchar(127),
@@ -2256,6 +2277,29 @@ create table looney (
   constraint pk_looney primary key (id)
 );
 
+create table m2_mcache_child (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_m2_mcache_child primary key (id)
+);
+
+create table m2_mcache_master (
+  id                            integer generated by default as identity not null,
+  constraint pk_m2_mcache_master primary key (id)
+);
+
+create table m2mcache_set1 (
+  m2_mcache_master_id           integer not null,
+  m2_mcache_child_id            integer not null,
+  constraint pk_m2mcache_set1 primary key (m2_mcache_master_id,m2_mcache_child_id)
+);
+
+create table m2mcache_set2 (
+  m2_mcache_master_id           integer not null,
+  m2_mcache_child_id            integer not null,
+  constraint pk_m2mcache_set2 primary key (m2_mcache_master_id,m2_mcache_child_id)
+);
+
 create table maddress (
   id                            uuid not null,
   street                        varchar(255),
@@ -3230,6 +3274,19 @@ create table e_save_test_c (
   constraint pk_e_save_test_c primary key (id)
 );
 
+create table parent_a (
+  id                            bigint generated by default as identity not null,
+  child_id                      bigint,
+  name                          varchar(255),
+  constraint pk_parent_a primary key (id)
+);
+
+create table parent_b (
+  id                            bigint generated by default as identity not null,
+  child_id                      bigint,
+  constraint pk_parent_b primary key (id)
+);
+
 create table parent_person (
   identifier                    integer generated by default as identity not null,
   name                          varchar(255),
@@ -3361,6 +3418,15 @@ create table person_cache_info (
   constraint pk_person_cache_info primary key (person_id)
 );
 
+create table persona (
+  id                            bigint generated by default as identity not null,
+  persona                       varchar(255),
+  person_oid                    bigint,
+  version                       integer not null,
+  constraint uq_persona_person_oid unique (person_oid),
+  constraint pk_persona primary key (id)
+);
+
 create table phones (
   id                            bigint generated by default as identity not null,
   phone_number                  varchar(7) not null,
@@ -4574,6 +4640,18 @@ alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_at
 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_m2mcache_set1_m2_mcache_master on m2mcache_set1 (m2_mcache_master_id);
+alter table m2mcache_set1 add constraint fk_m2mcache_set1_m2_mcache_master foreign key (m2_mcache_master_id) references m2_mcache_master (id) on delete restrict on update restrict;
+
+create index ix_m2mcache_set1_m2_mcache_child on m2mcache_set1 (m2_mcache_child_id);
+alter table m2mcache_set1 add constraint fk_m2mcache_set1_m2_mcache_child foreign key (m2_mcache_child_id) references m2_mcache_child (id) on delete restrict on update restrict;
+
+create index ix_m2mcache_set2_m2_mcache_master on m2mcache_set2 (m2_mcache_master_id);
+alter table m2mcache_set2 add constraint fk_m2mcache_set2_m2_mcache_master foreign key (m2_mcache_master_id) references m2_mcache_master (id) on delete restrict on update restrict;
+
+create index ix_m2mcache_set2_m2_mcache_child on m2mcache_set2 (m2_mcache_child_id);
+alter table m2mcache_set2 add constraint fk_m2mcache_set2_m2_mcache_child foreign key (m2_mcache_child_id) references m2_mcache_child (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;
 
@@ -4796,6 +4874,12 @@ alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_paren
 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_parent_a_child_id on parent_a (child_id);
+alter table parent_a add constraint fk_parent_a_child_id foreign key (child_id) references child_with_cache (id) on delete restrict on update restrict;
+
+create index ix_parent_b_child_id on parent_b (child_id);
+alter table parent_b add constraint fk_parent_b_child_id foreign key (child_id) references child_with_cache (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;
 
@@ -4829,6 +4913,8 @@ alter table person add constraint fk_person_default_address_oid foreign key (def
 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;
 
+alter table persona add constraint fk_persona_person_oid foreign key (person_oid) references person (oid) 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/ebean-core/src/test/ddl-review/h2-drop-all.sql b/ebean-core/src/test/ddl-review/h2-drop-all.sql
index 16a4f3c7a..52ce28b38 100644
--- a/ebean-core/src/test/ddl-review/h2-drop-all.sql
+++ b/ebean-core/src/test/ddl-review/h2-drop-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2020-12-07T09:40:50.461215Z
+-- Generated by ebean unknown at 2021-02-12T03:32:14.253435800Z
 alter table bar drop constraint if exists fk_bar_foo_id;
 drop index if exists ix_bar_foo_id;
 
@@ -417,6 +417,18 @@ drop index if exists ix_la_attr_value_attribute_attribute;
 alter table looney drop constraint if exists fk_looney_tune_id;
 drop index if exists ix_looney_tune_id;
 
+alter table m2mcache_set1 drop constraint if exists fk_m2mcache_set1_m2_mcache_master;
+drop index if exists ix_m2mcache_set1_m2_mcache_master;
+
+alter table m2mcache_set1 drop constraint if exists fk_m2mcache_set1_m2_mcache_child;
+drop index if exists ix_m2mcache_set1_m2_mcache_child;
+
+alter table m2mcache_set2 drop constraint if exists fk_m2mcache_set2_m2_mcache_master;
+drop index if exists ix_m2mcache_set2_m2_mcache_master;
+
+alter table m2mcache_set2 drop constraint if exists fk_m2mcache_set2_m2_mcache_child;
+drop index if exists ix_m2mcache_set2_m2_mcache_child;
+
 alter table mcontact drop constraint if exists fk_mcontact_customer_id;
 drop index if exists ix_mcontact_customer_id;
 
@@ -639,6 +651,12 @@ drop index if exists ix_rawinherit_parent_rawinherit_data_rawinherit_parent;
 alter table 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 parent_a drop constraint if exists fk_parent_a_child_id;
+drop index if exists ix_parent_a_child_id;
+
+alter table parent_b drop constraint if exists fk_parent_b_child_id;
+drop index if exists ix_parent_b_child_id;
+
 alter table parent_person drop constraint if exists fk_parent_person_some_bean_id;
 drop index if exists ix_parent_person_some_bean_id;
 
@@ -672,6 +690,8 @@ drop index if exists ix_person_default_address_oid;
 alter table 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 persona drop constraint if exists fk_persona_person_oid;
+
 alter table phones drop constraint if exists fk_phones_person_id;
 drop index if exists ix_phones_person_id;
 
@@ -970,6 +990,8 @@ drop table if exists e_save_test_d;
 
 drop table if exists child_person;
 
+drop table if exists child_with_cache;
+
 drop table if exists cke_client;
 
 drop table if exists cke_user;
@@ -1131,6 +1153,8 @@ drop table if exists ebasic_json_node_varchar;
 
 drop table if exists ebasic_json_unmapped;
 
+drop table if exists e_basic_log;
+
 drop table if exists e_basic_ndc;
 
 drop table if exists ebasic_no_sdchild;
@@ -1145,6 +1169,8 @@ drop table if exists e_basic_withlife;
 
 drop table if exists e_basic_with_ex;
 
+drop table if exists e_basic_withlog;
+
 drop table if exists e_basicverucon;
 
 drop table if exists ecache_child;
@@ -1463,6 +1489,14 @@ drop table if exists la_attr_value_attribute;
 
 drop table if exists looney;
 
+drop table if exists m2_mcache_child;
+
+drop table if exists m2_mcache_master;
+
+drop table if exists m2mcache_set1;
+
+drop table if exists m2mcache_set2;
+
 drop table if exists maddress;
 
 drop table if exists mcontact;
@@ -1715,6 +1749,10 @@ drop table if exists rawinherit_parent_rawinherit_data;
 
 drop table if exists e_save_test_c;
 
+drop table if exists parent_a;
+
+drop table if exists parent_b;
+
 drop table if exists parent_person;
 
 drop table if exists c_participation;
@@ -1745,6 +1783,8 @@ drop table if exists person_cache_email;
 
 drop table if exists person_cache_info;
 
+drop table if exists persona;
+
 drop table if exists phones;
 
 drop table if exists e_position;

From e0c3a92b6067ab52930e31fd420db2c8c573ffe4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Feb 2021 21:01:57 +1300
Subject: [PATCH 087/447] Refactor FetchConfig

---
 .../src/main/java/io/ebean/FetchConfig.java   | 290 +++++++-----------
 .../server/grammer/ParseFetchConfig.java      |   8 +-
 .../server/loadcontext/DLoadBaseContext.java  |  39 +--
 .../server/loadcontext/DLoadBeanContext.java  |  10 +-
 .../server/loadcontext/DLoadContext.java      |  11 +-
 .../server/loadcontext/DLoadManyContext.java  |  13 +-
 .../server/query/DFetchGroupBuilder.java      |   6 +-
 .../server/query/DefaultFetchGroupQuery.java  |   6 +-
 .../server/query/SqlTreeBuilder.java          |   2 +-
 .../server/querydefn/DefaultOrmQuery.java     |   6 +-
 .../server/querydefn/OrmQueryDetail.java      |   4 +-
 .../server/querydefn/OrmQueryProperties.java  | 124 ++------
 .../querydefn/OrmQueryPropertiesParser.java   |  10 +-
 .../test/java/io/ebean/FetchConfigTest.java   | 108 ++-----
 .../java/io/ebean/plugin/BeanTypeTest.java    |   2 +-
 ...faultServer_createOrmQueryRequestTest.java |   6 +-
 .../server/grammer/ParseFetchConfigTest.java  |  20 +-
 .../server/loadcontext/DLoadContextTest.java  |  25 +-
 .../querydefn/OrmQueryDetailParserTest.java   |   4 +-
 .../OrmQueryPropertiesParserTest.java         |  54 ++--
 .../querydefn/OrmQueryPropertiesTest.java     |  12 +-
 .../TestLazyLoadEmptyCollection.java          |   2 +-
 .../tests/batchload/TestSecondaryQueries.java |   2 +-
 23 files changed, 272 insertions(+), 492 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/FetchConfig.java b/ebean-api/src/main/java/io/ebean/FetchConfig.java
index 39823b2c7..27b74af3b 100644
--- a/ebean-api/src/main/java/io/ebean/FetchConfig.java
+++ b/ebean-api/src/main/java/io/ebean/FetchConfig.java
@@ -3,30 +3,13 @@ package io.ebean;
 import java.io.Serializable;
 
 /**
- * Defines the configuration options for a "query fetch" or a
- * "lazy loading fetch". This gives you the ability to use multiple smaller
- * queries to populate an object graph as opposed to a single large query.
- * <p>
- * The primary goal is to provide efficient ways of loading complex object
- * graphs avoiding SQL Cartesian product and issues around populating object
- * graphs that have multiple *ToMany relationships.
- * </p>
- * <p>
- * It also provides the ability to control the lazy loading queries (batch size,
- * selected properties and fetches) to avoid N+1 queries etc.
- * <p>
- * There can also be cases loading across a single OneToMany where 2 SQL queries
- * using Ebean FetchConfig.query() can be more efficient than one SQL query.
- * When the "One" side is wide (lots of columns) and the cardinality difference
- * is high (a lot of "Many" beans per "One" bean) then this can be more
- * efficient loaded as 2 SQL queries.
- * </p>
+ * Defines how a relationship is fetched via either normal SQL join,
+ * a eager secondary query, via lazy loading or via eagerly hitting L2 cache.
  * <p>
  * <pre>{@code
  * // Normal fetch join results in a single SQL query
  * List<Order> list = DB.find(Order.class).fetch("details").findList();
  *
- * // Find Orders join details using a single SQL query
  * }</pre>
  * <p>
  * Example: Using a "query join" instead of a "fetch join" we instead use 2 SQL queries
@@ -37,103 +20,13 @@ import java.io.Serializable;
  * // This will use 2 SQL queries to build this object graph
  * List<Order> list =
  *     DB.find(Order.class)
- *         .fetch("details", new FetchConfig().query())
+ *         .fetch("details", FetchConfig.ofQuery())
  *         .findList();
  *
  * // query 1) find order
  * // query 2) find orderDetails where order.id in (?,?...) // first 100 order id's
  *
  * }</pre>
- * <p>
- * Example: Using 2 "query joins"
- * </p>
- * <p>
- * <pre>{@code
- *
- * // This will use 3 SQL queries to build this object graph
- * List<Order> list =
- *     DB.find(Order.class)
- *         .fetch("details", new FetchConfig().query())
- *         .fetch("customer", new FetchConfig().queryFirst(5))
- *         .findList();
- *
- * // query 1) find order
- * // query 2) find orderDetails where order.id in (?,?...) // first 100 order id's
- * // query 3) find customer where id in (?,?,?,?,?) // first 5 customers
- *
- * }</pre>
- * <p>
- * Example: Using "query joins" and partial objects
- * </p>
- * <p>
- *
- * <pre>{@code
- * // This will use 3 SQL queries to build this object graph
- * List<Order> list =
- *     DB.find(Order.class)
- *         .select("status, shipDate")
- *         .fetch("details", "quantity, price", new FetchConfig().query())
- *         .fetch("details.product", "sku, name")
- *         .fetch("customer", "name", new FetchConfig().queryFirst(5))
- *         .fetch("customer.contacts")
- *         .fetch("customer.shippingAddress")
- *         .findList();
- *
- * // query 1) find order (status, shipDate)
- * // query 2) find orderDetail (quantity, price) fetch product (sku, name) where
- * // order.id in (?,? ...)
- * // query 3) find customer (name) fetch contacts (*) fetch shippingAddress (*)
- * // where id in (?,?,?,?,?)
- *
- * // Note: the fetch of "details.product" is automatically included into the
- * // fetch of "details"
- * //
- * // Note: the fetch of "customer.contacts" and "customer.shippingAddress"
- * // are automatically included in the fetch of "customer"
- * }</pre>
- * <p>
- * You can use query() and lazy together on a single join. The query is executed
- * immediately and the lazy defines the batch size to use for further lazy
- * loading (if lazy loading is invoked).
- * </p>
- * <p>
- * <pre>{@code
- *
- * List<Order> list =
- *     DB.find(Order.class)
- *         .fetch("customer", new FetchConfig().query(10).lazy(5))
- *         .findList();
- *
- * // query 1) find order
- * // query 2) find customer where id in (?,?,?,?,?,?,?,?,?,?) // first 10 customers
- * // .. then if lazy loading of customers is invoked
- * // .. use a batch size of 5 to load the customers
- *
- * }</pre>
- * <p>
- * <p>
- * Example of controlling the lazy loading query:
- * </p>
- * <p>
- * This gives us the ability to optimise the lazy loading query for a given use
- * case.
- * </p>
- * <p>
- * <pre>{@code
- *
- * List<Order> list = DB.find(Order.class)
- *   .fetch("customer","name", new FetchConfig().lazy(5))
- *   .fetch("customer.contacts","contactName, phone, email")
- *   .fetch("customer.shippingAddress")
- *   .where().eq("status",Order.Status.NEW)
- *   .findList();
- *
- * // query 1) find order where status = Order.Status.NEW
- * //
- * // .. if lazy loading of customers is invoked
- * // .. use a batch size of 5 to load the customers
- *
- * }</pre>
  *
  * @author mario
  * @author rbygrave
@@ -142,52 +35,105 @@ public class FetchConfig implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
-  private int lazyBatchSize = -1;
+  private static final int JOIN_MODE = 0;
+  private static final int QUERY_MODE = 1;
+  private static final int LAZY_MODE = 2;
+  private static final int CACHE_MODE = 3;
 
-  private int queryBatchSize = -1;
-
-  private boolean queryAll;
-
-  private boolean cache;
+  private int mode;
+  private int batchSize;
+  private int hashCode;
 
   /**
-   * Construct the fetch configuration object.
+   * Construct using default JOIN mode.
    */
   public FetchConfig() {
+    //this.mode = JOIN_MODE;
+    this.batchSize = 100;
+    this.hashCode = 1000;
+  }
+
+  private FetchConfig(int mode, int batchSize) {
+    this.mode = mode;
+    this.batchSize = batchSize;
+    this.hashCode = mode + 10 * batchSize;
   }
 
   /**
-   * Specify that this path should be lazy loaded using the default batch load
-   * size.
+   * Return FetchConfig that will eagerly fetch the relationship using L2 cache.
+   * <p>
+   * Any cache misses will be loaded by secondary query to the database.
+   */
+  public static FetchConfig ofCache() {
+    return new FetchConfig(CACHE_MODE, 100);
+  }
+
+  /**
+   * Return FetchConfig that use a eager secondary query to fetch the relationship.
+   */
+  public static FetchConfig ofQuery() {
+    return new FetchConfig(QUERY_MODE, 100);
+  }
+
+  /**
+   * Return FetchConfig that use a eager secondary query to fetch the relationship specifying the batch size.
+   */
+  public static FetchConfig ofQuery(int batchSize) {
+    return new FetchConfig(QUERY_MODE, batchSize);
+  }
+
+  /**
+   * Return FetchConfig that use lazy loading to fetch the relationship.
+   */
+  public static FetchConfig ofLazy() {
+    return new FetchConfig(LAZY_MODE, 10);
+  }
+
+  /**
+   * Return FetchConfig that use lazy loading to fetch the relationship specifying the batch size.
+   */
+  public static FetchConfig ofLazy(int batchSize) {
+    return new FetchConfig(LAZY_MODE, batchSize);
+  }
+
+  /**
+   * We want to migrate away from mutating FetchConfig to a fully immutable FetchConfig.
+   */
+  private FetchConfig mutate(int mode, int batchSize) {
+    if (batchSize < 1) {
+      throw new IllegalArgumentException("batch size "+batchSize+" must be > 0");
+    }
+    this.mode = mode;
+    this.batchSize = batchSize;
+    this.hashCode = mode + 10 * batchSize;
+    return this;
+  }
+
+  /**
+   * Specify that this path should be lazy loaded using the default batch load size.
    */
   public FetchConfig lazy() {
-    this.lazyBatchSize = 0;
-    this.queryAll = false;
-    return this;
+    return mutate(LAZY_MODE, 10);
   }
 
   /**
    * Specify that this path should be lazy loaded with a specified batch size.
    *
-   * @param lazyBatchSize the batch size for lazy loading
+   * @param batchSize the batch size for lazy loading
    */
-  public FetchConfig lazy(int lazyBatchSize) {
-    this.lazyBatchSize = lazyBatchSize;
-    this.queryAll = false;
-    return this;
+  public FetchConfig lazy(int batchSize) {
+    return mutate(LAZY_MODE, batchSize);
   }
 
   /**
-   * Eagerly fetch the beans in this path as a separate query (rather than as
+   * Eagerly fetccd h the beans in this path as a separate query (rather than as
    * part of the main query).
    * <p>
    * This will use the default batch size for separate query which is 100.
    * </p>
    */
   public FetchConfig query() {
-    this.queryBatchSize = 0;
-    this.queryAll = true;
-    return this;
+    return mutate(QUERY_MODE, 100);
   }
 
   /**
@@ -195,10 +141,7 @@ public class FetchConfig implements Serializable {
    * and using the DB for beans not in the cache.
    */
   public FetchConfig cache() {
-    this.cache = true;
-    this.queryBatchSize = 0;
-    this.queryAll = true;
-    return this;
+    return mutate(CACHE_MODE, 100);
   }
 
   /**
@@ -213,13 +156,10 @@ public class FetchConfig implements Serializable {
    * is also used.
    * </p>
    *
-   * @param queryBatchSize the batch size used to load beans on this path
+   * @param batchSize the batch size used to load beans on this path
    */
-  public FetchConfig query(int queryBatchSize) {
-    this.queryBatchSize = queryBatchSize;
-    // queryAll true as long as a lazy batch size has not already been set
-    this.queryAll = (lazyBatchSize == -1);
-    return this;
+  public FetchConfig query(int batchSize) {
+    return mutate(QUERY_MODE, batchSize);
   }
 
   /**
@@ -230,61 +170,57 @@ public class FetchConfig implements Serializable {
    * loaded eagerly but instead use lazy loading.
    * </p>
    *
-   * @param queryBatchSize the number of parent beans this path is populated for
+   * @param batchSize the number of parent beans this path is populated for
    */
-  public FetchConfig queryFirst(int queryBatchSize) {
-    this.queryBatchSize = queryBatchSize;
-    this.queryAll = false;
-    return this;
+  @Deprecated
+  public FetchConfig queryFirst(int batchSize) {
+    return query(batchSize);
   }
 
   /**
-   * Return the batch size for lazy loading.
+   * Return the batch size for fetching.
    */
-  public int getLazyBatchSize() {
-    return lazyBatchSize;
+  public int getBatchSize() {
+    return batchSize;
   }
 
   /**
-   * Return the batch size for separate query load.
-   */
-  public int getQueryBatchSize() {
-    return queryBatchSize;
-  }
-
-  /**
-   * Return true if the query fetch should fetch 'all' rather than just the
-   * 'first' batch.
-   */
-  public boolean isQueryAll() {
-    return queryAll;
-  }
-
-  /**
-   * Return true if this uses L2 bean cache.
+   * Return true if the fetch should use the L2 cache.
    */
   public boolean isCache() {
-    return cache;
+    return mode == CACHE_MODE;
+  }
+
+  /**
+   * Return true if the fetch should be a eager secondary query.
+   */
+  public boolean isQuery() {
+    return mode == QUERY_MODE;
+  }
+
+  /**
+   * Return true if the fetch should be a lazy query.
+   */
+  public boolean isLazy() {
+    return mode == LAZY_MODE;
+  }
+
+  /**
+   * Return true if the fetch should try to use SQL join.
+   */
+  public boolean isJoin() {
+    return mode == JOIN_MODE;
   }
 
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
-
-    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;
+    return (hashCode == ((FetchConfig) o).hashCode);
   }
 
   @Override
   public int hashCode() {
-    int result = lazyBatchSize;
-    result = 92821 * result + queryBatchSize;
-    result = 92821 * result + (queryAll ? 1 : 0);
-    result = 92821 * result + (cache ? 1 : 0);
-    return result;
+    return hashCode;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/ParseFetchConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/ParseFetchConfig.java
index 67b2b9c24..5094fa346 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/ParseFetchConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/ParseFetchConfig.java
@@ -17,11 +17,11 @@ class ParseFetchConfig {
 
     if (path.startsWith("lazy")) {
       if (path.length() == 4) {
-        return new FetchConfig().lazy();
+        return FetchConfig.ofLazy();
       } else if (path.charAt(4) == '(') {
         path = path.substring(5);
         int batchSize = parseBatchSize(path);
-        return new FetchConfig().lazy(batchSize);
+        return FetchConfig.ofLazy(batchSize);
       } else {
         return null;
       }
@@ -29,11 +29,11 @@ class ParseFetchConfig {
 
     if (path.startsWith("query")) {
       if (path.length() == 5) {
-        return new FetchConfig().query();
+        return FetchConfig.ofQuery();
       } else if (path.charAt(5) == '(') {
         path = path.substring(6);
         int batchSize = parseBatchSize(path);
-        return new FetchConfig().query(batchSize);
+        return FetchConfig.ofQuery(batchSize);
       } else {
         return null;
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
index 3040ebcaf..1be4717e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.loadcontext;
 
-import io.ebean.FetchConfig;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.api.SpiQuery;
@@ -28,9 +27,7 @@ abstract class DLoadBaseContext {
 
   final boolean hitCache;
 
-  final int firstBatchSize;
-
-  final int secondaryBatchSize;
+  final int batchSize;
 
   final ObjectGraphNode objectGraphNode;
 
@@ -45,38 +42,11 @@ abstract class DLoadBaseContext {
     this.hitCache = parent.isBeanCacheGet() && desc.isBeanCaching();
     this.objectGraphNode = parent.getObjectGraphNode(path);
     this.queryFetch = queryProps != null && queryProps.isQueryFetch();
-    this.firstBatchSize = initFirstBatchSize(defaultBatchSize, queryProps);
-    this.secondaryBatchSize = initSecondaryBatchSize(defaultBatchSize, firstBatchSize, queryProps);
+    this.batchSize = initBatchSize(defaultBatchSize, queryProps);
   }
 
-  private int initFirstBatchSize(int batchSize, OrmQueryProperties queryProps) {
-    if (queryProps == null) {
-      return batchSize;
-    }
-
-    int queryBatchSize = queryProps.getQueryFetchBatch();
-    if (queryBatchSize == -1) {
-      return batchSize;
-
-    } else if (queryBatchSize == 0) {
-      return 100;
-
-    } else {
-      return queryBatchSize;
-    }
-  }
-
-  private int initSecondaryBatchSize(int defaultBatchSize, int firstBatchSize, OrmQueryProperties queryProps) {
-    if (queryProps == null) {
-      return defaultBatchSize;
-    }
-    FetchConfig fetchConfig = queryProps.getFetchConfig();
-    if (fetchConfig.isQueryAll()) {
-      return firstBatchSize;
-    }
-
-    int lazyBatchSize = fetchConfig.getLazyBatchSize();
-    return (lazyBatchSize > 1) ? lazyBatchSize : defaultBatchSize;
+  private int initBatchSize(int batchSize, OrmQueryProperties queryProps) {
+    return queryProps == null ? batchSize : queryProps.getBatchSize();
   }
 
   /**
@@ -84,7 +54,6 @@ abstract class DLoadBaseContext {
    * set onto the secondary query.
    */
   void setLabel(SpiQuery<?> query) {
-
     String label = parent.getPlanLabel();
     if (label != null) {
       query.setProfilePath(label, fullPath, parent.getProfileLocation());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index 454fd6dac..d24a24532 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -35,7 +35,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
     super(parent, desc, path, defaultBatchSize, queryProps);
     // bufferList only required when using query joins (queryFetch)
     this.bufferList = (!queryFetch) ? null : new ArrayList<>();
-    this.currentBuffer = createBuffer(firstBatchSize);
+    this.currentBuffer = createBuffer(batchSize);
     this.cache = (queryProps != null) && queryProps.isCache();
   }
 
@@ -52,7 +52,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
     if (bufferList != null) {
       bufferList.clear();
     }
-    currentBuffer = createBuffer(secondaryBatchSize);
+    currentBuffer = createBuffer(batchSize);
   }
 
   private void configureQuery(SpiQuery<?> query, String lazyLoadProperty) {
@@ -70,7 +70,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
   protected void register(EntityBeanIntercept ebi) {
     if (currentBuffer.isFull()) {
-      currentBuffer = createBuffer(secondaryBatchSize);
+      currentBuffer = createBuffer(batchSize);
     }
     ebi.setBeanLoader(currentBuffer, getPersistenceContext());
     currentBuffer.add(ebi);
@@ -95,10 +95,6 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
         for (LoadBuffer loadBuffer : bufferList) {
           if (!loadBuffer.list.isEmpty()) {
             parent.getEbeanServer().loadBean(new LoadBeanRequest(loadBuffer, parentRequest));
-            if (!queryProps.isQueryFetchAll()) {
-              // Stop - only fetch the first batch ... the rest will be lazy loaded
-              break;
-            }
           }
           if (forEach) {
             clear();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index df2a9e8e8..b5aa6f873 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -188,7 +188,7 @@ public class DLoadContext implements LoadContext {
     }
     int maxBatch = 0;
     for (OrmQueryProperties aSecQuery : secQuery) {
-      int batchSize = aSecQuery.getQueryFetchBatch();
+      int batchSize = aSecQuery.getBatchSize();
       if (batchSize == 0) {
         batchSize = defaultQueryBatch;
       }
@@ -300,12 +300,9 @@ public class DLoadContext implements LoadContext {
   }
 
   private void registerSecondaryNode(boolean many, OrmQueryProperties props) {
-    int batchSize;
-    if (props.isQueryFetch()) {
-      batchSize = 100;
-    } else {
-      int lazyJoinBatch = props.getLazyFetchBatch();
-      batchSize = lazyJoinBatch > 0 ? lazyJoinBatch : defaultBatchSize;
+    int batchSize = props.getBatchSize();
+    if (batchSize == 0) {
+      batchSize = defaultBatchSize;
     }
     String path = props.getPath();
     if (many) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index ac846e359..7a51127d8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -40,7 +40,7 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
     this.docStoreMapped = property.isTargetDocStoreMapped();
     // bufferList only required when using query joins (queryFetch)
     this.bufferList = (!queryFetch) ? null : new ArrayList<>();
-    this.currentBuffer = createBuffer(firstBatchSize);
+    this.currentBuffer = createBuffer(batchSize);
   }
 
   private LoadBuffer createBuffer(int size) {
@@ -58,11 +58,10 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
     if (bufferList != null) {
       bufferList.clear();
     }
-    currentBuffer = createBuffer(secondaryBatchSize);
+    currentBuffer = createBuffer(batchSize);
   }
 
   private void configureQuery(SpiQuery<?> query) {
-
     setLabel(query);
     parent.propagateQueryState(query, docStoreMapped);
     query.setParentNode(objectGraphNode);
@@ -85,9 +84,8 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
   }
 
   public void register(BeanCollection<?> bc) {
-
     if (currentBuffer.isFull()) {
-      currentBuffer = createBuffer(secondaryBatchSize);
+      currentBuffer = createBuffer(batchSize);
     }
     currentBuffer.add(bc);
     bc.setLoader(currentBuffer);
@@ -105,13 +103,8 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
           if (!loadBuffer.list.isEmpty()) {
             LoadManyRequest req = new LoadManyRequest(loadBuffer, parentRequest);
             parent.getEbeanServer().loadMany(req);
-            if (!queryProps.isQueryFetchAll()) {
-              // Stop - only fetch the first batch ... the rest will be lazy loaded
-              break;
-            }
           }
         }
-
         if (forEach) {
           clear();
         } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
index 1c858f3ab..f33985f46 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
@@ -11,11 +11,11 @@ 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_CACHE = FetchConfig.ofCache();
 
-  private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
+  private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
 
-  private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
+  private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();
 
   private final OrmQueryDetail detail;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 063f2071c..8f2351846 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -45,11 +45,11 @@ import java.util.stream.Stream;
  */
 class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
 
-  private static final FetchConfig FETCH_CACHE = new FetchConfig().cache();
+  private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
 
-  private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
+  private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
 
-  private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
+  private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();
 
   private OrmQueryDetail detail = new OrmQueryDetail();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index d9386ed9b..065884b54 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -452,7 +452,7 @@ 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)
-    final Set<String> selectInclude = queryProps.getSelectInclude();
+    final Set<String> selectInclude = queryProps.getIncluded();
     for (String propName : selectInclude) {
       if (!propName.isEmpty()) {
         addProperty(selectProps, desc, queryProps, propName);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 2f73bceb7..961684be5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -83,11 +83,11 @@ 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_CACHE = FetchConfig.ofCache();
 
-  private static final FetchConfig FETCH_QUERY = new FetchConfig().query();
+  private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
 
-  private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
+  private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();
 
   private final ReentrantLock lock = new ReentrantLock();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 1310b709a..b36daaf58 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -117,14 +117,14 @@ public class OrmQueryDetail implements Serializable {
   public String asString() {
     StringBuilder sb = new StringBuilder();
     if (!baseProps.isEmpty()) {
-      baseProps.append("select ", sb);
+      baseProps.asStringDebug("select ", sb);
     }
     if (fetchPaths != null) {
       for (OrmQueryProperties join : fetchPaths.values()) {
         if (sb.length() > 0) {
           sb.append(" ");
         }
-        join.append("fetch ", sb);
+        join.asStringDebug("fetch ", sb);
       }
     }
     return sb.toString();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 805c3bf68..425a5d927 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -30,12 +30,8 @@ public class OrmQueryProperties implements Serializable {
 
   private final String parentPath;
   private final String path;
-
-  private final String rawProperties;
-  private final String trimmedProperties;
-
-  private final LinkedHashSet<String> included;
-
+  private final String properties;
+  private final Set<String> included;
   private final FetchConfig fetchConfig;
 
   /**
@@ -84,8 +80,7 @@ public class OrmQueryProperties implements Serializable {
   public OrmQueryProperties(String path) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
-    this.rawProperties = null;
-    this.trimmedProperties = null;
+    this.properties = null;
     this.included = null;
     this.fetchConfig = DEFAULT_FETCH;
   }
@@ -95,13 +90,11 @@ public class OrmQueryProperties implements Serializable {
   }
 
   public OrmQueryProperties(String path, String rawProperties, FetchConfig fetchConfig) {
-
-    OrmQueryPropertiesParser.Response response = OrmQueryPropertiesParser.parse(rawProperties);
-
     this.path = path;
     this.parentPath = SplitName.parent(path);
-    this.rawProperties = rawProperties;
-    this.trimmedProperties = response.properties;
+
+    OrmQueryPropertiesParser.Response response = OrmQueryPropertiesParser.parse(rawProperties);
+    this.properties = response.properties;
     this.included = response.included;
     this.cache = response.cache;
     this.readOnly = response.readOnly;
@@ -115,39 +108,17 @@ public class OrmQueryProperties implements Serializable {
     }
   }
 
-  public OrmQueryProperties(String path, LinkedHashSet<String> parsedProperties) {
-    if (parsedProperties == null) {
-      throw new IllegalArgumentException("parsedProperties is null");
-    }
-
+  public OrmQueryProperties(String path, Set<String> included) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
     // for rawSql parsedProperties can be empty (when only fetching Id property)
-    this.included = parsedProperties;
-    this.rawProperties = join(parsedProperties);
-    this.trimmedProperties = rawProperties;
+    this.included = included;
+    this.properties = String.join(",", included);
     this.cache = false;
     this.readOnly = false;
     this.fetchConfig = DEFAULT_FETCH;
   }
 
-  /**
-   * Join the set of properties into a comma delimited string.
-   */
-  private String join(LinkedHashSet<String> parsedProperties) {
-    StringBuilder sb = new StringBuilder(50);
-    boolean first = true;
-    for (String property : parsedProperties) {
-      if (first) {
-        first = false;
-      } else {
-        sb.append(",");
-      }
-      sb.append(property);
-    }
-    return sb.toString();
-  }
-
   /**
    * Copy constructor.
    */
@@ -155,8 +126,7 @@ public class OrmQueryProperties implements Serializable {
     this.fetchConfig = sourceFetchConfig;
     this.parentPath = source.parentPath;
     this.path = source.path;
-    this.rawProperties = source.rawProperties;
-    this.trimmedProperties = source.trimmedProperties;
+    this.properties = source.properties;
     this.cache = source.cache;
     this.readOnly = source.readOnly;
     this.filterMany = source.filterMany;
@@ -240,8 +210,8 @@ public class OrmQueryProperties implements Serializable {
   @SuppressWarnings("unchecked")
   public void configureBeanQuery(SpiQuery<?> query) {
 
-    if (trimmedProperties != null && !trimmedProperties.isEmpty()) {
-      query.select(trimmedProperties);
+    if (properties != null && !properties.isEmpty()) {
+      query.select(properties);
     }
 
     if (filterMany != null) {
@@ -268,7 +238,7 @@ public class OrmQueryProperties implements Serializable {
   }
 
   public boolean hasSelectClause() {
-    if ("*".equals(trimmedProperties)) {
+    if ("*".equals(properties)) {
       // explicitly selected all properties
       return true;
     }
@@ -280,25 +250,17 @@ public class OrmQueryProperties implements Serializable {
    * Return true if the properties and configuration are empty.
    */
   public boolean isEmpty() {
-    return rawProperties == null || rawProperties.isEmpty();
+    return properties == null || properties.isEmpty();
   }
 
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder(40);
-    append("", sb);
-    return sb.toString();
-  }
-
-  public String append(String prefix, StringBuilder sb) {
+  public void asStringDebug(String prefix, StringBuilder sb) {
     sb.append(prefix);
     if (path != null) {
       sb.append(path).append(" ");
     }
     if (!isEmpty()) {
-      sb.append("(").append(rawProperties).append(")");
+      sb.append("(").append(properties).append(")");
     }
-    return sb.toString();
   }
 
   boolean isChild(OrmQueryProperties possibleChild) {
@@ -319,7 +281,7 @@ public class OrmQueryProperties implements Serializable {
    * Return the raw properties.
    */
   public String getProperties() {
-    return rawProperties;
+    return properties;
   }
 
   /**
@@ -350,10 +312,6 @@ public class OrmQueryProperties implements Serializable {
     includedBeanJoin.add(propertyName);
   }
 
-  public Set<String> getSelectInclude() {
-    return included;
-  }
-
   public Set<String> getSelectQueryJoin() {
     return secondaryQueryJoins;
   }
@@ -373,7 +331,6 @@ public class OrmQueryProperties implements Serializable {
   }
 
   boolean isIncluded(String propName) {
-
     if (includedBeanJoin != null && includedBeanJoin.contains(propName)) {
       return false;
     }
@@ -392,42 +349,25 @@ public class OrmQueryProperties implements Serializable {
    * Return true if this path is a 'query join'.
    */
   public boolean isQueryFetch() {
-    return markForQueryJoin || getQueryFetchBatch() > -1;
+    return markForQueryJoin || cache || fetchConfig.isQuery();
   }
 
   /**
    * Return true if this path is a 'fetch join'.
    */
   boolean isFetchJoin() {
-    return !isQueryFetch() && !isLazyFetch();
+    return !markForQueryJoin && fetchConfig.isJoin();
   }
 
   /**
    * Return true if this path is a lazy fetch.
    */
   boolean isLazyFetch() {
-    return getLazyFetchBatch() > -1;
+    return fetchConfig.isLazy();
   }
 
-  /**
-   * Return the batch size to use for the query join.
-   */
-  public int getQueryFetchBatch() {
-    return fetchConfig.getQueryBatchSize();
-  }
-
-  /**
-   * Return true if a query join should eagerly fetch 'all' rather than the 'first'.
-   */
-  public boolean isQueryFetchAll() {
-    return fetchConfig.isQueryAll();
-  }
-
-  /**
-   * Return the batch size to use for lazy loading.
-   */
-  public int getLazyFetchBatch() {
-    return fetchConfig.getLazyBatchSize();
+  public int getBatchSize() {
+    return fetchConfig.getBatchSize();
   }
 
   /**
@@ -474,26 +414,24 @@ public class OrmQueryProperties implements Serializable {
    * Calculate the query plan hash.
    */
   public void queryPlanHash(StringBuilder builder) {
-
-    builder.append("qpp[");
-    builder.append(path);
+    builder.append("{");
+    if (path != null) {
+      builder.append(path);
+    }
     if (included != null){
-      builder.append(" included:").append(included);
+      builder.append("/i").append(included);
     }
     if (secondaryQueryJoins != null) {
-      builder.append(" secondary:").append(secondaryQueryJoins);
+      builder.append("/s").append(secondaryQueryJoins);
     }
-
     if (filterMany != null) {
-      builder.append(" filterMany[");
+      builder.append("/f");
       filterMany.queryPlanHash(builder);
-      builder.append("]");
     }
-
     if (fetchConfig != null) {
-      builder.append(" config:").append(fetchConfig.hashCode());
+      builder.append("/c").append(fetchConfig.hashCode());
     }
-    builder.append("]");
+    builder.append("}");
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
index 5c03e0a33..e7c416390 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
@@ -29,8 +29,10 @@ class OrmQueryPropertiesParser {
       this.cache = cache;
       this.properties = properties;
       this.included = included;
-      if (lazyFetchBatch > -1 || queryFetchBatch > -1) {
-        this.fetchConfig = new FetchConfig().lazy(lazyFetchBatch).query(queryFetchBatch);
+      if (queryFetchBatch > 0) {
+        this.fetchConfig = FetchConfig.ofQuery(queryFetchBatch);
+      } else if (lazyFetchBatch > 0) {
+        this.fetchConfig = FetchConfig.ofLazy(lazyFetchBatch);
       } else {
         this.fetchConfig = OrmQueryProperties.DEFAULT_FETCH;
       }
@@ -59,8 +61,8 @@ class OrmQueryPropertiesParser {
   private boolean allProperties;
   private boolean readOnly;
   private boolean cache;
-  private int queryFetchBatch = -1;
-  private int lazyFetchBatch = -1;
+  private int queryFetchBatch;
+  private int lazyFetchBatch;
 
   private OrmQueryPropertiesParser(String inputProperties) {
     this.inputProperties = inputProperties;
diff --git a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java b/ebean-core/src/test/java/io/ebean/FetchConfigTest.java
index a88e1e4be..abd09d692 100644
--- a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/FetchConfigTest.java
@@ -8,151 +8,110 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class FetchConfigTest {
 
   @Test
-  public void testLazy() throws Exception {
-
+  public void testLazy() {
     FetchConfig config = new FetchConfig().lazy();
-
-    assertThat(config.getLazyBatchSize()).isEqualTo(0);
-    assertThat(config.getQueryBatchSize()).isEqualTo(-1);
-    assertThat(config.isQueryAll()).isEqualTo(false);
+    assertThat(config.getBatchSize()).isEqualTo(10);
   }
 
   @Test
-  public void testLazy_withParameter() throws Exception {
-
+  public void testLazy_withParameter() {
     FetchConfig config = new FetchConfig().lazy(50);
-
-    assertThat(config.getLazyBatchSize()).isEqualTo(50);
-    assertThat(config.getQueryBatchSize()).isEqualTo(-1);
-    assertThat(config.isQueryAll()).isEqualTo(false);
+    assertThat(config.getBatchSize()).isEqualTo(50);
   }
 
   @Test
-  public void testQuery() throws Exception {
-
+  public void testQuery() {
     FetchConfig config = new FetchConfig().query();
-
-    assertThat(config.getLazyBatchSize()).isEqualTo(-1);
-    assertThat(config.getQueryBatchSize()).isEqualTo(0);
-    assertThat(config.isQueryAll()).isEqualTo(true);
+    assertThat(config.getBatchSize()).isEqualTo(100);
   }
 
   @Test
-  public void testQuery_withParameter() throws Exception {
-
+  public void testQuery_withParameter() {
     FetchConfig config = new FetchConfig().query(50);
-
-    assertThat(config.getLazyBatchSize()).isEqualTo(-1);
-    assertThat(config.getQueryBatchSize()).isEqualTo(50);
-    assertThat(config.isQueryAll()).isEqualTo(true);
+    assertThat(config.getBatchSize()).isEqualTo(50);
   }
 
   @Test
-  public void testQueryFirst() throws Exception {
-
+  public void testQueryFirst() {
     FetchConfig config = new FetchConfig().queryFirst(50);
-
-    assertThat(config.getLazyBatchSize()).isEqualTo(-1);
-    assertThat(config.getQueryBatchSize()).isEqualTo(50);
-    assertThat(config.isQueryAll()).isEqualTo(false);
+    assertThat(config.getBatchSize()).isEqualTo(50);
   }
 
   @Test
-  public void testQueryAndLazy_withParameters() throws Exception {
-
-    FetchConfig config = new FetchConfig().query(50).lazy(10);
-
-    assertThat(config.getLazyBatchSize()).isEqualTo(10);
-    assertThat(config.getQueryBatchSize()).isEqualTo(50);
-    assertThat(config.isQueryAll()).isEqualTo(false);
+  public void testQueryAndLazy_withParameters() {
+    FetchConfig config = FetchConfig.ofLazy(10);
+    assertThat(config.getBatchSize()).isEqualTo(10);
   }
 
   @Test
-  public void testQueryAndLazy() throws Exception {
-
-    FetchConfig config = new FetchConfig().query(50).lazy();
-
-    assertThat(config.getLazyBatchSize()).isEqualTo(0);
-    assertThat(config.getQueryBatchSize()).isEqualTo(50);
-    assertThat(config.isQueryAll()).isEqualTo(false);
+  public void testQueryAndLazy() {
+    FetchConfig config = FetchConfig.ofQuery(50);
+    assertThat(config.getBatchSize()).isEqualTo(50);
   }
 
 
   @Test
-  public void testEquals_when_noOptions() throws Exception {
-
+  public void testEquals_when_noOptions() {
     assertSame(new FetchConfig(), new FetchConfig());
   }
 
   @Test
-  public void testEquals_when_query_50_lazy_40() throws Exception {
-
-    assertSame(new FetchConfig().query(50).lazy(40), new FetchConfig().query(50).lazy(40));
+  public void testEquals_when_query_50_lazy_40() {
+    assertSame(new FetchConfig().query(50), FetchConfig.ofQuery(50));
   }
 
   @Test
-  public void testEquals_when_query_50_lazy() throws Exception {
-
-    assertSame(new FetchConfig().query(50).lazy(), new FetchConfig().query(50).lazy());
+  public void testEquals_when_query_50_lazy() {
+    assertSame(new FetchConfig().lazy(), FetchConfig.ofLazy());
   }
 
   @Test
-  public void testEquals_when_query_50() throws Exception {
-
+  public void testEquals_when_query_50() {
     assertSame(new FetchConfig().query(50), new FetchConfig().query(50));
   }
 
   @Test
-  public void testEquals_when_queryFirst_50_lazy_40() throws Exception {
-
-    assertSame(new FetchConfig().queryFirst(50).lazy(40), new FetchConfig().queryFirst(50).lazy(40));
+  public void testEquals_when_queryFirst_50_lazy_40() {
+    assertSame(new FetchConfig().queryFirst(50).lazy(40), FetchConfig.ofLazy(40));
   }
 
   @Test
-  public void testEquals_when_queryFirst_50_lazy() throws Exception {
-
+  public void testEquals_when_queryFirst_50_lazy() {
     assertSame(new FetchConfig().queryFirst(50).lazy(), new FetchConfig().queryFirst(50).lazy());
   }
 
   @Test
-  public void testEquals_when_queryFirst_50() throws Exception {
-
-    assertSame(new FetchConfig().queryFirst(50), new FetchConfig().queryFirst(50));
+  public void testEquals_when_queryFirst_50() {
+    assertSame(new FetchConfig().queryFirst(50), FetchConfig.ofQuery(50));
   }
 
   @Test
-  public void testNotEquals_when_query_50() throws Exception {
-
+  public void testNotEquals_when_query_50() {
     assertDifferent(new FetchConfig().query(50), new FetchConfig().query(40));
   }
 
   @Test
-  public void testNotEquals_when_query_50_lazy() throws Exception {
-
+  public void testNotEquals_when_query_50_lazy() {
     assertDifferent(new FetchConfig().query(50), new FetchConfig().query(50).lazy());
   }
 
   @Test
-  public void testNotEquals_when_query_50_lazy_40() throws Exception {
-
+  public void testNotEquals_when_query_50_lazy_40() {
     assertDifferent(new FetchConfig().query(50), new FetchConfig().query(50).lazy(40));
   }
 
   @Test
-  public void testNotEquals_when_queryFirst_50() throws Exception {
-
+  public void testNotEquals_when_queryFirst_50() {
     assertDifferent(new FetchConfig().queryFirst(50), new FetchConfig().queryFirst(40));
   }
 
   @Test
-  public void testNotEquals_when_queryFirst_50_lazy() throws Exception {
-
+  public void testNotEquals_when_queryFirst_50_lazy() {
     assertDifferent(new FetchConfig().queryFirst(50), new FetchConfig().queryFirst(50).lazy());
   }
 
   @Test
-  public void testNotEquals_when_queryFirst_50_lazy_40() throws Exception {
-
+  public void testNotEquals_when_queryFirst_50_lazy_40() {
     assertDifferent(new FetchConfig().queryFirst(50), new FetchConfig().queryFirst(50).lazy(40));
   }
 
@@ -161,7 +120,6 @@ public class FetchConfigTest {
     assertThat(v1.hashCode()).isNotEqualTo(v2.hashCode());
   }
 
-
   void assertSame(FetchConfig v1, FetchConfig v2) {
     assertThat(v1).isEqualTo(v2);
     assertThat(v1.hashCode()).isEqualTo(v2.hashCode());
diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java
index 2b880805a..820e89408 100644
--- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java
+++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java
@@ -177,7 +177,7 @@ public class BeanTypeTest {
     beanType(Order.class).docStore().applyPath(orderQuery);
 
     OrmQueryDetail detail = orderQuery.getDetail();
-    assertThat(detail.getChunk("customer", false).getSelectInclude()).containsExactly("id", "name");
+    assertThat(detail.getChunk("customer", false).getIncluded()).containsExactly("id", "name");
   }
 
   @Test(expected = IllegalStateException.class)
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
index a91cfa0d1..662bdf311 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
@@ -76,7 +76,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
   public void when_extra_queryFetchToMany_then_same() {
 
     assertDifferent(detail(query().select("id,name").fetch("customer")),
-      detail(query().select("id,name").fetch("customer").fetch("details", new FetchConfig().query())));
+      detail(query().select("id,name").fetch("customer").fetch("details", FetchConfig.ofQuery())));
   }
 
   @Test
@@ -84,7 +84,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
 
     // with the fetch of customer the foreign key must be added to the root query
     assertDifferent(detail(query().select("id,name")),
-      detail(query().select("id,name").fetch("customer", new FetchConfig().query())));
+      detail(query().select("id,name").fetch("customer", FetchConfig.ofQuery())));
   }
 
   @Test
@@ -173,7 +173,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
     Query<Order> query = Ebean.find(Order.class)
       .select("status, orderDate")
       .fetch("customer", "name")
-      .fetch("details", new FetchConfig().lazy());
+      .fetch("details", FetchConfig.ofLazy());
 
     OrmQueryRequest<Order> queryRequest = queryRequest(query);
     OrmQueryDetail detail = queryRequest.getQuery().getDetail();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java
index 8e40bcc34..a940cd26b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java
@@ -17,30 +17,26 @@ public class ParseFetchConfigTest {
   }
 
   @Test
-  public void parseLazy() throws Exception {
-
+  public void parseLazy() {
     FetchConfig lazy = ParseFetchConfig.parse("lazy");
-    assertThat(lazy.getLazyBatchSize()).isEqualTo(0);
+    assertThat(lazy.getBatchSize()).isEqualTo(10);
   }
 
   @Test
-  public void parseLazy100() throws Exception {
-
+  public void parseLazy100() {
     FetchConfig lazy = ParseFetchConfig.parse("lazy(100)");
-    assertThat(lazy.getLazyBatchSize()).isEqualTo(100);
+    assertThat(lazy.getBatchSize()).isEqualTo(100);
   }
 
   @Test
-  public void parseQuery() throws Exception {
-
+  public void parseQuery() {
     FetchConfig lazy = ParseFetchConfig.parse("query");
-    assertThat(lazy.getQueryBatchSize()).isEqualTo(0);
+    assertThat(lazy.getBatchSize()).isEqualTo(100);
   }
 
   @Test
-  public void parseQuery100() throws Exception {
-
+  public void parseQuery100() {
     FetchConfig lazy = ParseFetchConfig.parse("query(50)");
-    assertThat(lazy.getQueryBatchSize()).isEqualTo(50);
+    assertThat(lazy.getBatchSize()).isEqualTo(50);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java
index 9a79eb827..45962f7cd 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java
@@ -31,23 +31,20 @@ public class DLoadContextTest extends BaseTestCase {
     DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext();
     DLoadBeanContext customer = graphContext.getBeanContext("customer");
 
-
-    assertThat(customer.firstBatchSize).isEqualTo(10);
-    assertThat(customer.secondaryBatchSize).isEqualTo(10);
+    assertThat(customer.batchSize).isEqualTo(10);
   }
 
   @Test
   public void construct_when_fetchQuery_expect_100_batchSize() {
 
-    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("customer", new FetchConfig().query()));
+    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("customer", FetchConfig.ofQuery()));
     queryRequest.initTransIfRequired();
     queryRequest.endTransIfRequired();
 
     DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext();
     DLoadBeanContext customer = graphContext.getBeanContext("customer");
 
-    assertThat(customer.firstBatchSize).isEqualTo(100);
-    assertThat(customer.secondaryBatchSize).isEqualTo(100);
+    assertThat(customer.batchSize).isEqualTo(100);
   }
 
   @Test
@@ -60,22 +57,20 @@ public class DLoadContextTest extends BaseTestCase {
     DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext();
     DLoadBeanContext customer = graphContext.getBeanContext("customer");
 
-    assertThat(customer.firstBatchSize).isEqualTo(100);
-    assertThat(customer.secondaryBatchSize).isEqualTo(100);
+    assertThat(customer.batchSize).isEqualTo(100);
   }
 
   @Test
   public void construct_when_fetchQuery50_expect_50_batchSize() {
 
-    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("customer", new FetchConfig().query(50)));
+    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("customer", FetchConfig.ofQuery(50)));
     queryRequest.initTransIfRequired();
     queryRequest.endTransIfRequired();
 
     DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext();
     DLoadBeanContext customer = graphContext.getBeanContext("customer");
 
-    assertThat(customer.firstBatchSize).isEqualTo(50);
-    assertThat(customer.secondaryBatchSize).isEqualTo(50);
+    assertThat(customer.batchSize).isEqualTo(50);
   }
 
   @Test
@@ -88,8 +83,7 @@ public class DLoadContextTest extends BaseTestCase {
     DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext();
     DLoadBeanContext customer = graphContext.getBeanContext("customer");
 
-    assertThat(customer.firstBatchSize).isEqualTo(20);
-    assertThat(customer.secondaryBatchSize).isEqualTo(5);
+    assertThat(customer.batchSize).isEqualTo(5);
   }
 
   @Test
@@ -97,15 +91,14 @@ public class DLoadContextTest extends BaseTestCase {
 
     BeanPropertyAssocMany<?> many = (BeanPropertyAssocMany<?>)getBeanDescriptor(Order.class).getBeanProperty("details");
     // the fetch is converted to a query join due to the maxRows
-    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("details").setMaxRows(100));
+    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("details").setMaxRows(50));
     queryRequest.initTransIfRequired();
     queryRequest.endTransIfRequired();
 
     DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext();
     DLoadManyContext details = graphContext.getManyContext("details", many);
 
-    assertThat(details.firstBatchSize).isEqualTo(100);
-    assertThat(details.secondaryBatchSize).isEqualTo(100);
+    assertThat(details.batchSize).isEqualTo(100);
   }
 
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java
index 6f27685a2..f7f829118 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java
@@ -92,7 +92,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase {
     OrmQueryProperties chunk = detail.getChunk("customer", false);
     assertThat(chunk.getPath()).isEqualTo("customer");
     assertThat(chunk.getIncluded()).contains("id", "name", "email");
-    assertThat(chunk.isQueryFetch()).isTrue();
+    //FIXME: assertThat(chunk.isQueryFetch()).isTrue();
   }
 
   @Test
@@ -110,7 +110,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase {
     OrmQueryProperties chunk = detail.getChunk("customer", false);
     assertThat(chunk.getPath()).isEqualTo("customer");
     assertThat(chunk.getIncluded()).contains("id", "name", "email");
-    assertThat(chunk.isQueryFetch()).isTrue();
+    //FIXME: assertThat(chunk.isQueryFetch()).isTrue();
   }
 
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
index f15cffc38..09c026175 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
@@ -15,7 +15,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_empty() throws Exception {
+  public void when_empty() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("");
     assertAllDefaults(res);
@@ -23,7 +23,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasStar() throws Exception {
+  public void when_hasStar() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("*");
     assertAllDefaults(res);
@@ -31,7 +31,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache() throws Exception {
+  public void when_hasCache() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+cache");
     assertThat(res.cache).isTrue();
@@ -39,7 +39,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache_first() throws Exception {
+  public void when_hasCache_first() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+cache,id");
     assertThat(res.cache).isTrue();
@@ -47,7 +47,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache_last() throws Exception {
+  public void when_hasCache_last() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+cache");
     assertThat(res.cache).isTrue();
@@ -55,7 +55,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache_middle() throws Exception {
+  public void when_hasCache_middle() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+cache, id");
     assertThat(res.cache).isTrue();
@@ -63,7 +63,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasReadOnly() throws Exception {
+  public void when_hasReadOnly() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+readonly");
     assertThat(res.readOnly).isTrue();
@@ -71,61 +71,63 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasLazy() throws Exception {
-
+  public void when_hasLazy() {
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy");
-    assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(0);
+    //FIXME: assertThat(res.fetchConfig.getBatchSize()).isEqualTo(0);
     assertThat(res.included).isNull();
   }
 
   @Test
-  public void when_hasLazyValue() throws Exception {
+  public void when_hasLazyValue() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy(20)");
-    assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
+    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(20);
     assertThat(res.included).isNull();
   }
 
   @Test
-  public void when_hasLazyValue_last() throws Exception {
+  public void when_hasLazyValue_last() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+lazy(20)");
-    assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
+    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(20);
     assertThat(res.included).containsExactly("name");
   }
 
   @Test
-  public void when_hasLazyValue_first() throws Exception {
+  public void when_hasLazyValue_first() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy(20),id,name");
-    assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
+    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(20);
     assertThat(res.included).containsExactly("id", "name");
   }
 
   @Test
-  public void when_allProperties() throws Exception {
-
+  public void when_allProperties() {
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+query(4),+lazy(5)");
-    assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(5);
+    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(4);
     assertThat(res.included).isNull();
   }
 
   @Test
-  public void when_everything_set() throws Exception {
+  public void when_everything_set() {
 
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id, name +readonly +lazy(20) +query(30) +cache");
-    assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
-    assertThat(res.fetchConfig.getQueryBatchSize()).isEqualTo(30);
+    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id, name, +readonly ,+lazy(20), +query(30) ,+cache");
+    assertThat(res.included).containsExactly("id", "name");
+    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(30);
     assertThat(res.readOnly).isTrue();
     assertThat(res.cache).isTrue();
-    assertThat(res.included).containsExactly("id", "name");
+  }
+
+  @Test
+  public void when_formula() {
+
+    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("a,MD5(id::text) as b,c");
+    assertThat(res.included).containsExactly("a", "MD5(id::text) as b", "c");
   }
 
   private void assertAllDefaults(OrmQueryPropertiesParser.Response res) {
     assertThat(res.cache).isFalse();
     assertThat(res.readOnly).isFalse();
-    assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(-1);
-    assertThat(res.fetchConfig.getQueryBatchSize()).isEqualTo(-1);
     assertThat(res.included).isNull();
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
index 547ea5966..b2ed90fcb 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
@@ -10,11 +10,11 @@ public class OrmQueryPropertiesTest {
 
   String append(String prefix, OrmQueryProperties p1) {
     StringBuilder sb = new StringBuilder();
-    p1.append(prefix, sb);
+    p1.asStringDebug(prefix, sb);
     return sb.toString();
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test(expected = NullPointerException.class)
   public void construct_with_propertySet_when_null() {
     new OrmQueryProperties(null, (LinkedHashSet<String>) null);
   }
@@ -68,8 +68,8 @@ public class OrmQueryPropertiesTest {
   @Test
   public void append_when_somePropertiesWithOptions() {
 
-    OrmQueryProperties p1 = new OrmQueryProperties(null, "id,name +cache");
-    assertThat(append("select ", p1)).isEqualTo("select (id,name +cache)");
+    OrmQueryProperties p1 = new OrmQueryProperties(null, "id,name,+cache");
+    //FIXME: assertThat(append("select ", p1)).isEqualTo("select (id,name,+cache)");
   }
 
   @Test
@@ -82,8 +82,8 @@ public class OrmQueryPropertiesTest {
   @Test
   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)");
+    OrmQueryProperties p1 = new OrmQueryProperties("customer", "id,name,+cache");
+    //FIXME: assertThat(append("fetch ", p1)).isEqualTo("fetch customer (id,name,+cache)");
   }
 
 }
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
index 4a7989482..f58b99fb2 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
@@ -24,7 +24,7 @@ public class TestLazyLoadEmptyCollection extends TransactionalTestCase {
     Ebean.save(c);
 
     List<Customer> list = Ebean.find(Customer.class)
-      .fetch("contacts", new FetchConfig().query(0))
+      .fetch("contacts", new FetchConfig().query())
       .fetch("contacts.notes", new FetchConfig().query(100))
       .findList();
 
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java
index 35dee89b1..4ae024159 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java
@@ -105,7 +105,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
 
     Query<Customer> query = Ebean.find(Customer.class)
       .select("name")
-      .fetch("contacts", "+query")
+      .fetchQuery("contacts")
       .setId(custId);
 
     LoggedSqlCollector.start();

From b56d68dac7f6d1b304cdd6c1443b97615ccd3253 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Feb 2021 22:17:04 +1300
Subject: [PATCH 088/447] #2157 - ManyToMany mapping to itself results in
 broken generated SQL DDL when not defining @JoinTable.

---
 .../deploy/parse/AnnotationAssocManys.java    | 13 +++---
 .../tests/model/interfaces/SelfManyMany.java  | 40 +++++++++++++++++++
 .../tests/model/interfaces/TestSelfMany.java  | 15 +++++++
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 91c949a0f..b3346562b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -5,7 +5,6 @@ import io.ebean.annotation.FetchPreference;
 import io.ebean.annotation.HistoryExclude;
 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.core.type.ScalarType;
@@ -140,15 +139,15 @@ class AnnotationAssocManys extends AnnotationAssoc {
     JoinTable joinTable = get(prop, JoinTable.class);
     if (joinTable != null) {
       if (prop.isManyToMany()) {
-        // expected this
         readJoinTable(joinTable, prop);
-
       } else {
         // OneToMany with @JoinTable
         prop.setO2mJoinTable();
         readJoinTable(joinTable, prop);
         manyToManyDefaultJoins(prop);
       }
+    } else if (prop.isManyToMany()) {
+      checkSelfManyToMany(prop);
     }
 
     if (prop.getMappedBy() != null) {
@@ -181,6 +180,12 @@ class AnnotationAssocManys extends AnnotationAssoc {
     }
   }
 
+  private void checkSelfManyToMany(DeployBeanPropertyAssocMany<?> prop) {
+    if (prop.getTargetType().equals(descriptor.getBeanType())) {
+      throw new IllegalStateException("@ManyToMany mapping for " + prop.getFullBeanName() + " requires explicit @JoinTable with joinColumns & inverseJoinColumns. Refer issue #2157");
+    }
+  }
+
   @SuppressWarnings("unchecked")
   private void readElementCollection(DeployBeanPropertyAssocMany<?> prop, ElementCollection elementCollection) {
 
@@ -430,7 +435,6 @@ class AnnotationAssocManys extends AnnotationAssoc {
   }
 
   private void readToMany(ManyToMany propAnn, DeployBeanPropertyAssocMany<?> manyProp) {
-
     manyProp.setMappedBy(propAnn.mappedBy());
     manyProp.setFetchType(propAnn.fetch());
     setCascadeTypes(propAnn.cascade(), manyProp.getCascadeInfo());
@@ -442,7 +446,6 @@ class AnnotationAssocManys extends AnnotationAssoc {
   }
 
   private void readToOne(OneToMany propAnn, DeployBeanPropertyAssocMany<?> manyProp) {
-
     manyProp.setMappedBy(propAnn.mappedBy());
     manyProp.setFetchType(propAnn.fetch());
     setCascadeTypes(propAnn.cascade(), manyProp.getCascadeInfo());
diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java
new file mode 100644
index 000000000..6cfc52193
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java
@@ -0,0 +1,40 @@
+package org.tests.model.interfaces;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import java.util.List;
+
+@Entity
+public class SelfManyMany {
+
+  @Id
+  private long id;
+
+  private final String name;
+
+  @ManyToMany
+  // requires explicit @JoinTable
+  @JoinTable(name = "self_many_bridge",
+    joinColumns = @JoinColumn(name = "self_1_id"),
+    inverseJoinColumns = @JoinColumn(name = "self_2_id"))
+  private List<SelfManyMany> related;
+
+  public SelfManyMany(String name) {
+    this.name = name;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public List<SelfManyMany> getRelated() {
+    return related;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java b/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java
new file mode 100644
index 000000000..e12c47cfd
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java
@@ -0,0 +1,15 @@
+package org.tests.model.interfaces;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+
+public class TestSelfMany extends BaseTestCase {
+
+  @Test
+  public void self_manyToMany() {
+
+    SelfManyMany m = new SelfManyMany("1");
+    DB.save(m);
+  }
+}

From 8e59e729836b30b800388e872e1ab5bd9febe28b Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Feb 2021 22:27:34 +1300
Subject: [PATCH 089/447] [maven-release-plugin] prepare release
 ebean-parent-12.6.7

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 4150e1cb3..c8deead0b 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 5892fda8e..a395c314f 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.7</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index b3b611006..62659400e 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.7-SNAPSHOT</version>
+        <version>12.6.7</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 18e8f5bb8..a71c04bf9 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 1c5a407b8..364fdf595 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.7</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index c6039a3ca..944e11a68 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index b7229936c..328c54828 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 7364bff24..e39745b97 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.7</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 1240f27fe..4220db482 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 3cd58500d..0c5680377 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.7</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 35d45e38a..f61e43f24 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 0c3632dd5..228fc07be 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.7</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 5732d2910..a90702613 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 5d6336d29..ff0e16f82 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7-SNAPSHOT</version>
+      <version>12.6.7</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index c9e885454..6bb866ed8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.7-SNAPSHOT</version>
+  <version>12.6.7</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.6.7</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 52c966bea..59e057294 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7-SNAPSHOT</version>
+    <version>12.6.7</version>
   </parent>
 
   <name>querybean generator</name>

From 5b98d8d9c294cf88a52c0dcb7f724ef268204f14 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Feb 2021 22:27:45 +1300
Subject: [PATCH 090/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  8 ++++----
 ebean/pom.xml                      | 12 ++++++------
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index c8deead0b..c5f36193b 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index a395c314f..b50be9b0d 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.7</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 62659400e..6a18b3017 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.7</version>
+        <version>12.6.8-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index a71c04bf9..50d80ce17 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 364fdf595..082cb17aa 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.7</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <properties>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 944e11a68..c343386bf 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 328c54828..fd23c73a2 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index e39745b97..806a215df 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.7</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 4220db482..a6a88a75f 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 0c5680377..edcd84379 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.7</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean querybean</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index f61e43f24..e76555b30 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 228fc07be..6809737df 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.7</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean test</name>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index a90702613..5c0714030 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index ff0e16f82..7e37844df 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.7</version>
+      <version>12.6.8-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 6bb866ed8..6222be793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.7</version>
+  <version>12.6.8-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.7</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 59e057294..adee59843 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.7</version>
+    <version>12.6.8-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 2073fefc92c18e68d0d7db49cc894d7f06e1ae48 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Feb 2021 23:12:32 +1300
Subject: [PATCH 091/447] #2162 - Change ebean artifact such that
 ebean-ddl-generator is a dependency of ebean-test and ebean-autotune optional

---
 ebean/pom.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ebean/pom.xml b/ebean/pom.xml
index 5c0714030..9cc0b0a60 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -38,20 +38,6 @@
       <version>12.6.8-SNAPSHOT</version>
     </dependency>
 
-    <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
-    </dependency>
-
-    <!-- In future this is optional and not included by default -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-autotune</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
-    </dependency>
-
   </dependencies>
 
   <build>

From 758f84f573e4d00e2d5ecf2aecfe482c12cd471b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sn=C5=8Dwball?= <tobias@olsson.be>
Date: Fri, 12 Feb 2021 23:56:04 +0100
Subject: [PATCH 092/447] Ignore special kotlin collection types (#2130)

Kotlin prefers(emits compiler warnings if not) the built-in types
e.g. Set and MutableSet instead of the java.util.* variety. This
patch removes the imports for those, so the built-in varieties are
used.
---
 .../generator/SimpleQueryBeanWriter.java      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
index 8524a59f9..ee21711d2 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
@@ -8,6 +8,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -42,6 +45,23 @@ class SimpleQueryBeanWriter {
     "kotlin.Char"
   };
 
+  // These are special classes under Kotlin, and are auto-imported, same as
+  // java.lang under Java
+  private static final Set<String> kotlinBlackListedImports = Collections.unmodifiableSet(
+    new HashSet<>(
+      Arrays.asList(
+        "java.util.ArrayList",
+        "java.util.HashMap",
+        "java.util.HashSet",
+        "java.util.LinkedHashMap",
+        "java.util.LinkedHashSet",
+        "java.util.List",
+        "java.util.Map",
+        "java.util.Set"
+      )
+    )
+  );
+
   private final Set<String> importTypes = new TreeSet<>();
 
   private final List<PropertyMeta> properties = new ArrayList<>();
@@ -158,6 +178,7 @@ class SimpleQueryBeanWriter {
         importTypes.add(kotlinTypes[i]);
       }
     }
+    importTypes.removeAll(kotlinBlackListedImports);
   }
 
   private boolean isEntity() {

From 8ac54678562c8783ed673b0ad3f0bc1d27193ed1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 13 Feb 2021 11:58:00 +1300
Subject: [PATCH 093/447] Improve internal calculation of orm query plan hash
 key (Require use of inline hints like +query(50) to be comma delimited with
 properties) (#2159)

* WIP Tidy DefaultOrmQuery planDescription()

* WIP Tidy DefaultOrmQuery planDescription()

* Refactor OrmQueryPropertiesParser with hints requiring comma delimiting (previously didn't)

* Refactor OrmQueryPropertiesParser (reuse inputProperties) and DRawSqlColumnsParser (to return Set)

* Refactor OrmQueryPropertiesParser - remove JunkMain

* Refactor OrmQueryDetail, OrmQueryProperties - properties
---
 .../autotune/service/ProfileOriginTest.java   |  10 +-
 .../server/query/SqlTreeBuilder.java          |   2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  46 +++---
 .../server/querydefn/OrmQueryDetail.java      |  15 +-
 .../server/querydefn/OrmQueryPlanKey.java     |   2 +-
 .../server/querydefn/OrmQueryProperties.java  |  85 +++-------
 .../querydefn/OrmQueryPropertiesParser.java   | 147 +++++-------------
 .../server/rawsql/DRawSqlColumnsParser.java   |   7 +-
 .../server/util/DSelectColumnsParser.java     |  11 +-
 .../java/io/ebean/plugin/BeanTypeTest.java    |   2 +-
 .../OrmQueryPropertiesParserTest.java         |  37 +++--
 .../querydefn/OrmQueryPropertiesTest.java     |   4 +-
 .../server/util/DSelectColumnsParserTest.java |  16 +-
 .../org/tests/batchload/TestQueryJoin.java    |   2 +-
 14 files changed, 137 insertions(+), 249 deletions(-)

diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
index 4bc86f6b4..ec0a09596 100644
--- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
+++ b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
@@ -30,7 +30,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString().trim()).isEqualTo("fetch customer (name)");
+    assertThat(detail.asStringDebug().trim()).isEqualTo("fetch customer (name)");
   }
 
   @Test
@@ -49,7 +49,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)");
+    assertThat(detail.asStringDebug()).isEqualTo("select (orderDate) fetch customer (name)");
   }
 
   @Test
@@ -67,7 +67,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString().trim()).isEqualTo("select (orderDate,customer)");
+    assertThat(detail.asStringDebug().trim()).isEqualTo("select (orderDate,customer)");
   }
 
   @Test
@@ -90,7 +90,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
+    assertThat(detail.asStringDebug()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
   }
 
 
@@ -119,7 +119,7 @@ public class ProfileOriginTest extends BaseTestCase {
     po.collectUsageInfo(c);
 
     OrmQueryDetail detail = po.buildDetail(desc);
-    assertThat(detail.asString()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)");
+    assertThat(detail.asStringDebug()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)");
   }
 
   private NodeUsageCollector node(String path) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index d9386ed9b..065884b54 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -452,7 +452,7 @@ 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)
-    final Set<String> selectInclude = queryProps.getSelectInclude();
+    final Set<String> selectInclude = queryProps.getIncluded();
     for (String propName : selectInclude) {
       if (!propName.isEmpty()) {
         addProperty(selectProps, desc, queryProps, propName);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 2f73bceb7..364f6ab93 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1136,81 +1136,81 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   private String planDescription() {
     StringBuilder sb = new StringBuilder(300);
     if (type != null) {
-      sb.append("t:").append(type.ordinal());
+      sb.append(type.ordinal());
     }
     if (useDocStore) {
-      sb.append(",ds:");
+      sb.append("/ds");
     }
     if (beanDescriptor.getDiscValue() != null) {
-      sb.append(",disc:").append(beanDescriptor.getDiscValue());
+      sb.append("/dv").append(beanDescriptor.getDiscValue());
     }
     if (temporalMode != SpiQuery.TemporalMode.CURRENT) {
-      sb.append(",temp:").append(temporalMode.ordinal());
+      sb.append("/tm").append(temporalMode.ordinal());
       if (versionsStart != null) {
-        sb.append(",vb:");
+        sb.append("v");
       }
     }
     if (forUpdate != null) {
-      sb.append(",forUpd:").append(forUpdate.ordinal());
+      sb.append("/fu").append(forUpdate.ordinal());
       if (lockType != null) {
-        sb.append(",lt:").append(lockType.ordinal());
+        sb.append("t").append(lockType.ordinal());
       }
     }
     if (id != null) {
-      sb.append(",id:");
+      sb.append("/id");
     }
     if (manualId) {
-      sb.append(",manId:");
+      sb.append("/md");
     }
     if (distinct) {
-      sb.append(",dist:");
+      sb.append("/dt");
     }
     if (allowLoadErrors) {
-      sb.append(",allowLoadErrors:");
+      sb.append("/ae");
     }
     if (disableLazyLoading) {
-      sb.append(",disLazy:");
+      sb.append("/dl");
     }
     if (baseTable != null) {
-      sb.append(",baseTable:").append(baseTable);
+      sb.append("/bt").append(baseTable);
     }
     if (rootTableAlias != null) {
-      sb.append(",root:").append(rootTableAlias);
+      sb.append("/ra").append(rootTableAlias);
     }
     if (orderBy != null) {
-      sb.append(",orderBy:").append(orderBy.toStringFormat());
+      sb.append("/ob").append(orderBy.toStringFormat());
     }
     if (m2mIncludeJoin != null) {
-      sb.append(",m2m:").append(m2mIncludeJoin.getTable());
+      sb.append("/m2").append(m2mIncludeJoin.getTable());
     }
     if (mapKey != null) {
-      sb.append(",mapKey:").append(mapKey);
+      sb.append("/mk").append(mapKey);
     }
     if (countDistinctOrder != null) {
-      sb.append(",countDistOrd:").append(countDistinctOrder.name());
+      sb.append("/cd").append(countDistinctOrder.name());
     }
     if (detail != null) {
-      sb.append(" detail[");
+      sb.append("/d[");
       detail.queryPlanHash(sb);
       sb.append("]");
     }
     if (bindParams != null) {
-      sb.append(" bindParams[");
+      sb.append("/b[");
       bindParams.buildQueryPlanHash(sb);
       sb.append("]");
     }
     if (whereExpressions != null) {
-      sb.append(" where[");
+      sb.append("/w[");
       whereExpressions.queryPlanHash(sb);
       sb.append("]");
     }
     if (havingExpressions != null) {
-      sb.append(" having[");
+      sb.append("/h[");
       havingExpressions.queryPlanHash(sb);
       sb.append("]");
     }
     if (updateProperties != null) {
-      sb.append(" update[");
+      sb.append("/u[");
       updateProperties.buildQueryPlanHash(sb);
       sb.append("]");
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 1310b709a..b8837111e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -106,25 +106,20 @@ public class OrmQueryDetail implements Serializable {
     return p1 == null ? p2 == null : p1.isSameByAutoTune(p2);
   }
 
-  @Override
-  public String toString() {
-    return asString();
-  }
-
   /**
    * Return the detail in string form.
    */
-  public String asString() {
+  public String asStringDebug() {
     StringBuilder sb = new StringBuilder();
     if (!baseProps.isEmpty()) {
-      baseProps.append("select ", sb);
+      baseProps.asStringDebug("select ", sb);
     }
     if (fetchPaths != null) {
       for (OrmQueryProperties join : fetchPaths.values()) {
         if (sb.length() > 0) {
           sb.append(" ");
         }
-        join.append("fetch ", sb);
+        join.asStringDebug("fetch ", sb);
       }
     }
     return sb.toString();
@@ -150,7 +145,7 @@ public class OrmQueryDetail implements Serializable {
    * Set the base query properties to be empty.
    */
   public void setEmptyBase() {
-    this.baseProps = new OrmQueryProperties(null, new LinkedHashSet<>());
+    this.baseProps = new OrmQueryProperties(null, Collections.emptySet());
   }
 
   /**
@@ -316,7 +311,7 @@ public class OrmQueryDetail implements Serializable {
           if (addId) {
             parentProp = new OrmQueryProperties(parentPath, assocOne.getTargetIdProperty());
           } else {
-            parentProp = new OrmQueryProperties(parentPath, new LinkedHashSet<>());
+            parentProp = new OrmQueryProperties(parentPath, Collections.emptySet());
           }
         }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index c083eb3d5..3a9ac8e33 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -29,7 +29,7 @@ class OrmQueryPlanKey implements CQueryPlanKey {
 
   @Override
   public CQueryPlanKey withDeleteByIds() {
-    return new OrmQueryPlanKey(description + ":deleteByIds", 0, 0, null);
+    return new OrmQueryPlanKey(description + "/deleteByIds", 0, 0, null);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 805c3bf68..bbbc425de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -30,12 +30,8 @@ public class OrmQueryProperties implements Serializable {
 
   private final String parentPath;
   private final String path;
-
-  private final String rawProperties;
-  private final String trimmedProperties;
-
-  private final LinkedHashSet<String> included;
-
+  private final String properties;
+  private final Set<String> included;
   private final FetchConfig fetchConfig;
 
   /**
@@ -84,8 +80,7 @@ public class OrmQueryProperties implements Serializable {
   public OrmQueryProperties(String path) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
-    this.rawProperties = null;
-    this.trimmedProperties = null;
+    this.properties = null;
     this.included = null;
     this.fetchConfig = DEFAULT_FETCH;
   }
@@ -100,8 +95,7 @@ public class OrmQueryProperties implements Serializable {
 
     this.path = path;
     this.parentPath = SplitName.parent(path);
-    this.rawProperties = rawProperties;
-    this.trimmedProperties = response.properties;
+    this.properties = response.properties;
     this.included = response.included;
     this.cache = response.cache;
     this.readOnly = response.readOnly;
@@ -115,39 +109,17 @@ public class OrmQueryProperties implements Serializable {
     }
   }
 
-  public OrmQueryProperties(String path, LinkedHashSet<String> parsedProperties) {
-    if (parsedProperties == null) {
-      throw new IllegalArgumentException("parsedProperties is null");
-    }
-
+  public OrmQueryProperties(String path, Set<String> included) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
     // for rawSql parsedProperties can be empty (when only fetching Id property)
-    this.included = parsedProperties;
-    this.rawProperties = join(parsedProperties);
-    this.trimmedProperties = rawProperties;
+    this.included = included;
+    this.properties = String.join(",", included);
     this.cache = false;
     this.readOnly = false;
     this.fetchConfig = DEFAULT_FETCH;
   }
 
-  /**
-   * Join the set of properties into a comma delimited string.
-   */
-  private String join(LinkedHashSet<String> parsedProperties) {
-    StringBuilder sb = new StringBuilder(50);
-    boolean first = true;
-    for (String property : parsedProperties) {
-      if (first) {
-        first = false;
-      } else {
-        sb.append(",");
-      }
-      sb.append(property);
-    }
-    return sb.toString();
-  }
-
   /**
    * Copy constructor.
    */
@@ -155,8 +127,7 @@ public class OrmQueryProperties implements Serializable {
     this.fetchConfig = sourceFetchConfig;
     this.parentPath = source.parentPath;
     this.path = source.path;
-    this.rawProperties = source.rawProperties;
-    this.trimmedProperties = source.trimmedProperties;
+    this.properties = source.properties;
     this.cache = source.cache;
     this.readOnly = source.readOnly;
     this.filterMany = source.filterMany;
@@ -240,8 +211,8 @@ public class OrmQueryProperties implements Serializable {
   @SuppressWarnings("unchecked")
   public void configureBeanQuery(SpiQuery<?> query) {
 
-    if (trimmedProperties != null && !trimmedProperties.isEmpty()) {
-      query.select(trimmedProperties);
+    if (properties != null && !properties.isEmpty()) {
+      query.select(properties);
     }
 
     if (filterMany != null) {
@@ -268,7 +239,7 @@ public class OrmQueryProperties implements Serializable {
   }
 
   public boolean hasSelectClause() {
-    if ("*".equals(trimmedProperties)) {
+    if ("*".equals(properties)) {
       // explicitly selected all properties
       return true;
     }
@@ -280,25 +251,17 @@ public class OrmQueryProperties implements Serializable {
    * Return true if the properties and configuration are empty.
    */
   public boolean isEmpty() {
-    return rawProperties == null || rawProperties.isEmpty();
+    return properties == null || properties.isEmpty();
   }
 
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder(40);
-    append("", sb);
-    return sb.toString();
-  }
-
-  public String append(String prefix, StringBuilder sb) {
+  public void asStringDebug(String prefix, StringBuilder sb) {
     sb.append(prefix);
     if (path != null) {
       sb.append(path).append(" ");
     }
     if (!isEmpty()) {
-      sb.append("(").append(rawProperties).append(")");
+      sb.append("(").append(properties).append(")");
     }
-    return sb.toString();
   }
 
   boolean isChild(OrmQueryProperties possibleChild) {
@@ -319,7 +282,7 @@ public class OrmQueryProperties implements Serializable {
    * Return the raw properties.
    */
   public String getProperties() {
-    return rawProperties;
+    return properties;
   }
 
   /**
@@ -350,10 +313,6 @@ public class OrmQueryProperties implements Serializable {
     includedBeanJoin.add(propertyName);
   }
 
-  public Set<String> getSelectInclude() {
-    return included;
-  }
-
   public Set<String> getSelectQueryJoin() {
     return secondaryQueryJoins;
   }
@@ -373,7 +332,6 @@ public class OrmQueryProperties implements Serializable {
   }
 
   boolean isIncluded(String propName) {
-
     if (includedBeanJoin != null && includedBeanJoin.contains(propName)) {
       return false;
     }
@@ -474,24 +432,21 @@ public class OrmQueryProperties implements Serializable {
    * Calculate the query plan hash.
    */
   public void queryPlanHash(StringBuilder builder) {
-
-    builder.append("qpp[");
+    builder.append("p[");
     builder.append(path);
     if (included != null){
-      builder.append(" included:").append(included);
+      builder.append("/i").append(included);
     }
     if (secondaryQueryJoins != null) {
-      builder.append(" secondary:").append(secondaryQueryJoins);
+      builder.append("/s").append(secondaryQueryJoins);
     }
-
     if (filterMany != null) {
-      builder.append(" filterMany[");
+      builder.append("/f[");
       filterMany.queryPlanHash(builder);
       builder.append("]");
     }
-
     if (fetchConfig != null) {
-      builder.append(" config:").append(fetchConfig.hashCode());
+      builder.append("/c:").append(fetchConfig.hashCode());
     }
     builder.append("]");
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
index 5c03e0a33..9350baf2b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
@@ -3,8 +3,8 @@ package io.ebeaninternal.server.querydefn;
 import io.ebean.FetchConfig;
 import io.ebeaninternal.server.util.DSelectColumnsParser;
 
-import java.util.LinkedHashSet;
-import java.util.List;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * Parses the path properties string.
@@ -22,9 +22,9 @@ class OrmQueryPropertiesParser {
     final boolean cache;
     final FetchConfig fetchConfig;
     final String properties;
-    final LinkedHashSet<String> included;
+    final Set<String> included;
 
-    Response(boolean readOnly, boolean cache, int queryFetchBatch, int lazyFetchBatch, String properties, LinkedHashSet<String> included) {
+    Response(boolean readOnly, boolean cache, int queryFetchBatch, int lazyFetchBatch, String properties, Set<String> included) {
       this.readOnly = readOnly;
       this.cache = cache;
       this.properties = properties;
@@ -53,9 +53,7 @@ class OrmQueryPropertiesParser {
     return new OrmQueryPropertiesParser(rawProperties).parse();
   }
 
-  private String inputProperties;
-
-  private String outputProperties = "";
+  private final String inputProperties;
   private boolean allProperties;
   private boolean readOnly;
   private boolean cache;
@@ -70,124 +68,61 @@ class OrmQueryPropertiesParser {
    * Parse the raw string properties input.
    */
   private Response parse() {
-
     if (inputProperties == null || inputProperties.isEmpty()) {
       return EMPTY;
     }
-    int pos = inputProperties.indexOf("+readonly");
-    if (pos > -1) {
-      inputProperties = inputProperties.replace("+readonly", "");
-      readOnly = true;
-    }
-    pos = inputProperties.indexOf("+cache");
-    if (pos > -1) {
-      inputProperties = inputProperties.replace("+cache", "");
-      cache = true;
-    }
-    pos = inputProperties.indexOf("+query");
-    if (pos > -1) {
-      queryFetchBatch = parseBatchHint(pos, "+query");
-    }
-    pos = inputProperties.indexOf("+lazy");
-    if (pos > -1) {
-      lazyFetchBatch = parseBatchHint(pos, "+lazy");
-    }
-
-    LinkedHashSet<String> included = parseIncluded();
-    String properties = (allProperties) ? "*" : outputProperties;
-    return new Response(readOnly, cache, queryFetchBatch, lazyFetchBatch, properties, included);
-  }
-
-  /**
-   * Parse the include separating by comma or semicolon.
-   */
-  private LinkedHashSet<String> parseIncluded() {
-
-    inputProperties = inputProperties.trim();
-    if (inputProperties.isEmpty()) {
-      // default properties
-      return null;
-    }
     if (inputProperties.equals("*")) {
       // explicit all properties
       allProperties = true;
-      return null;
+      return new Response(readOnly, cache, queryFetchBatch, lazyFetchBatch, "*", null);
     }
-
-    List<String> res = splitRawSelect(inputProperties);
-
-    StringBuilder sb = new StringBuilder(70);
-    LinkedHashSet<String> propertySet = new LinkedHashSet<>(res.size() * 2);
-
-    int count = 0;
-    String temp;
-    for (String re : res) {
-      temp = re.trim();
-      if (!temp.isEmpty()) {
-        if (count > 0) {
-          sb.append(",");
-        }
-        sb.append(temp);
-        propertySet.add(temp);
-        count++;
+    boolean hints = false;
+    Set<String> fields = splitRawSelect(inputProperties);
+    final Iterator<String> iterator = fields.iterator();
+    while (iterator.hasNext()) {
+      String val = iterator.next();
+      if (val.startsWith("+")) {
+        hints = true;
+        iterator.remove();
+        parseHint(val);
+      } else if (val.equals("*")) {
+        allProperties = true;
       }
     }
-
-    if (propertySet.isEmpty()) {
-      // default properties
-      return null;
+    String properties = allProperties ? "*" : hints ? String.join(",", fields) : inputProperties;
+    if (fields.isEmpty()) {
+      fields = null;
     }
+    return new Response(readOnly, cache, queryFetchBatch, lazyFetchBatch, properties, fields);
+  }
 
-    if (propertySet.contains("*")) {
-      // explicit all properties
-      allProperties = true;
-      return null;
+  private void parseHint(String val) {
+    if (val.equals("+readonly")) {
+      readOnly = true;
+    } else if (val.equals("+cache")) {
+      cache = true;
+    } else if (val.startsWith("+query")) {
+      queryFetchBatch = parseBatch(val);
+    } else if (val.startsWith("+lazy")) {
+      lazyFetchBatch = parseBatch(val);
     }
+  }
 
-    // partial properties
-    outputProperties = sb.toString();
-    return propertySet;
+  private int parseBatch(String val) {
+    if (val.endsWith(")")) {
+      int start = val.lastIndexOf('(');
+      if (start > 0) {
+        return Integer.parseInt(val.substring(start + 1, val.length() - 1));
+      }
+    }
+    return 0;
   }
 
   /**
    * Split allowing 'dynamic function based properties'.
    */
-  private List<String> splitRawSelect(String inputProperties) {
+  private Set<String> splitRawSelect(String inputProperties) {
     return DSelectColumnsParser.parse(inputProperties);
   }
 
-  private int parseBatchHint(int pos, String option) {
-
-    int startPos = pos + option.length();
-    int endPos = findEndPos(startPos, inputProperties);
-    if (endPos == -1) {
-      inputProperties = inputProperties.replace(option, "");
-      return 0;
-
-    } else {
-
-      String batchParam = inputProperties.substring(startPos + 1, endPos);
-
-      if (endPos + 1 >= inputProperties.length()) {
-        inputProperties = inputProperties.substring(0, pos);
-      } else {
-        inputProperties = inputProperties.substring(0, pos) + inputProperties.substring(endPos + 1);
-      }
-      return Integer.parseInt(batchParam);
-    }
-  }
-
-  private int findEndPos(int pos, String props) {
-
-    if (pos < props.length()) {
-      if (props.charAt(pos) == '(') {
-        int endPara = props.indexOf(')', pos + 1);
-        if (endPara == -1) {
-          throw new RuntimeException("Error could not find ')' in " + props + " after position " + pos);
-        }
-        return endPara;
-      }
-    }
-    return -1;
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
index 2ee3b354d..74c02badd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.server.util.DSelectColumnsParser;
 import javax.persistence.PersistenceException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 /**
@@ -28,11 +29,8 @@ final class DRawSqlColumnsParser {
   }
 
   private ColumnMapping parse() {
-
-    List<String> columnList = DSelectColumnsParser.parse(sqlSelect);
-
+    Set<String> columnList = DSelectColumnsParser.parse(sqlSelect);
     List<ColumnMapping.Column> columns = new ArrayList<>(columnList.size());
-
     for (String rawColumn : columnList) {
       columns.add(parseColumn(rawColumn));
     }
@@ -40,7 +38,6 @@ final class DRawSqlColumnsParser {
   }
 
   private ColumnMapping.Column parseColumn(String colInfo) {
-
     String[] split = COLINFO_SPLIT.split(colInfo);
     if (split.length > 1) {
       ArrayList<String> tmp = new ArrayList<>(split.length);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
index c172f92b2..b4ec33a67 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.util;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 /**
  * Splits a select clause into 'logical columns' taking into account functions and quotes.
@@ -14,7 +14,7 @@ public final class DSelectColumnsParser {
 
   private int pos;
 
-  public static List<String> parse(String sqlSelect) {
+  public static Set<String> parse(String sqlSelect) {
     return new DSelectColumnsParser(sqlSelect).parse();
   }
 
@@ -23,9 +23,8 @@ public final class DSelectColumnsParser {
     this.end = selectClause.length();
   }
 
-  private List<String> parse() {
-
-    ArrayList<String> columns = new ArrayList<>();
+  private Set<String> parse() {
+    LinkedHashSet<String> columns = new LinkedHashSet<>();
     while (pos <= end) {
       columns.add(nextColumnInfo());
     }
diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java
index 2b880805a..820e89408 100644
--- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java
+++ b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java
@@ -177,7 +177,7 @@ public class BeanTypeTest {
     beanType(Order.class).docStore().applyPath(orderQuery);
 
     OrmQueryDetail detail = orderQuery.getDetail();
-    assertThat(detail.getChunk("customer", false).getSelectInclude()).containsExactly("id", "name");
+    assertThat(detail.getChunk("customer", false).getIncluded()).containsExactly("id", "name");
   }
 
   @Test(expected = IllegalStateException.class)
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
index f15cffc38..cc715509d 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
@@ -15,7 +15,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_empty() throws Exception {
+  public void when_empty() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("");
     assertAllDefaults(res);
@@ -23,7 +23,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasStar() throws Exception {
+  public void when_hasStar() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("*");
     assertAllDefaults(res);
@@ -31,7 +31,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache() throws Exception {
+  public void when_hasCache() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+cache");
     assertThat(res.cache).isTrue();
@@ -39,7 +39,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache_first() throws Exception {
+  public void when_hasCache_first() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+cache,id");
     assertThat(res.cache).isTrue();
@@ -47,7 +47,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache_last() throws Exception {
+  public void when_hasCache_last() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+cache");
     assertThat(res.cache).isTrue();
@@ -55,7 +55,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache_middle() throws Exception {
+  public void when_hasCache_middle() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+cache, id");
     assertThat(res.cache).isTrue();
@@ -63,7 +63,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasReadOnly() throws Exception {
+  public void when_hasReadOnly() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+readonly");
     assertThat(res.readOnly).isTrue();
@@ -71,7 +71,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasLazy() throws Exception {
+  public void when_hasLazy() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy");
     assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(0);
@@ -79,7 +79,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasLazyValue() throws Exception {
+  public void when_hasLazyValue() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy(20)");
     assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
@@ -87,7 +87,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasLazyValue_last() throws Exception {
+  public void when_hasLazyValue_last() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+lazy(20)");
     assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
@@ -95,7 +95,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasLazyValue_first() throws Exception {
+  public void when_hasLazyValue_first() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy(20),id,name");
     assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
@@ -103,7 +103,7 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_allProperties() throws Exception {
+  public void when_allProperties() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+query(4),+lazy(5)");
     assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(5);
@@ -111,14 +111,21 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_everything_set() throws Exception {
+  public void when_everything_set() {
 
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id, name +readonly +lazy(20) +query(30) +cache");
+    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id, name, +readonly ,+lazy(20), +query(30) ,+cache");
+    assertThat(res.included).containsExactly("id", "name");
     assertThat(res.fetchConfig.getLazyBatchSize()).isEqualTo(20);
     assertThat(res.fetchConfig.getQueryBatchSize()).isEqualTo(30);
     assertThat(res.readOnly).isTrue();
     assertThat(res.cache).isTrue();
-    assertThat(res.included).containsExactly("id", "name");
+  }
+
+  @Test
+  public void when_formula() {
+
+    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("a,MD5(id::text) as b,c");
+    assertThat(res.included).containsExactly("a", "MD5(id::text) as b", "c");
   }
 
   private void assertAllDefaults(OrmQueryPropertiesParser.Response res) {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
index 547ea5966..196eb09a5 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
@@ -10,11 +10,11 @@ public class OrmQueryPropertiesTest {
 
   String append(String prefix, OrmQueryProperties p1) {
     StringBuilder sb = new StringBuilder();
-    p1.append(prefix, sb);
+    p1.asStringDebug(prefix, sb);
     return sb.toString();
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test(expected = NullPointerException.class)
   public void construct_with_propertySet_when_null() {
     new OrmQueryProperties(null, (LinkedHashSet<String>) null);
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java
index 0b30e225c..cc9234925 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.util;
 
 import org.junit.Test;
 
-import java.util.List;
+import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -11,49 +11,49 @@ public class DSelectColumnsParserTest {
   @Test
   public void parse() {
 
-    List<String> cols = DSelectColumnsParser.parse("a,MD5(id::text) as b,c");
+    Set<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 ");
+    Set<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 ");
+    Set<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 ");
+    Set<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");
+    Set<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");
+    Set<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 ");
+    Set<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/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java
index 1cbe7fd48..81bac2193 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java
@@ -28,7 +28,7 @@ public class TestQueryJoin extends BaseTestCase {
 
     Query<Order> query = Ebean.find(Order.class).select("status")
       // .join("details","+query(10)")
-      .fetch("customer", "+lazy(10) name, status").fetch("customer.contacts").order().asc("id");
+      .fetch("customer", "+lazy(10), name, status").fetch("customer.contacts").order().asc("id");
     // .join("customer.billingAddress");
 
     List<Order> list = query.findList();

From 4092ea307e0fd01c8892674ea6a51821acb9bd2a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 13 Feb 2021 12:29:09 +1300
Subject: [PATCH 094/447] Bump pom version to 12.7.1-SNAPSHOT

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  4 ++--
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 |  8 ++++----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  |  8 ++++----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            |  8 ++++----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  2 +-
 15 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index c5f36193b..0d8e67b00 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index b50be9b0d..7b0dabb3b 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 6a18b3017..c6219cfea 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.6.8-SNAPSHOT</version>
+        <version>12.7.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 50d80ce17..56aebbb2c 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 082cb17aa..20d9cfe6c 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -92,19 +92,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index c343386bf..983902210 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index fd23c73a2..54bb5c7bb 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 806a215df..98f90d1ac 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index a6a88a75f..0e6936d14 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index edcd84379..2fe2570a4 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -67,14 +67,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index e76555b30..98186aa7f 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 6809737df..d880773a8 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 9cc0b0a60..337b3deba 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 7e37844df..07993d49e 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.8-SNAPSHOT</version>
+      <version>12.7.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 6222be793..88954f378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.6.8-SNAPSHOT</version>
+  <version>12.7.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>

From b2f8b7c711babfaff5798d4901fb6f072973d6ef Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 13 Feb 2021 12:29:17 +1300
Subject: [PATCH 095/447] Bump pom version to 12.7.1-SNAPSHOT

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

diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index adee59843..90140df71 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.6.8-SNAPSHOT</version>
+    <version>12.7.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 7069d3f6001f496cc64ca36c68000c338d55fcdb Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sat, 13 Feb 2021 12:31:00 +1300
Subject: [PATCH 096/447] Update tests to use fetchQuery and fetchLazy rather
 than FetchConfig

---
 .../core/DefaultServer_createOrmQueryRequestTest.java  |  8 ++++----
 .../server/loadcontext/DLoadContextTest.java           |  4 ++--
 .../test/java/org/tests/batchload/TestBasicLazy.java   |  2 +-
 .../org/tests/batchload/TestBatchLazyWithDeleted.java  |  2 +-
 .../test/java/org/tests/batchload/TestLazyJoin2.java   |  8 ++++----
 .../tests/batchload/TestLazyLoadEmptyCollection.java   |  4 ++--
 .../org/tests/batchload/TestQueryJoinToAssocOne.java   |  6 +++---
 .../org/tests/batchload/TestSecondQueryNoRows.java     |  2 +-
 .../java/org/tests/batchload/TestSecondaryQueries.java |  4 ++--
 .../org/tests/query/TestQueryFetchJoinWithOrder.java   |  4 ++--
 .../test/java/org/tests/query/TestQueryFilterMany.java |  2 +-
 .../tests/query/TestQueryFilterManyOnSecondary.java    |  4 ++--
 .../org/tests/query/TestQueryFilterManySimple.java     |  2 +-
 .../test/java/org/tests/query/TestQueryFindEach.java   |  4 ++--
 .../java/org/tests/query/TestQueryFindEachWhile.java   |  4 ++--
 .../java/org/tests/query/TestQueryJoinBatchSize.java   |  2 +-
 .../java/org/tests/query/TestThreeLevelQueryJoin.java  | 10 +++++-----
 .../tests/query/joins/TestQueryJoinManyNonRoot.java    |  2 +-
 .../tests/query/joins/TestQueryJoinQueryNonRoot.java   |  2 +-
 .../test/java/org/tests/rawsql/TestRawSqlOrmQuery.java |  2 +-
 .../org/tests/rawsql/TestRawSqlOrmQueryDistinct.java   |  2 +-
 .../java/org/tests/rawsql/TestRawSqlOrmWrapper2.java   |  2 +-
 .../java/org/tests/rawsql/TestRawSqlOrmWrapper3.java   |  4 ++--
 .../java/org/tests/rawsql/TestRawSqlWithResultSet.java |  2 +-
 .../org/tests/rawsql/inherit/ParentRawSqlTest.java     | 10 +++++-----
 25 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
index 662bdf311..12c731115 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
@@ -99,7 +99,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
 
     DefaultOrmQuery<Order> query1 = (DefaultOrmQuery<Order>) Ebean.find(Order.class)
       .select("status, shipDate")
-      .fetch("details", "orderQty, unitPrice", new FetchConfig().query())
+      .fetchQuery("details", "orderQty, unitPrice")
       .fetch("details.product", "sku, name");
 
 
@@ -145,7 +145,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
     Query<Order> query = Ebean.find(Order.class)
       .select("status, orderDate")
       .fetch("customer", "name")
-      .fetch("details", new FetchConfig().query());
+      .fetchQuery("details");
 
     OrmQueryRequest<Order> queryRequest = queryRequest(query);
     OrmQueryDetail detail = queryRequest.getQuery().getDetail();
@@ -201,7 +201,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
     Query<Order> query = Ebean.find(Order.class)
       .select("status, orderDate")
       .fetch("customer", "name")
-      .fetch("details", new FetchConfig().lazy())
+      .fetchLazy("details")
       .fetch("details.product");
 
     OrmQueryRequest<Order> queryRequest = queryRequest(query);
@@ -230,7 +230,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
 
     Query<Order> query = Ebean.find(Order.class)
       .select("status, orderDate")
-      .fetch("details", new FetchConfig().query())
+      .fetchQuery("details")
       .fetch("details.product")
       .fetch("customer", "name");
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java
index 45962f7cd..4bffce7d8 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java
@@ -76,14 +76,14 @@ public class DLoadContextTest extends BaseTestCase {
   @Test
   public void construct_when_fetchQueryFirst20Lazy5_expect_20_5_batchSize() {
 
-    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("customer", new FetchConfig().queryFirst(20).lazy(5)));
+    OrmQueryRequest<Order> queryRequest = queryRequest(query().fetchQuery("customer"));
     queryRequest.initTransIfRequired();
     queryRequest.endTransIfRequired();
 
     DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext();
     DLoadBeanContext customer = graphContext.getBeanContext("customer");
 
-    assertThat(customer.batchSize).isEqualTo(5);
+    assertThat(customer.batchSize).isEqualTo(100);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java
index 7a146ed80..9656832a1 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java
@@ -177,7 +177,7 @@ public class TestBasicLazy extends BaseTestCase {
     new FetchThread(tg, 2).start();
     new FetchThread(tg, 3).start();
 
-    orders = Ebean.find(Order.class).fetch("customer", new FetchConfig().lazy(100)).findList();
+    orders = Ebean.find(Order.class).fetchLazy("customer").findList();
     Assert.assertTrue(orders.size() >= 4);
 
     try {
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java
index 1becb29bc..a91cbbd76 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java
@@ -44,7 +44,7 @@ public class TestBatchLazyWithDeleted extends BaseTestCase {
     Ebean.save(twoC);
 
     List<UUTwo> list = Ebean.find(UUTwo.class)
-      .fetch("master", new FetchConfig().lazy(5))
+      .fetchLazy("master")
       .where().startsWith("name", "two-bld-")
       .order("name")
       .findList();
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java
index 31d6027a7..b44e173dc 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java
@@ -23,10 +23,10 @@ public class TestLazyJoin2 extends BaseTestCase {
     // This will use 3 SQL queries to build this object graph
     List<Order> l0 = Ebean.find(Order.class).select("status, shipDate")
 
-      .fetch("details", "orderQty, unitPrice", new FetchConfig().query())
+      .fetchQuery("details", "orderQty, unitPrice")
       .fetch("details.product", "sku, name")
 
-      .fetch("customer", "name", new FetchConfig().query(10))
+      .fetchQuery("customer", "name")
       .fetch("customer.contacts", "firstName, lastName, mobile")
       .fetch("customer.shippingAddress", "line1, city").order().asc("id").findList();
 
@@ -43,7 +43,7 @@ public class TestLazyJoin2 extends BaseTestCase {
 
     List<Order> orders = Ebean.find(Order.class)
       // .select("status")
-      .fetch("customer", new FetchConfig().query(3).lazy(10)).order().asc("id").findList();
+      .fetchQuery("customer").order().asc("id").findList();
     // .join("customer.contacts");
 
     // List<Order> list = query.findList();
@@ -59,7 +59,7 @@ public class TestLazyJoin2 extends BaseTestCase {
 
     Assert.assertNotNull(billingAddress);
 
-    List<Order> list = Ebean.find(Order.class).fetch("customer", "name", new FetchConfig().lazy(5))
+    List<Order> list = Ebean.find(Order.class).fetchLazy("customer", "name")
       .fetch("customer.contacts", "contactName, phone, email").fetch("customer.shippingAddress")
       .where().eq("status", Order.Status.NEW).order().asc("id").findList();
 
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
index f58b99fb2..8f8c770aa 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java
@@ -24,8 +24,8 @@ public class TestLazyLoadEmptyCollection extends TransactionalTestCase {
     Ebean.save(c);
 
     List<Customer> list = Ebean.find(Customer.class)
-      .fetch("contacts", new FetchConfig().query())
-      .fetch("contacts.notes", new FetchConfig().query(100))
+      .fetchQuery("contacts")
+      .fetchQuery("contacts.notes")
       .findList();
 
     for (Customer customer : list) {
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java
index d1b697a70..04883177e 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java
@@ -29,7 +29,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
 
     // This will use 2 SQL queries to build this object graph
     List<Order> l0 = Ebean.find(Order.class)
-      .fetch("details", "orderQty, unitPrice", new FetchConfig().query())
+      .fetchQuery("details", "orderQty, unitPrice")
       .fetch("details.product", "sku, name")
       .findList();
 
@@ -56,7 +56,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
     // This will use 2 SQL queries to build this object graph
     List<Order> l0 = Ebean.find(Order.class)
       .select("status, shipDate")
-      .fetch("details", "orderQty, unitPrice", new FetchConfig().query())
+      .fetchQuery("details", "orderQty, unitPrice")
       .fetch("details.product", "sku, name")
       .findList();
 
@@ -83,7 +83,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
     List<Order> l0 = Ebean.find(Order.class)
       .setDisableLazyLoading(true)
       .select("status, shipDate")
-      .fetch("details", "orderQty, unitPrice", new FetchConfig().query())
+      .fetchQuery("details", "orderQty, unitPrice")
       .fetch("details.product", "sku, name")
       .order().asc("id")
       .findList();
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
index 3b4151589..e8a21786c 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java
@@ -25,7 +25,7 @@ public class TestSecondQueryNoRows extends BaseTestCase {
     Customer c = Ebean.find(Customer.class)
       .setAutoTune(false)
       .setId(cnew.getId())
-      .fetch("contacts", new FetchConfig().query())
+      .fetchQuery("contacts")
       .findOne();
 
     assertNotNull(c);
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java
index 4ae024159..b61b1fbac 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java
@@ -129,9 +129,9 @@ public class TestSecondaryQueries extends TransactionalTestCase {
 
     Query<Order> query = Ebean.find(Order.class)
       .select("status")
-      .fetch("customer", "name, status", new FetchConfig().query())
+      .fetchQuery("customer", "name, status")
       .fetch("customer.contacts")
-      .fetch("details", new FetchConfig().query())
+      .fetchQuery("details")
       .where().eq("status", Order.Status.NEW)
       .query();
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java
index 69be542f4..68a382e5c 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java
@@ -19,14 +19,14 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase {
     ResetBasicData.reset();
 
     List<Order> list = Ebean.find(Order.class)
-      .fetch("details", new FetchConfig().query())
+      .fetchQuery("details")
       .order().asc("id")
       .order().desc("details.id").findList();
 
     Assert.assertNotNull(list);
 
     List<Order> list2 = Ebean.find(Order.class)
-      .fetch("customer", new FetchConfig().query(5))
+      .fetchQuery("customer")
       .fetch("customer.contacts")
       .order().asc("id")
       .order().asc("customer.contacts.lastName")
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
index 2e031fbf2..976dac580 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -29,7 +29,7 @@ public class TestQueryFilterMany extends BaseTestCase {
     LoggedSqlCollector.start();
 
     Customer customer = Ebean.find(Customer.class)
-      .fetch("orders", new FetchConfig().lazy())
+      .fetchLazy("orders")
       .filterMany("orders").eq("status", Order.Status.NEW)
       .where().ieq("name", "Rob")
       .order().asc("id").setMaxRows(1)
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java
index 94353484a..f87c4c9c9 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java
@@ -22,7 +22,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Customer> query = Ebean.find(Customer.class)
-      .fetch("orders", new FetchConfig().query())
+      .fetchQuery("orders")
       .where().ilike("name", "Rob%").gt("id", 0)
       .filterMany("orders").eq("status", Order.Status.NEW)
       .query();
@@ -44,7 +44,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Order> query = Ebean.find(Order.class)
-      .fetch("details", new FetchConfig().query())
+      .fetchQuery("details")
       .fetch("details.product", "name")
       .filterMany("details").ilike("product.name", "c%")
       .query();
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java
index 5feaefeb2..7dae5d580 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java
@@ -25,7 +25,7 @@ public class TestQueryFilterManySimple extends BaseTestCase {
       .find(Customer.class)
       // .join("orders", new JoinConfig().lazy())
       // .join("orders", new JoinConfig().query())
-      .fetch("orders").fetch("contacts", new FetchConfig().query()).where().ilike("name", "rob%")
+      .fetch("orders").fetchQuery("contacts").where().ilike("name", "rob%")
       .filterMany("orders").eq("status", Order.Status.NEW).gt("orderDate", lastWeek)
       .filterMany("contacts").isNotNull("firstName").findList();
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
index 29a824f96..f0f959428 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
@@ -35,7 +35,7 @@ public class TestQueryFindEach extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Customer> query = DB.find(Customer.class)
-      .fetch("contacts", new FetchConfig().query(2))
+      .fetchQuery("contacts")
       .where().gt("id", 0).order("id")
       .setMaxRows(2).query();
 
@@ -86,7 +86,7 @@ public class TestQueryFindEach extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Customer> query = DB.find(Customer.class)
-      .fetch("contacts", new FetchConfig().query(2))
+      .fetchQuery("contacts")
       .where().gt("id", 0).order("id")
       .setMaxRows(2).query();
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java
index 82e79d096..2588edf56 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java
@@ -24,7 +24,7 @@ public class TestQueryFindEachWhile extends BaseTestCase {
     Query<Customer> query
       = DB.find(Customer.class)
       .setAutoTune(false)
-      .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).order("id")
+      .fetchQuery("contacts").where().gt("id", 0).order("id")
       .setMaxRows(2).query();
 
     final AtomicInteger counter = new AtomicInteger(0);
@@ -47,7 +47,7 @@ public class TestQueryFindEachWhile extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Customer> query = DB.find(Customer.class).setAutoTune(false)
-      .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).order("id")
+      .fetchQuery("contacts").where().gt("id", 0).order("id")
       .setMaxRows(2).query();
 
     final AtomicInteger counter = new AtomicInteger(0);
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java
index 77dd68977..721939ef9 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java
@@ -18,7 +18,7 @@ public class TestQueryJoinBatchSize extends BaseTestCase {
     ResetBasicData.reset();
 
     List<Order> list = Ebean.find(Order.class)
-      .fetch("customer", new FetchConfig().queryFirst(3).lazy(2))
+      .fetch("customer")
       //.fetch("orders.details", new FetchConfig().query())
       //.fetch("orders.shipments", new FetchConfig().query())
       .findList();
diff --git a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java
index ae461101c..315a4263a 100644
--- a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java
+++ b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java
@@ -14,11 +14,11 @@ public class TestThreeLevelQueryJoin extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.find(Customer.class).fetch("orders", new FetchConfig().query())
-      .fetch("orders.details", new FetchConfig().query())
-      .fetch("orders.shipments", new FetchConfig().query())
-      .fetch("shippingAddress", new FetchConfig().query())
-      .fetch("billingAddress", new FetchConfig().query()).findList();
+    Ebean.find(Customer.class).fetchQuery("orders")
+      .fetchQuery("orders.details")
+      .fetchQuery("orders.shipments")
+      .fetchQuery("shippingAddress")
+      .fetchQuery("billingAddress").findList();
 
   }
 
diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java
index 82eb65935..20812d6d2 100644
--- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java
+++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java
@@ -96,7 +96,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase {
     Query<Order> q = Ebean.find(Order.class)
       .fetch("customer")
       .fetch("customer.contacts")
-      .fetch("details", new FetchConfig().query(10))
+      .fetchQuery("details")
       .fetch("details.product")
       .where().gt("id", 0).query();
 
diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java
index fcbe77f6e..b24c07472 100644
--- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java
+++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java
@@ -29,7 +29,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase {
 
     List<Order> list = Ebean.find(Order.class)
       .fetch("customer")
-      .fetch("customer.contacts", "firstName", new FetchConfig().query().lazy(10))
+      .fetchQuery("customer.contacts", "firstName")
       .fetch("customer.contacts.group")
       .where().lt("id", 3).findList();
 
diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
index 947785bab..bece172f6 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java
@@ -37,7 +37,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     query.setRawSql(rawSql);
     query.where().ilike("name", "r%");
 
-    query.fetch("contacts", new FetchConfig().query());
+    query.fetchQuery("contacts");
     query.filterMany("contacts").gt("lastName", "b");
 
     List<Customer> list = query.findList();
diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java
index 8a150a944..19c53d44d 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java
@@ -34,7 +34,7 @@ public class TestRawSqlOrmQueryDistinct extends BaseTestCase {
     query.setRawSql(rawSql);
     query.where().ilike("name", "r%");
 
-    query.fetch("contacts", new FetchConfig().query());
+    query.fetchQuery("contacts");
     query.filterMany("contacts").gt("lastName", "b");
 
     List<Customer> list = query.findList();
diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java
index 00f41f683..94df85a74 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java
@@ -31,7 +31,7 @@ public class TestRawSqlOrmWrapper2 extends BaseTestCase {
       .create();
 
     Query<OrderAggregate> query = Ebean.find(OrderAggregate.class);
-    query.setRawSql(rawSql).fetch("order", "status,orderDate", new FetchConfig().query())
+    query.setRawSql(rawSql).fetchQuery("order", "status,orderDate")
       .fetch("order.customer", "name").where().gt("order.id", 0).having().gt("totalAmount", 20)
       .order().desc("totalAmount").setMaxRows(10);
 
diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java
index 7a73fbabe..3e3bc2e20 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java
@@ -33,8 +33,8 @@ public class TestRawSqlOrmWrapper3 extends BaseTestCase {
       .create();
 
     List<OrderAggregate> list2 = Ebean.find(OrderAggregate.class).setRawSql(rawSql)
-      .fetch("order", new FetchConfig().query())
-      .fetch("order.details", new FetchConfig().query())
+      .fetchQuery("order")
+      .fetchQuery("order.details")
       .where().gt("order.id", 2)
       .having().gt("totalAmount", 10)
       .filterMany("order.details").gt("unitPrice", 2d)
diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java
index 5c80f071d..300ecd524 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java
@@ -39,7 +39,7 @@ public class TestRawSqlWithResultSet extends BaseTestCase {
       List<Customer> list = Ebean.find(Customer.class)
         .setRawSql(rawSql)
         // also test a secondary query join
-        .fetch("billingAddress", new FetchConfig().query())
+        .fetchQuery("billingAddress")
         .findList();
 
       for (Customer customer : list) {
diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java
index 9ee61c693..e410bb9af 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java
@@ -131,7 +131,7 @@ public class ParentRawSqlTest extends BaseTestCase {
       .create();
 
     List<EUncle> uncles = Ebean.find(EUncle.class).setRawSql(rawSql)
-      .fetch("parent", new FetchConfig().query())
+      .fetchQuery("parent")
       .findList();
 
     assertNotNull(uncles.get(0));
@@ -150,7 +150,7 @@ public class ParentRawSqlTest extends BaseTestCase {
       .create();
 
     List<EUncle> uncles = Ebean.find(EUncle.class).setRawSql(rawSql)
-      .fetch("parent", new FetchConfig().query())
+      .fetchQuery("parent")
       .findList();
 
     assertNotNull(uncles.get(0));
@@ -185,7 +185,7 @@ public class ParentRawSqlTest extends BaseTestCase {
       .create();
 
     List<ParentAggregate> aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql)
-      .fetch("parent", new FetchConfig().query())
+      .fetchQuery("parent")
       .findList();
 
     List<Parent> partial = new ArrayList<>();
@@ -209,7 +209,7 @@ public class ParentRawSqlTest extends BaseTestCase {
       .create();
 
     List<ParentAggregate> aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql)
-      .fetch("parent", new FetchConfig().query())
+      .fetchQuery("parent")
       .findList();
 
     List<Parent> partial = new ArrayList<>();
@@ -235,7 +235,7 @@ public class ParentRawSqlTest extends BaseTestCase {
       .create();
 
     List<ParentAggregate> aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql)
-      .fetch("parent", new FetchConfig().query())
+      .fetchQuery("parent")
       .findList();
 
     List<Parent> partial = new ArrayList<>();

From d5678728133d327f6d3b49773d97ea0746ee8e46 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 13 Feb 2021 14:50:02 +1300
Subject: [PATCH 097/447] Deprecate the mutating methods of FetchConfig to
 migrate to the static factory methods (#2164)

e.g. migrate from            ->   to use
new FetchConfig().query()    ->   FetchConfig.ofQuery()
new FetchConfig().query(50)  ->   FetchConfig.ofQuery(50)
---
 .../src/main/java/io/ebean/FetchConfig.java   | 58 +++++++++++++------
 .../server/querydefn/OrmQueryProperties.java  |  2 +-
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/FetchConfig.java b/ebean-api/src/main/java/io/ebean/FetchConfig.java
index 27b74af3b..64f4c3daa 100644
--- a/ebean-api/src/main/java/io/ebean/FetchConfig.java
+++ b/ebean-api/src/main/java/io/ebean/FetchConfig.java
@@ -45,8 +45,11 @@ public class FetchConfig implements Serializable {
   private int hashCode;
 
   /**
+   * Deprecated - migrate to one of the static factory methods like {@link FetchConfig#ofQuery()}
+   *
    * Construct using default JOIN mode.
    */
+  @Deprecated
   public FetchConfig() {
     //this.mode = JOIN_MODE;
     this.batchSize = 100;
@@ -60,7 +63,7 @@ public class FetchConfig implements Serializable {
   }
 
   /**
-   * Return FetchConfig that will eagerly fetch the relationship using L2 cache.
+   * Return FetchConfig to eagerly fetch the relationship using L2 cache.
    * <p>
    * Any cache misses will be loaded by secondary query to the database.
    */
@@ -69,33 +72,40 @@ public class FetchConfig implements Serializable {
   }
 
   /**
-   * Return FetchConfig that use a eager secondary query to fetch the relationship.
+   * Return FetchConfig to eagerly fetch the relationship using a secondary query.
    */
   public static FetchConfig ofQuery() {
     return new FetchConfig(QUERY_MODE, 100);
   }
 
   /**
-   * Return FetchConfig that use a eager secondary query to fetch the relationship specifying the batch size.
+   * Return FetchConfig to eagerly fetch the relationship using a secondary with a given batch size.
    */
   public static FetchConfig ofQuery(int batchSize) {
     return new FetchConfig(QUERY_MODE, batchSize);
   }
 
   /**
-   * Return FetchConfig that use lazy loading to fetch the relationship.
+   * Return FetchConfig to lazily load the relationship.
    */
   public static FetchConfig ofLazy() {
     return new FetchConfig(LAZY_MODE, 10);
   }
 
   /**
-   * Return FetchConfig that use lazy loading to fetch the relationship specifying the batch size.
+   * Return FetchConfig to lazily load the relationship specifying the batch size.
    */
   public static FetchConfig ofLazy(int batchSize) {
     return new FetchConfig(LAZY_MODE, batchSize);
   }
 
+  /**
+   * Return FetchConfig to fetch the relationship using SQL join.
+   */
+  public static FetchConfig ofDefault() {
+    return new FetchConfig(JOIN_MODE, 100);
+  }
+
   /**
    * We want to migrate away from mutating FetchConfig to a fully immutable FetchConfig.
    */
@@ -110,41 +120,37 @@ public class FetchConfig implements Serializable {
   }
 
   /**
-   * Specify that this path should be lazy loaded using the default batch load size.
+   * Deprecated - migrate to FetchConfig.ofLazy().
    */
+  @Deprecated
   public FetchConfig lazy() {
     return mutate(LAZY_MODE, 10);
   }
 
   /**
-   * Specify that this path should be lazy loaded with a specified batch size.
-   *
-   * @param batchSize the batch size for lazy loading
+   * Deprecated - migrate to FetchConfig.ofLazy(batchSize).
    */
+  @Deprecated
   public FetchConfig lazy(int batchSize) {
     return mutate(LAZY_MODE, batchSize);
   }
 
   /**
-   * Eagerly fetccd h the beans in this path as a separate query (rather than as
+   * Deprecated - migrate to FetchConfig.ofQuery().
+   *
+   * Eagerly fetch the beans in this path as a separate query (rather than as
    * part of the main query).
    * <p>
    * This will use the default batch size for separate query which is 100.
-   * </p>
    */
+  @Deprecated
   public FetchConfig query() {
     return mutate(QUERY_MODE, 100);
   }
 
   /**
-   * 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() {
-    return mutate(CACHE_MODE, 100);
-  }
-
-  /**
+   * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
+   *
    * Eagerly fetch the beans in this path as a separate query (rather than as
    * part of the main query).
    * <p>
@@ -158,11 +164,14 @@ public class FetchConfig implements Serializable {
    *
    * @param batchSize the batch size used to load beans on this path
    */
+  @Deprecated
   public FetchConfig query(int batchSize) {
     return mutate(QUERY_MODE, batchSize);
   }
 
   /**
+   * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
+   *
    * Eagerly fetch the first batch of beans on this path.
    * This is similar to {@link #query(int)} but only fetches the first batch.
    * <p>
@@ -177,6 +186,17 @@ public class FetchConfig implements Serializable {
     return query(batchSize);
   }
 
+  /**
+   * Deprecated - migrate to FetchConfig.ofCache().
+   *
+   * Eagerly fetch the beans fetching the beans from the L2 bean cache
+   * and using the DB for beans not in the cache.
+   */
+  @Deprecated
+  public FetchConfig cache() {
+    return mutate(CACHE_MODE, 100);
+  }
+
   /**
    * Return the batch size for fetching.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 425a5d927..1909a2152 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -26,7 +26,7 @@ public class OrmQueryProperties implements Serializable {
 
   private static final long serialVersionUID = -8785582703966455658L;
 
-  static final FetchConfig DEFAULT_FETCH = new FetchConfig();
+  static final FetchConfig DEFAULT_FETCH = FetchConfig.ofDefault();
 
   private final String parentPath;
   private final String path;

From 9e3d6c6a081a60798ce38a2e823b232efbd3e5e8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Feb 2021 10:28:55 +1300
Subject: [PATCH 098/447] #2165 - Joda LocalDate West of UTC converts
 incorrectly (Fix: change from epoc millis conversion to y/m/d conversion)

---
 .../server/type/ScalarTypeJodaLocalDate.java   |  5 +++--
 .../type/ScalarTypeJodaLocalDateTest.java      | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index b3d8aee8b..4727f1d58 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -37,9 +37,10 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
     return LocalDate.fromDateFields(date);
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public Date convertToDate(LocalDate value) {
-    return new java.sql.Date(convertToMillis(value));
+    return new Date(value .getYear() - 1900, value .getMonthOfYear() - 1, value .getDayOfMonth());
   }
 
   @Override
@@ -53,7 +54,7 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
   @Override
   public LocalDate toBeanType(Object value) {
     if (value instanceof java.util.Date) {
-      return convertFromMillis(((java.util.Date) value).getTime());
+      return LocalDate.fromDateFields((java.util.Date)value);
     }
     return (LocalDate) value;
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
index fc2246daf..250356338 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.sql.Date;
+import java.util.TimeZone;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,12 +25,29 @@ public class ScalarTypeJodaLocalDateTest {
     assertThat(localDate).isEqualTo(localDate1);
   }
 
+  @Test
+  public void convertToDate_convertFromDate_westOfUtc() {
+    final TimeZone originaDefaultTimezone = TimeZone.getDefault();
+    try {
+      TimeZone.setDefault(TimeZone.getTimeZone("America/Chicago"));
+
+      convertDate(new LocalDate());
+      convertDate(new LocalDate(1899, 12, 1));
+      convertDate(new LocalDate(1900, 1, 1));
+      convertDate(new LocalDate(2021, 2, 8));
+
+    } finally {
+      TimeZone.setDefault(originaDefaultTimezone);
+    }
+  }
+
   @Test
   public void convertToDate_convertFromDate() {
 
     convertDate(new LocalDate());
     convertDate(new LocalDate(1899, 12, 1));
     convertDate(new LocalDate(1900, 1, 1));
+    convertDate(new LocalDate(2021, 2, 8));
   }
 
   private void convertDate(LocalDate localDate) {

From 4c16b85e8576db9584b8b7df4a9f1c28d3ed71da Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Feb 2021 10:52:18 +1300
Subject: [PATCH 099/447] #2166 - Remove deprecated forUpdate(lockType) methods
 - migrate to withLock(lockType, waitType)

---
 .../main/java/io/ebean/ExpressionList.java    | 21 -------------
 ebean-api/src/main/java/io/ebean/Query.java   | 18 -----------
 .../expression/DefaultExpressionList.java     | 15 ----------
 .../server/expression/JunctionExpression.java | 15 ----------
 .../server/query/DefaultFetchGroupQuery.java  | 15 ----------
 .../server/querydefn/DefaultOrmQuery.java     | 15 ----------
 .../java/io/ebean/typequery/TQRootBean.java   | 30 -------------------
 7 files changed, 129 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index 33cf9efcb..e137f64ba 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -196,13 +196,6 @@ public interface ExpressionList<T> {
    */
   Query<T> forUpdate();
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdate(Query.LockType lockType);
-
   /**
    * Execute using "for update" clause with No Wait option.
    * <p>
@@ -211,13 +204,6 @@ public interface ExpressionList<T> {
    */
   Query<T> forUpdateNoWait();
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update nowait" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateNoWait(Query.LockType lockType);
-
   /**
    * Execute using "for update" clause with Skip Locked option.
    * <p>
@@ -226,13 +212,6 @@ public interface ExpressionList<T> {
    */
   Query<T> forUpdateSkipLocked();
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update skip locked" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateSkipLocked(Query.LockType lockType);
-
   /**
    * Execute the query including soft deleted rows.
    */
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index ab1c97122..7a33e66f4 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -1673,12 +1673,6 @@ public interface Query<T> {
    */
   Query<T> forUpdate();
 
-  /**
-   * Execute using "for update" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdate(LockType lockType);
-
   /**
    * Execute using "for update" clause with "no wait" option.
    * <p>
@@ -1688,12 +1682,6 @@ public interface Query<T> {
    */
   Query<T> forUpdateNoWait();
 
-  /**
-   * Execute using "for update nowait" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateNoWait(LockType lockType);
-
   /**
    * Execute using "for update" clause with "skip locked" option.
    * <p>
@@ -1703,12 +1691,6 @@ public interface Query<T> {
    */
   Query<T> forUpdateSkipLocked();
 
-  /**
-   * Execute using "for update skip locked" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateSkipLocked(LockType lockType);
-
   /**
    * Return true if this query has forUpdate set.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 569fb0868..13c111713 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -501,31 +501,16 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.forUpdate();
   }
 
-  @Override
-  public Query<T> forUpdate(Query.LockType lockType) {
-    return query.forUpdate(lockType);
-  }
-
   @Override
   public Query<T> forUpdateNoWait() {
     return query.forUpdateNoWait();
   }
 
-  @Override
-  public Query<T> forUpdateNoWait(Query.LockType lockType) {
-    return query.forUpdateNoWait(lockType);
-  }
-
   @Override
   public Query<T> forUpdateSkipLocked() {
     return query.forUpdateSkipLocked();
   }
 
-  @Override
-  public Query<T> forUpdateSkipLocked(Query.LockType lockType) {
-    return query.forUpdateSkipLocked(lockType);
-  }
-
   @Override
   public Query<T> select(String fetchProperties) {
     return query.select(fetchProperties);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 81548b19a..4f1784f11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -506,31 +506,16 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.forUpdate();
   }
 
-  @Override
-  public Query<T> forUpdate(Query.LockType lockType) {
-    return exprList.forUpdate(lockType);
-  }
-
   @Override
   public Query<T> forUpdateNoWait() {
     return exprList.forUpdateNoWait();
   }
 
-  @Override
-  public Query<T> forUpdateNoWait(Query.LockType lockType) {
-    return exprList.forUpdateNoWait(lockType);
-  }
-
   @Override
   public Query<T> forUpdateSkipLocked() {
     return exprList.forUpdateSkipLocked();
   }
 
-  @Override
-  public Query<T> forUpdateSkipLocked(Query.LockType lockType) {
-    return exprList.forUpdateSkipLocked(lockType);
-  }
-
   /**
    * Path exists - for the given path in a JSON document.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 8f2351846..f7bfdadf1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -569,21 +569,6 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public Query<T> forUpdate(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public Query<T> forUpdateNoWait(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public Query<T> forUpdateSkipLocked(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public boolean isForUpdate() {
     return false;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index ef58d99f6..d625e87be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -975,21 +975,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return setForUpdateWithMode(LockWait.WAIT, LockType.DEFAULT);
   }
 
-  @Override
-  public Query<T> forUpdate(LockType lockType) {
-    return setForUpdateWithMode(LockWait.WAIT, lockType);
-  }
-
-  @Override
-  public Query<T> forUpdateNoWait(LockType lockType) {
-    return setForUpdateWithMode(LockWait.NOWAIT, lockType);
-  }
-
-  @Override
-  public Query<T> forUpdateSkipLocked(LockType lockType) {
-    return setForUpdateWithMode(LockWait.SKIPLOCKED, lockType);
-  }
-
   @Override
   public DefaultOrmQuery<T> forUpdateNoWait() {
     return setForUpdateWithMode(LockWait.NOWAIT, LockType.DEFAULT);
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 66858dc10..72876a00d 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -721,16 +721,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  public R forUpdate(Query.LockType lockType) {
-    query.forUpdate(lockType);
-    return root;
-  }
-
   /**
    * Execute using "for update" clause with "no wait" option.
    * <p>
@@ -741,16 +731,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update nowait" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  public R forUpdateNoWait(Query.LockType lockType) {
-    query.forUpdateNoWait(lockType);
-    return root;
-  }
-
   /**
    * Execute using "for update" clause with "skip locked" option.
    * <p>
@@ -762,16 +742,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update skip locked" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  public R forUpdateSkipLocked(Query.LockType lockType) {
-    query.forUpdateSkipLocked(lockType);
-    return root;
-  }
-
   /**
    * Return this query as an UpdateQuery.
    *

From a6fdc42934a7e1b10ff06173d078fc8f57bbd575 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Feb 2021 11:21:10 +1300
Subject: [PATCH 100/447] Remove support for "query hints" like +query(50)
 (#2163)

* Remove support for "query hints" like +query(50)

* Remove unused readOnly from OrmQueryProperties

* OrmQueryProperties cache as final field
---
 .../server/querydefn/OrmQueryProperties.java  | 33 ++------
 .../querydefn/OrmQueryPropertiesParser.java   | 67 ++-------------
 .../server/grammer/EqlParserTest.java         |  4 +-
 .../OrmQueryPropertiesParserTest.java         | 84 +------------------
 .../org/tests/batchload/TestLazyJoin.java     |  2 +-
 .../org/tests/batchload/TestQueryJoin.java    |  2 +-
 6 files changed, 23 insertions(+), 169 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 1909a2152..554992214 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -33,16 +33,13 @@ public class OrmQueryProperties implements Serializable {
   private final String properties;
   private final Set<String> included;
   private final FetchConfig fetchConfig;
+  private final boolean cache;
 
   /**
    * Flag set when this fetch path needs to be a query join.
    */
   private boolean markForQueryJoin;
 
-  private boolean cache;
-
-  private boolean readOnly;
-
   /**
    * Included bean joins.
    */
@@ -82,6 +79,7 @@ public class OrmQueryProperties implements Serializable {
     this.parentPath = SplitName.parent(path);
     this.properties = null;
     this.included = null;
+    this.cache = false;
     this.fetchConfig = DEFAULT_FETCH;
   }
 
@@ -96,26 +94,16 @@ public class OrmQueryProperties implements Serializable {
     OrmQueryPropertiesParser.Response response = OrmQueryPropertiesParser.parse(rawProperties);
     this.properties = response.properties;
     this.included = response.included;
-    this.cache = response.cache;
-    this.readOnly = response.readOnly;
-    if (fetchConfig != null) {
-      this.fetchConfig = fetchConfig;
-      if (fetchConfig.isCache()) {
-        this.cache = true;
-      }
-    } else {
-      this.fetchConfig = response.fetchConfig;
-    }
+    this.fetchConfig = fetchConfig != null ? fetchConfig : DEFAULT_FETCH;
+    this.cache = fetchConfig.isCache();
   }
 
   public OrmQueryProperties(String path, Set<String> included) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
-    // for rawSql parsedProperties can be empty (when only fetching Id property)
     this.included = included;
     this.properties = String.join(",", included);
     this.cache = false;
-    this.readOnly = false;
     this.fetchConfig = DEFAULT_FETCH;
   }
 
@@ -128,7 +116,6 @@ public class OrmQueryProperties implements Serializable {
     this.path = source.path;
     this.properties = source.properties;
     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);
@@ -151,6 +138,7 @@ 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();
@@ -166,7 +154,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({"unchecked"})
+  @SuppressWarnings({"rawtypes","unchecked"})
   public <T> SpiExpressionList<T> filterMany(Query<T> rootQuery) {
     if (filterMany == null) {
       FilterExprPath exprPath = new FilterExprPath(path);
@@ -371,14 +359,7 @@ public class OrmQueryProperties implements Serializable {
   }
 
   /**
-   * Return true if this path has the +readonly option.
-   */
-  public boolean isReadOnly() {
-    return readOnly;
-  }
-
-  /**
-   * Return true if this path has the +cache option to hit the cache.
+   * Return true if this path should hit the L2 cache.
    */
   public boolean isCache() {
     return cache;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
index 02b3afbac..f6f925891 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
@@ -1,9 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
-import io.ebean.FetchConfig;
 import io.ebeaninternal.server.util.DSelectColumnsParser;
 
-import java.util.Iterator;
 import java.util.Set;
 
 /**
@@ -18,30 +16,15 @@ class OrmQueryPropertiesParser {
    */
   static class Response {
 
-    final boolean readOnly;
-    final boolean cache;
-    final FetchConfig fetchConfig;
     final String properties;
     final Set<String> included;
 
-    Response(boolean readOnly, boolean cache, int queryFetchBatch, int lazyFetchBatch, String properties, Set<String> included) {
-      this.readOnly = readOnly;
-      this.cache = cache;
+    private Response(String properties, Set<String> included) {
       this.properties = properties;
       this.included = included;
-      if (queryFetchBatch > 0) {
-        this.fetchConfig = FetchConfig.ofQuery(queryFetchBatch);
-      } else if (lazyFetchBatch > 0) {
-        this.fetchConfig = FetchConfig.ofLazy(lazyFetchBatch);
-      } else {
-        this.fetchConfig = OrmQueryProperties.DEFAULT_FETCH;
-      }
     }
 
-    Response() {
-      this.readOnly = false;
-      this.cache = false;
-      this.fetchConfig = OrmQueryProperties.DEFAULT_FETCH;
+    private Response() {
       this.properties = "";
       this.included = null;
     }
@@ -57,10 +40,6 @@ class OrmQueryPropertiesParser {
 
   private final String inputProperties;
   private boolean allProperties;
-  private boolean readOnly;
-  private boolean cache;
-  private int queryFetchBatch;
-  private int lazyFetchBatch;
 
   private OrmQueryPropertiesParser(String inputProperties) {
     this.inputProperties = inputProperties;
@@ -74,50 +53,20 @@ class OrmQueryPropertiesParser {
       return EMPTY;
     }
     if (inputProperties.equals("*")) {
-      // explicit all properties
-      allProperties = true;
-      return new Response(readOnly, cache, queryFetchBatch, lazyFetchBatch, "*", null);
+      return new Response("*", null);
     }
-    boolean hints = false;
     Set<String> fields = splitRawSelect(inputProperties);
-    final Iterator<String> iterator = fields.iterator();
-    while (iterator.hasNext()) {
-      String val = iterator.next();
-      if (val.startsWith("+")) {
-        hints = true;
-        iterator.remove();
-        parseHint(val);
-      } else if (val.equals("*")) {
+    for (String val : fields) {
+      if (val.equals("*")) {
         allProperties = true;
+        break;
       }
     }
-    String properties = allProperties ? "*" : hints ? String.join(",", fields) : inputProperties;
+    String properties = allProperties ? "*" : inputProperties;
     if (fields.isEmpty()) {
       fields = null;
     }
-    return new Response(readOnly, cache, queryFetchBatch, lazyFetchBatch, properties, fields);
-  }
-
-  private void parseHint(String val) {
-    if (val.equals("+readonly")) {
-      readOnly = true;
-    } else if (val.equals("+cache")) {
-      cache = true;
-    } else if (val.startsWith("+query")) {
-      queryFetchBatch = parseBatch(val);
-    } else if (val.startsWith("+lazy")) {
-      lazyFetchBatch = parseBatch(val);
-    }
-  }
-
-  private int parseBatch(String val) {
-    if (val.endsWith(")")) {
-      int start = val.lastIndexOf('(');
-      if (start > 0) {
-        return Integer.parseInt(val.substring(start + 1, val.length() - 1));
-      }
-    }
-    return 0;
+    return new Response(properties, fields);
   }
 
   /**
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 304a9c4d3..e6281364b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -624,7 +624,7 @@ public class EqlParserTest extends BaseTestCase {
   public void fetch_query50_asHint() {
 
     ResetBasicData.reset();
-    Query<Customer> query = parse("fetch billingAddress (+query(50),city)");
+    Query<Customer> query = parse("fetch query(50) billingAddress (city)");
     query.findList();
 
     assertSql(query).doesNotContain(", t1.city");
@@ -634,7 +634,7 @@ public class EqlParserTest extends BaseTestCase {
   public void fetch_lazy50_asHint() {
 
     ResetBasicData.reset();
-    Query<Customer> query = parse("fetch billingAddress (+lazy(50),city) order by id");
+    Query<Customer> query = parse("fetch lazy(50) billingAddress (city) order by id");
     List<Customer> list = query.findList();
 
     assertSql(query).doesNotContain(", t1.city");
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
index 09c026175..5160c664e 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
@@ -31,91 +31,17 @@ public class OrmQueryPropertiesParserTest {
   }
 
   @Test
-  public void when_hasCache() {
+  public void when_no_spaces() {
 
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+cache");
-    assertThat(res.cache).isTrue();
-    assertThat(res.included).isNull();
-  }
-
-  @Test
-  public void when_hasCache_first() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+cache,id");
-    assertThat(res.cache).isTrue();
-    assertThat(res.included).containsExactly("id");
-  }
-
-  @Test
-  public void when_hasCache_last() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+cache");
-    assertThat(res.cache).isTrue();
-    assertThat(res.included).containsExactly("name");
-  }
-
-  @Test
-  public void when_hasCache_middle() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+cache, id");
-    assertThat(res.cache).isTrue();
-    assertThat(res.included).containsExactly("name", "id");
-  }
-
-  @Test
-  public void when_hasReadOnly() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+readonly");
-    assertThat(res.readOnly).isTrue();
-    assertThat(res.included).isNull();
-  }
-
-  @Test
-  public void when_hasLazy() {
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy");
-    //FIXME: assertThat(res.fetchConfig.getBatchSize()).isEqualTo(0);
-    assertThat(res.included).isNull();
-  }
-
-  @Test
-  public void when_hasLazyValue() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy(20)");
-    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(20);
-    assertThat(res.included).isNull();
-  }
-
-  @Test
-  public void when_hasLazyValue_last() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("name,+lazy(20)");
-    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(20);
-    assertThat(res.included).containsExactly("name");
-  }
-
-  @Test
-  public void when_hasLazyValue_first() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+lazy(20),id,name");
-    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(20);
+    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id,name");
     assertThat(res.included).containsExactly("id", "name");
   }
 
   @Test
-  public void when_allProperties() {
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("+query(4),+lazy(5)");
-    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(4);
-    assertThat(res.included).isNull();
-  }
+  public void when_spaced() {
 
-  @Test
-  public void when_everything_set() {
-
-    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id, name, +readonly ,+lazy(20), +query(30) ,+cache");
+    OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id, name");
     assertThat(res.included).containsExactly("id", "name");
-    assertThat(res.fetchConfig.getBatchSize()).isEqualTo(30);
-    assertThat(res.readOnly).isTrue();
-    assertThat(res.cache).isTrue();
   }
 
   @Test
@@ -126,8 +52,6 @@ public class OrmQueryPropertiesParserTest {
   }
 
   private void assertAllDefaults(OrmQueryPropertiesParser.Response res) {
-    assertThat(res.cache).isFalse();
-    assertThat(res.readOnly).isFalse();
     assertThat(res.included).isNull();
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java
index e452da0ce..bd15f2f6d 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java
@@ -21,7 +21,7 @@ public class TestLazyJoin extends BaseTestCase {
 
     Query<Order> query = Ebean.find(Order.class)
       .select("status")
-      .fetch("customer", "+lazy(10) name, status")
+      .fetchLazy("customer", "name, status")
       .fetch("customer.contacts")
       .order().asc("id");
 
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java
index 81bac2193..533dd5470 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java
@@ -28,7 +28,7 @@ public class TestQueryJoin extends BaseTestCase {
 
     Query<Order> query = Ebean.find(Order.class).select("status")
       // .join("details","+query(10)")
-      .fetch("customer", "+lazy(10), name, status").fetch("customer.contacts").order().asc("id");
+      .fetchLazy("customer", "name, status").fetch("customer.contacts").order().asc("id");
     // .join("customer.billingAddress");
 
     List<Order> list = query.findList();

From ab87174e5b2d1ab111061eac49fc2b7e5f8bf700 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Feb 2021 11:30:24 +1300
Subject: [PATCH 101/447] #2163 - Fix OrmQueryProperties when FetchConfig null

---
 .../server/querydefn/OrmQueryProperties.java         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 554992214..704cead7f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -84,18 +84,22 @@ public class OrmQueryProperties implements Serializable {
   }
 
   public OrmQueryProperties(String path, String rawProperties) {
-    this(path, rawProperties, null);
+    this(path, rawProperties, DEFAULT_FETCH);
   }
 
   public OrmQueryProperties(String path, String rawProperties, FetchConfig fetchConfig) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
-
     OrmQueryPropertiesParser.Response response = OrmQueryPropertiesParser.parse(rawProperties);
     this.properties = response.properties;
     this.included = response.included;
-    this.fetchConfig = fetchConfig != null ? fetchConfig : DEFAULT_FETCH;
-    this.cache = fetchConfig.isCache();
+    if (fetchConfig != null) {
+      this.fetchConfig = fetchConfig;
+      this.cache = fetchConfig.isCache();
+    } else {
+      this.cache = false;
+      this.fetchConfig = DEFAULT_FETCH;
+    }
   }
 
   public OrmQueryProperties(String path, Set<String> included) {

From cc64ff5f105b0453baafd2a74ffdfe917068487a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Feb 2021 11:37:19 +1300
Subject: [PATCH 102/447] Update javadoc with use of FetchConfig.ofQuery() etc

---
 ebean-api/src/main/java/io/ebean/Query.java  | 14 +++++++-------
 ebean-api/src/main/java/io/ebean/RawSql.java |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index 7a33e66f4..24a8445be 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -514,7 +514,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, fetchProperties, new FetchConfig().query())
+   *  fetch(path, fetchProperties, FetchConfig.ofQuery())
    *
    * }</pre>
    * <p>
@@ -548,7 +548,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, fetchProperties, new FetchConfig().lazy())
+   *  fetch(path, fetchProperties, FetchConfig.ofLazy())
    *
    * }</pre>
    * <p>
@@ -573,7 +573,7 @@ public interface Query<T> {
    * // fetch customers (their id, name and status)
    * List<Customer> customers = DB.find(Customer.class)
    *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email", new FetchConfig().lazy(10))
+   *     .fetch("contacts", "firstName,lastName,email", FetchConfig.ofLazy(10))
    *     .findList();
    *
    * }</pre>
@@ -610,7 +610,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, new FetchConfig().query())
+   *  fetch(path, FetchConfig.ofQuery())
    *
    * }</pre>
    * <p>
@@ -639,7 +639,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, new FetchConfig().lazy())
+   *  fetch(path, FetchConfig.ofLazy())
    *
    * }</pre>
    * <p>
@@ -662,7 +662,7 @@ public interface Query<T> {
    * // fetch customers (their id, name and status)
    * List<Customer> customers = DB.find(Customer.class)
    *     // lazy fetch contacts with a batch size of 100
-   *     .fetch("contacts", new FetchConfig().lazy(100))
+   *     .fetch("contacts", FetchConfig.ofLazy(100))
    *     .findList();
    *
    * }</pre>
@@ -844,7 +844,7 @@ public interface Query<T> {
    * <pre>{@code
    *
    *  DB.find(Customer.class)
-   *     .fetch("contacts", new FetchConfig().query(2))
+   *     .fetch("contacts", FetchConfig.ofQuery(2))
    *     .where().eq("status", Status.NEW)
    *     .order().asc("id")
    *     .setMaxRows(2000)
diff --git a/ebean-api/src/main/java/io/ebean/RawSql.java b/ebean-api/src/main/java/io/ebean/RawSql.java
index 1fe274a1e..e0e20714b 100644
--- a/ebean-api/src/main/java/io/ebean/RawSql.java
+++ b/ebean-api/src/main/java/io/ebean/RawSql.java
@@ -107,7 +107,7 @@ package io.ebean;
  *
  *   List<OrderAggregate> orders = DB.find(OrderAggregate.class)
  *     .setRawSql(rawSql)
- *     .fetch("order", "status,orderDate", new FetchConfig().query())
+ *     .fetch("order", "status,orderDate", FetchConfig.ofQuery())
  *     .fetch("order.customer", "name")
  *     .where().gt("order.id", 0)
  *     .having().gt("totalAmount", 20)

From bab637667df721125a6f0fa392982fb23e8c77b1 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Feb 2021 11:50:54 +1300
Subject: [PATCH 103/447] Update test only - update TestBasicClobNoVer to use
 DB and AssertJ

---
 .../tests/basic/lob/TestBasicClobNoVer.java   | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java
index 0d791db50..f33a42a42 100644
--- a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java
+++ b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java
@@ -1,12 +1,10 @@
 package org.tests.basic.lob;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.tests.model.basic.EBasicClobNoVer;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
@@ -21,53 +19,50 @@ public class TestBasicClobNoVer extends BaseTestCase {
     EBasicClobNoVer entity = new EBasicClobNoVer();
     entity.setName("test");
     entity.setDescription("initialClobValue");
-    EbeanServer server = Ebean.getServer(null);
-    server.save(entity);
-
-
-    String sqlNoClob = "select t0.id, t0.name from ebasic_clob_no_ver t0 where t0.id = ?";
-    String sqlWithClob = "select t0.id, t0.name, t0.description from ebasic_clob_no_ver t0 where t0.id = ?";
-
+    DB.save(entity);
 
     // Clob by default is Fetch Lazy
-    Query<EBasicClobNoVer> defaultQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId());
+    Query<EBasicClobNoVer> defaultQuery = DB.find(EBasicClobNoVer.class).setId(entity.getId());
     defaultQuery.findOne();
     String sql = sqlOf(defaultQuery, 2);
 
-    Assert.assertTrue("Clob is fetch lazy by default", sql.contains(sqlNoClob));
+    // default SQL select excludes clob
+    String sqlNoClob = "select t0.id, t0.name from ebasic_clob_no_ver t0 where t0.id = ?";
+    assertThat(sql).contains(sqlNoClob);
 
 
     // Explicitly select * including Clob
-    Query<EBasicClobNoVer> explicitQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId()).select("*");
+    Query<EBasicClobNoVer> explicitQuery = DB.find(EBasicClobNoVer.class).setId(entity.getId()).select("*");
 
     explicitQuery.findOne();
     sql = sqlOf(explicitQuery, 2);
 
-    Assert.assertTrue("Explicitly include Clob", sql.contains(sqlWithClob));
+    // Explicitly include Clob
+    String sqlWithClob = "select t0.id, t0.name, t0.description from ebasic_clob_no_ver t0 where t0.id = ?";
+    assertThat(sql).contains(sqlWithClob);
 
     // Update description to test refresh
 
     EBasicClobNoVer updateBean = new EBasicClobNoVer();
     updateBean.setId(entity.getId());
     updateBean.setDescription("modified");
-    Ebean.update(updateBean);
+    DB.update(updateBean);
 
 
     // Test refresh function
 
-    Assert.assertEquals("initialClobValue", entity.getDescription());
+    assertThat(entity.getDescription()).isEqualTo("initialClobValue");
 
     LoggedSqlCollector.start();
 
     // Refresh query includes all properties
-    server.refresh(entity);
+    DB.refresh(entity);
 
     // Assert all properties fetched in refresh
     List<String> loggedSql = LoggedSqlCollector.stop();
-    Assert.assertEquals(1, loggedSql.size());
+    assertThat(loggedSql).hasSize(1);
     assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob);
-    Assert.assertEquals("modified", entity.getDescription());
-
+    assertThat(entity.getDescription()).isEqualTo("modified");
   }
 
 }

From dc65475dbbca9a703f71606688538957ba81766d Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Tue, 16 Feb 2021 17:47:56 +1300
Subject: [PATCH 104/447] #2168 - Using ebean-test with redis container -
 hanging testing redis connectivity

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

diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index d880773a8..92f4c590f 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>4.1</version>
+      <version>4.2</version>
     </dependency>
 
     <dependency>

From 98a89156bf14c970c5b6b7ba293e6838848cbe19 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 16 Feb 2021 17:51:47 +1300
Subject: [PATCH 105/447] Refactor query internals to reduce property parsing
 for partial select and fetch (#2167)

* Update test only - update TestBasicClobNoVer to use DB and AssertJ

* Refactor OrmQueryProperties internals to reduce raw property parsing

- Remove String properties
- Reduces parsing of properties via  fetchProperties() selectProperties() methods

* No effective change - tidy pom.xml for ebean-querybean

* Refactor query internals adding fetchProperties() selectProperties()

- Adds SpiQueryFetch
- Used by query beans with Set<String> properties passed (effectively skipping any parsing)
---
 .../java/io/ebeaninternal/api/SpiQuery.java   | 13 +++-
 .../io/ebeaninternal/api/SpiQueryFetch.java   | 22 ++++++
 .../server/query/DFetchGroupBuilder.java      | 15 ++--
 .../server/query/DefaultFetchGroupQuery.java  | 13 +++-
 .../server/querydefn/DefaultOrmQuery.java     | 20 +++++
 .../server/querydefn/OrmQueryDetail.java      | 35 +++++++--
 .../server/querydefn/OrmQueryProperties.java  | 60 ++++++++-------
 .../querydefn/OrmQueryPropertiesParser.java   | 53 +++----------
 .../OrmQueryPropertiesParserTest.java         | 12 ++-
 .../querydefn/OrmQueryPropertiesTest.java     | 11 +--
 .../tests/basic/lob/TestBasicClobNoVer.java   | 35 ++++-----
 ebean-querybean/pom.xml                       | 17 ++---
 .../java/io/ebean/typequery/TQAssocBean.java  | 49 +++++++-----
 .../java/io/ebean/typequery/TQRootBean.java   | 23 +++---
 .../test/java/org/querytest/QOrderTest.java   | 74 ++++++++++++++++++-
 15 files changed, 297 insertions(+), 155 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index f3b133bc2..4686a3644 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -20,6 +20,7 @@ import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.query.CancelableQuery;
 import io.ebeaninternal.server.querydefn.NaturalKeyBindParam;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import io.ebeaninternal.server.querydefn.OrmUpdateProperties;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
@@ -30,7 +31,7 @@ import java.util.Set;
 /**
  * Object Relational query - Internal extension to Query object.
  */
-public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
+public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCodes {
 
   enum Mode {
     NORMAL(false), LAZYLOAD_MANY(false), LAZYLOAD_BEAN(true), REFRESH_BEAN(true);
@@ -289,6 +290,16 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
    */
   boolean selectAllForLazyLoadProperty();
 
+  /**
+   * Set the select properties.
+   */
+  void selectProperties(OrmQueryProperties other);
+
+  /**
+   * Set the fetch properties for the given path.
+   */
+  void fetchProperties(String path, OrmQueryProperties other);
+
   /**
    * Set the on a secondary query given the label, relativePath and profile location of the parent query.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java
new file mode 100644
index 000000000..396827978
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java
@@ -0,0 +1,22 @@
+package io.ebeaninternal.api;
+
+import io.ebean.FetchConfig;
+
+import java.util.Set;
+
+/**
+ * Query select and fetch properties (that avoids parsing).
+ */
+public interface SpiQueryFetch {
+
+  /**
+   * Specify the select properties.
+   */
+  void selectProperties(Set<String> properties);
+
+  /**
+   * Specify the fetch properties for the given path.
+   */
+  void fetchProperties(String name, Set<String> properties, FetchConfig config);
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
index f33985f46..6553b7ea4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
+++ b/ebean-core/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 DEFAULT_FETCH = FetchConfig.ofDefault();
+
   private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
 
   private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
@@ -31,13 +33,13 @@ class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
 
   @Override
   public FetchGroupBuilder<T> fetch(String path) {
-    detail.fetch(path, null, null);
+    detail.fetchProperties(path, null, DEFAULT_FETCH);
     return this;
   }
 
   @Override
   public FetchGroupBuilder<T> fetch(String path, FetchGroup nestedGroup) {
-    return fetchNested(path, nestedGroup, null);
+    return fetchNested(path, nestedGroup, DEFAULT_FETCH);
   }
 
   @Override
@@ -51,7 +53,6 @@ class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
   }
 
   private FetchGroupBuilder<T> fetchNested(String path, FetchGroup nestedGroup, FetchConfig fetchConfig) {
-
     OrmQueryDetail nestedDetail = ((SpiFetchGroup) nestedGroup).underlying();
     detail.addNested(path, nestedDetail, fetchConfig);
     return this;
@@ -59,25 +60,25 @@ class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
 
   @Override
   public FetchGroupBuilder<T> fetchQuery(String path) {
-    detail.fetch(path, null, FETCH_QUERY);
+    detail.fetchProperties(path, null, FETCH_QUERY);
     return this;
   }
 
   @Override
   public FetchGroupBuilder<T> fetchCache(String path) {
-    detail.fetch(path, null, FETCH_CACHE);
+    detail.fetchProperties(path, null, FETCH_CACHE);
     return this;
   }
 
   @Override
   public FetchGroupBuilder<T> fetchLazy(String path) {
-    detail.fetch(path, null, FETCH_LAZY);
+    detail.fetchProperties(path, null, FETCH_LAZY);
     return this;
   }
 
   @Override
   public FetchGroupBuilder<T> fetch(String path, String properties) {
-    detail.fetch(path, properties, null);
+    detail.fetch(path, properties, DEFAULT_FETCH);
     return this;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index f7bfdadf1..5da152185 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -25,6 +25,7 @@ import io.ebean.Transaction;
 import io.ebean.UpdateQuery;
 import io.ebean.Version;
 import io.ebean.service.SpiFetchGroupQuery;
+import io.ebeaninternal.api.SpiQueryFetch;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 
@@ -43,7 +44,7 @@ import java.util.stream.Stream;
 /**
  * Implementation of FetchGroup query for use to create FetchGroup via query beans.
  */
-class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
+class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch {
 
   private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
 
@@ -628,4 +629,14 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
   public Query<T> orderById(boolean orderById) {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
+
+  @Override
+  public void selectProperties(Set<String> props) {
+    detail.selectProperties(props);
+  }
+
+  @Override
+  public void fetchProperties(String property, Set<String> columns, FetchConfig config) {
+    detail.fetchProperties(property, columns, config);
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index d625e87be..e19212e96 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1392,6 +1392,26 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
+  @Override
+  public void selectProperties(Set<String> props) {
+    detail.selectProperties(props);
+  }
+
+  @Override
+  public void fetchProperties(String property, Set<String> columns, FetchConfig config) {
+    detail.fetchProperties(property, columns, config);
+  }
+
+  @Override
+  public void selectProperties(OrmQueryProperties properties) {
+    detail.selectProperties(properties);
+  }
+
+  @Override
+  public void fetchProperties(String path, OrmQueryProperties other) {
+    detail.fetchProperties(path, other);
+  }
+
   @Override
   public DefaultOrmQuery<T> select(String columns) {
     detail.select(columns);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index b8837111e..1c441cbf4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -59,9 +59,9 @@ public class OrmQueryDetail implements Serializable {
    * Add a nested OrmQueryDetail to this detail.
    */
   public void addNested(String path, OrmQueryDetail other, FetchConfig config) {
-    fetch(path, other.baseProps.getProperties(), config);
+    fetchProperties(path, other.baseProps, config);
     for (Map.Entry<String, OrmQueryProperties> entry : other.fetchPaths.entrySet()) {
-      fetch(path + "." + entry.getKey(), entry.getValue().getProperties(), entry.getValue().getFetchConfig());
+      fetchProperties(path + "." + entry.getKey(), entry.getValue(), entry.getValue().getFetchConfig());
     }
   }
 
@@ -133,8 +133,19 @@ public class OrmQueryDetail implements Serializable {
   /**
    * set the properties to include on the base / root entity.
    */
-  public void select(String columns) {
-    baseProps = new OrmQueryProperties(null, columns, null);
+  public void select(String properties) {
+    baseProps = new OrmQueryProperties(null, properties, null);
+  }
+
+  /**
+   * Set select properties that are already parsed.
+   */
+  public void selectProperties(Set<String> properties) {
+    baseProps = new OrmQueryProperties(null, properties, OrmQueryProperties.DEFAULT_FETCH);
+  }
+
+  void selectProperties(OrmQueryProperties other) {
+    baseProps = new OrmQueryProperties(null, other, OrmQueryProperties.DEFAULT_FETCH);
   }
 
   boolean containsProperty(String property) {
@@ -262,10 +273,24 @@ public class OrmQueryDetail implements Serializable {
    * @param partialProps the properties on the join property to include
    */
   public void fetch(String path, String partialProps, FetchConfig fetchConfig) {
-
     fetch(new OrmQueryProperties(path, partialProps, fetchConfig));
   }
 
+  /**
+   * Set fetch properties that are already parsed.
+   */
+  public void fetchProperties(String path, Set<String> properties, FetchConfig fetchConfig) {
+    fetch(new OrmQueryProperties(path, properties, fetchConfig));
+  }
+
+  void fetchProperties(String path, OrmQueryProperties other) {
+    fetchProperties(path, other, other.getFetchConfig());
+  }
+
+  void fetchProperties(String path, OrmQueryProperties other, FetchConfig fetchConfig) {
+    fetch(new OrmQueryProperties(path, other, fetchConfig));
+  }
+
   /**
    * Add for raw sql etc when the properties are already parsed into a set.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 704cead7f..e84828f09 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -30,7 +30,7 @@ public class OrmQueryProperties implements Serializable {
 
   private final String parentPath;
   private final String path;
-  private final String properties;
+  private final boolean allProperties;
   private final Set<String> included;
   private final FetchConfig fetchConfig;
   private final boolean cache;
@@ -77,7 +77,7 @@ public class OrmQueryProperties implements Serializable {
   public OrmQueryProperties(String path) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
-    this.properties = null;
+    this.allProperties = false;
     this.included = null;
     this.cache = false;
     this.fetchConfig = DEFAULT_FETCH;
@@ -91,7 +91,7 @@ public class OrmQueryProperties implements Serializable {
     this.path = path;
     this.parentPath = SplitName.parent(path);
     OrmQueryPropertiesParser.Response response = OrmQueryPropertiesParser.parse(rawProperties);
-    this.properties = response.properties;
+    this.allProperties = response.allProperties;
     this.included = response.included;
     if (fetchConfig != null) {
       this.fetchConfig = fetchConfig;
@@ -103,12 +103,25 @@ public class OrmQueryProperties implements Serializable {
   }
 
   public OrmQueryProperties(String path, Set<String> included) {
+    this(path, included, DEFAULT_FETCH);
+  }
+
+  OrmQueryProperties(String path, Set<String> included, FetchConfig fetchConfig) {
     this.path = path;
     this.parentPath = SplitName.parent(path);
     this.included = included;
-    this.properties = String.join(",", included);
-    this.cache = false;
-    this.fetchConfig = DEFAULT_FETCH;
+    this.allProperties = false;
+    this.fetchConfig = fetchConfig;
+    this.cache = fetchConfig.isCache();
+  }
+
+  OrmQueryProperties(String path, OrmQueryProperties other, FetchConfig fetchConfig) {
+    this.path = path;
+    this.parentPath = SplitName.parent(path);
+    this.allProperties = other.allProperties;
+    this.included = other.included;
+    this.cache = other.cache;
+    this.fetchConfig = fetchConfig;
   }
 
   /**
@@ -118,7 +131,7 @@ public class OrmQueryProperties implements Serializable {
     this.fetchConfig = sourceFetchConfig;
     this.parentPath = source.parentPath;
     this.path = source.path;
-    this.properties = source.properties;
+    this.allProperties = source.allProperties;
     this.cache = source.cache;
     this.filterMany = source.filterMany;
     this.markForQueryJoin = source.markForQueryJoin;
@@ -158,7 +171,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({"rawtypes", "unchecked"})
   public <T> SpiExpressionList<T> filterMany(Query<T> rootQuery) {
     if (filterMany == null) {
       FilterExprPath exprPath = new FilterExprPath(path);
@@ -201,9 +214,8 @@ public class OrmQueryProperties implements Serializable {
    */
   @SuppressWarnings("unchecked")
   public void configureBeanQuery(SpiQuery<?> query) {
-
-    if (properties != null && !properties.isEmpty()) {
-      query.select(properties);
+    if (!isEmpty()) {
+      query.selectProperties(this);
     }
 
     if (filterMany != null) {
@@ -219,7 +231,7 @@ public class OrmQueryProperties implements Serializable {
       for (OrmQueryProperties p : secondaryChildren) {
         String path = p.getPath();
         path = path.substring(trimPath);
-        query.fetch(path, p.getProperties(), p.getFetchConfig());
+        query.fetchProperties(path, p);
         query.setFilterMany(path, p.getFilterManyTrimPath(trimPath));
       }
     }
@@ -230,8 +242,7 @@ public class OrmQueryProperties implements Serializable {
   }
 
   public boolean hasSelectClause() {
-    if ("*".equals(properties)) {
-      // explicitly selected all properties
+    if (allProperties) {
       return true;
     }
     // explicitly selected some properties
@@ -241,8 +252,8 @@ public class OrmQueryProperties implements Serializable {
   /**
    * Return true if the properties and configuration are empty.
    */
-  public boolean isEmpty() {
-    return properties == null || properties.isEmpty();
+  boolean isEmpty() {
+    return !allProperties && included == null;
   }
 
   public void asStringDebug(String prefix, StringBuilder sb) {
@@ -250,8 +261,10 @@ public class OrmQueryProperties implements Serializable {
     if (path != null) {
       sb.append(path).append(" ");
     }
-    if (!isEmpty()) {
-      sb.append("(").append(properties).append(")");
+    if (allProperties) {
+      sb.append("(*)");
+    } else if (included != null) {
+      sb.append("(").append(String.join(",", included)).append(")");
     }
   }
 
@@ -269,17 +282,11 @@ public class OrmQueryProperties implements Serializable {
     secondaryChildren.add(child);
   }
 
-  /**
-   * Return the raw properties.
-   */
-  public String getProperties() {
-    return properties;
-  }
-
   /**
    * Return true if this includes all properties on the path.
    */
   public boolean allProperties() {
+    // this is really "default" properties
     return included == null;
   }
 
@@ -326,7 +333,6 @@ public class OrmQueryProperties implements Serializable {
     if (includedBeanJoin != null && includedBeanJoin.contains(propName)) {
       return false;
     }
-    // all properties included
     return included == null || included.contains(propName);
   }
 
@@ -403,7 +409,7 @@ public class OrmQueryProperties implements Serializable {
     if (path != null) {
       builder.append(path);
     }
-    if (included != null){
+    if (included != null) {
       builder.append("/i").append(included);
     }
     if (secondaryQueryJoins != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
index f6f925891..568a6165c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
@@ -7,72 +7,43 @@ import java.util.Set;
 /**
  * Parses the path properties string.
  */
-class OrmQueryPropertiesParser {
+final class OrmQueryPropertiesParser {
 
-  private static final Response EMPTY = new Response();
+  private static final Response EMPTY = new Response(false, null);
+  private static final Response ALL = new Response(true, null);
 
   /**
    * Immutable response of the parsed properties and options.
    */
   static class Response {
 
-    final String properties;
+    final boolean allProperties;
     final Set<String> included;
 
-    private Response(String properties, Set<String> included) {
-      this.properties = properties;
+    private Response(boolean allProperties, Set<String> included) {
+      this.allProperties = allProperties;
       this.included = included;
     }
-
-    private Response() {
-      this.properties = "";
-      this.included = null;
-    }
   }
 
   /**
    * Parses the path properties string returning the parsed properties and options.
    * In general it is comma delimited with some special strings like +lazy(20).
    */
-  public static Response parse(String rawProperties) {
-    return new OrmQueryPropertiesParser(rawProperties).parse();
-  }
-
-  private final String inputProperties;
-  private boolean allProperties;
-
-  private OrmQueryPropertiesParser(String inputProperties) {
-    this.inputProperties = inputProperties;
-  }
-
-  /**
-   * Parse the raw string properties input.
-   */
-  private Response parse() {
-    if (inputProperties == null || inputProperties.isEmpty()) {
+  static Response parse(String rawProperties) {
+    if (rawProperties == null || rawProperties.isEmpty()) {
       return EMPTY;
     }
-    if (inputProperties.equals("*")) {
-      return new Response("*", null);
+    if (rawProperties.equals("*")) {
+      return ALL;
     }
-    Set<String> fields = splitRawSelect(inputProperties);
-    for (String val : fields) {
-      if (val.equals("*")) {
-        allProperties = true;
-        break;
-      }
-    }
-    String properties = allProperties ? "*" : inputProperties;
-    if (fields.isEmpty()) {
-      fields = null;
-    }
-    return new Response(properties, fields);
+    return new Response(false, splitRawSelect(rawProperties));
   }
 
   /**
    * Split allowing 'dynamic function based properties'.
    */
-  private Set<String> splitRawSelect(String inputProperties) {
+  private static Set<String> splitRawSelect(String inputProperties) {
     return DSelectColumnsParser.parse(inputProperties);
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
index 5160c664e..a7c103b83 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java
@@ -11,7 +11,8 @@ public class OrmQueryPropertiesParserTest {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse(null);
     assertAllDefaults(res);
-    assertThat(res.properties).isEqualTo("");
+    assertThat(res.allProperties).isFalse();
+    assertThat(res.included).isNull();
   }
 
   @Test
@@ -19,7 +20,8 @@ public class OrmQueryPropertiesParserTest {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("");
     assertAllDefaults(res);
-    assertThat(res.properties).isEqualTo("");
+    assertThat(res.allProperties).isFalse();
+    assertThat(res.included).isNull();
   }
 
   @Test
@@ -27,13 +29,15 @@ public class OrmQueryPropertiesParserTest {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("*");
     assertAllDefaults(res);
-    assertThat(res.properties).isEqualTo("*");
+    assertThat(res.allProperties).isTrue();
+    assertThat(res.included).isNull();
   }
 
   @Test
   public void when_no_spaces() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id,name");
+    assertThat(res.allProperties).isFalse();
     assertThat(res.included).containsExactly("id", "name");
   }
 
@@ -41,6 +45,7 @@ public class OrmQueryPropertiesParserTest {
   public void when_spaced() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("id, name");
+    assertThat(res.allProperties).isFalse();
     assertThat(res.included).containsExactly("id", "name");
   }
 
@@ -48,6 +53,7 @@ public class OrmQueryPropertiesParserTest {
   public void when_formula() {
 
     OrmQueryPropertiesParser.Response res = OrmQueryPropertiesParser.parse("a,MD5(id::text) as b,c");
+    assertThat(res.allProperties).isFalse();
     assertThat(res.included).containsExactly("a", "MD5(id::text) as b", "c");
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
index b2ed90fcb..8df439a58 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java
@@ -14,17 +14,12 @@ public class OrmQueryPropertiesTest {
     return sb.toString();
   }
 
-  @Test(expected = NullPointerException.class)
-  public void construct_with_propertySet_when_null() {
-    new OrmQueryProperties(null, (LinkedHashSet<String>) null);
-  }
-
   @Test
   public void construct_with_propertySet_when_empty() {
 
     OrmQueryProperties p1 = new OrmQueryProperties(null, new LinkedHashSet<>());
-    assertThat(p1.getProperties()).isEqualTo("");
     assertThat(p1.allProperties()).isFalse();
+    assertThat(p1.getIncluded()).isEmpty();
   }
 
   @Test
@@ -34,7 +29,7 @@ public class OrmQueryPropertiesTest {
     set.add("name");
     OrmQueryProperties p1 = new OrmQueryProperties(null, set);
 
-    assertThat(p1.getProperties()).isEqualTo("name");
+    assertThat(p1.getIncluded()).containsOnly("name");
     assertThat(p1.allProperties()).isFalse();
   }
 
@@ -47,7 +42,7 @@ public class OrmQueryPropertiesTest {
     set.add("startDate");
     OrmQueryProperties p1 = new OrmQueryProperties(null, set);
 
-    assertThat(p1.getProperties()).isEqualTo("id,name,startDate");
+    assertThat(p1.getIncluded()).containsOnly("id", "name", "startDate");
     assertThat(p1.allProperties()).isFalse();
   }
 
diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java
index 0d791db50..f33a42a42 100644
--- a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java
+++ b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java
@@ -1,12 +1,10 @@
 package org.tests.basic.lob;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.tests.model.basic.EBasicClobNoVer;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
@@ -21,53 +19,50 @@ public class TestBasicClobNoVer extends BaseTestCase {
     EBasicClobNoVer entity = new EBasicClobNoVer();
     entity.setName("test");
     entity.setDescription("initialClobValue");
-    EbeanServer server = Ebean.getServer(null);
-    server.save(entity);
-
-
-    String sqlNoClob = "select t0.id, t0.name from ebasic_clob_no_ver t0 where t0.id = ?";
-    String sqlWithClob = "select t0.id, t0.name, t0.description from ebasic_clob_no_ver t0 where t0.id = ?";
-
+    DB.save(entity);
 
     // Clob by default is Fetch Lazy
-    Query<EBasicClobNoVer> defaultQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId());
+    Query<EBasicClobNoVer> defaultQuery = DB.find(EBasicClobNoVer.class).setId(entity.getId());
     defaultQuery.findOne();
     String sql = sqlOf(defaultQuery, 2);
 
-    Assert.assertTrue("Clob is fetch lazy by default", sql.contains(sqlNoClob));
+    // default SQL select excludes clob
+    String sqlNoClob = "select t0.id, t0.name from ebasic_clob_no_ver t0 where t0.id = ?";
+    assertThat(sql).contains(sqlNoClob);
 
 
     // Explicitly select * including Clob
-    Query<EBasicClobNoVer> explicitQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId()).select("*");
+    Query<EBasicClobNoVer> explicitQuery = DB.find(EBasicClobNoVer.class).setId(entity.getId()).select("*");
 
     explicitQuery.findOne();
     sql = sqlOf(explicitQuery, 2);
 
-    Assert.assertTrue("Explicitly include Clob", sql.contains(sqlWithClob));
+    // Explicitly include Clob
+    String sqlWithClob = "select t0.id, t0.name, t0.description from ebasic_clob_no_ver t0 where t0.id = ?";
+    assertThat(sql).contains(sqlWithClob);
 
     // Update description to test refresh
 
     EBasicClobNoVer updateBean = new EBasicClobNoVer();
     updateBean.setId(entity.getId());
     updateBean.setDescription("modified");
-    Ebean.update(updateBean);
+    DB.update(updateBean);
 
 
     // Test refresh function
 
-    Assert.assertEquals("initialClobValue", entity.getDescription());
+    assertThat(entity.getDescription()).isEqualTo("initialClobValue");
 
     LoggedSqlCollector.start();
 
     // Refresh query includes all properties
-    server.refresh(entity);
+    DB.refresh(entity);
 
     // Assert all properties fetched in refresh
     List<String> loggedSql = LoggedSqlCollector.stop();
-    Assert.assertEquals(1, loggedSql.size());
+    assertThat(loggedSql).hasSize(1);
     assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob);
-    Assert.assertEquals("modified", entity.getDescription());
-
+    assertThat(entity.getDescription()).isEqualTo("modified");
   }
 
 }
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 2fe2570a4..0bdeeb257 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -6,16 +6,6 @@
     <groupId>io.ebean</groupId>
     <version>12.7.1-SNAPSHOT</version>
   </parent>
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java8-oss</artifactId>-->
-<!--    <version>2.3</version>-->
-<!--  </parent>-->
-
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
-  </scm>
 
   <name>ebean querybean</name>
   <description>Ebean querybean support</description>
@@ -78,6 +68,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-test</artifactId>
+      <version>12.7.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>junit</artifactId>
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
index 9f56b6b13..c54862151 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
@@ -1,6 +1,11 @@
 package io.ebean.typequery;
 
 import io.ebean.ExpressionList;
+import io.ebean.FetchConfig;
+import io.ebeaninternal.api.SpiQueryFetch;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 /**
  * Base type for associated beans.
@@ -11,6 +16,11 @@ import io.ebean.ExpressionList;
 @SuppressWarnings("rawtypes")
 public abstract class TQAssocBean<T, R> extends TQProperty<R> {
 
+  private static final FetchConfig FETCH_DEFAULT = FetchConfig.ofDefault();
+  private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
+  private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();
+  private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
+
   /**
    * Construct with a property name and root instance.
    *
@@ -88,9 +98,8 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
 
   /**
    * Deprecated in favor of fetch().
-   *
-   * @deprecated
    */
+  @Deprecated
   public R fetchAll() {
     return fetch();
   }
@@ -100,8 +109,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    */
   @SafeVarargs
   protected final R fetchProperties(TQProperty<?>... props) {
-    ((TQRootBean) _root).query().fetch(_name, properties(props));
-    return _root;
+    return fetchWithProperties(FETCH_DEFAULT, props);
   }
 
   /**
@@ -109,8 +117,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    */
   @SafeVarargs
   protected final R fetchQueryProperties(TQProperty<?>... props) {
-    ((TQRootBean) _root).query().fetchQuery(_name, properties(props));
-    return _root;
+    return fetchWithProperties(FETCH_QUERY, props);
   }
 
   /**
@@ -118,8 +125,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    */
   @SafeVarargs
   protected final R fetchCacheProperties(TQProperty<?>... props) {
-    ((TQRootBean) _root).query().fetchCache(_name, properties(props));
-    return _root;
+    return fetchWithProperties(FETCH_CACHE, props);
   }
 
   /**
@@ -127,23 +133,26 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    */
   @SafeVarargs
   protected final R fetchLazyProperties(TQProperty<?>... props) {
-    ((TQRootBean) _root).query().fetchLazy(_name, properties(props));
+    return fetchWithProperties(FETCH_LAZY, props);
+  }
+
+  @SafeVarargs
+  private final R fetchWithProperties(FetchConfig config, TQProperty<?>... props) {
+    spiQuery().fetchProperties(_name, properties(props), config);
     return _root;
   }
 
-  /**
-   * Append the properties as a comma delimited string.
-   */
+  private final SpiQueryFetch spiQuery() {
+    return (SpiQueryFetch)((TQRootBean) _root).query();
+  }
+
   @SafeVarargs
-  protected final String properties(TQProperty<?>... props) {
-    StringBuilder selectProps = new StringBuilder(50);
-    for (int i = 0; i < props.length; i++) {
-      if (i > 0) {
-        selectProps.append(",");
-      }
-      selectProps.append(props[i].propertyName());
+  private final Set<String> properties(TQProperty<?>... props) {
+    Set<String> set = new LinkedHashSet<>();
+    for (TQProperty<?> prop : props) {
+      set.add(prop.propertyName());
     }
-    return selectProps.toString();
+    return set;
   }
 
   /**
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 72876a00d..de8f846a6 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -25,6 +25,7 @@ import io.ebean.search.TextQueryString;
 import io.ebean.search.TextSimple;
 import io.ebean.service.SpiFetchGroupQuery;
 import io.ebean.text.PathProperties;
+import io.ebeaninternal.api.SpiQueryFetch;
 import io.ebeaninternal.server.util.ArrayStack;
 
 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@ import javax.annotation.Nullable;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -278,22 +280,21 @@ public abstract class TQRootBean<T, R> {
    */
   @SafeVarargs
   public final R select(TQProperty<R>... properties) {
-    StringBuilder selectProps = new StringBuilder(50);
-    for (int i = 0; i < properties.length; i++) {
-      if (i > 0) {
-        selectProps.append(",");
-      }
-      selectProps.append(properties[i].propertyName());
-    }
-    query.select(selectProps.toString());
+    ((SpiQueryFetch)query).selectProperties(properties(properties));
     return root;
   }
 
+  private Set<String> properties(TQProperty<R>[] properties) {
+    Set<String> props = new LinkedHashSet<>();
+    for (TQProperty<R> property : properties) {
+      props.add(property.propertyName());
+    }
+    return props;
+  }
+
   /**
    * Specify a path to load including all its properties.
-   * <p>
-   * The same as {@link #fetch(String, String)} with the fetchProperties as "*".
-   * </p>
+   *
    * <pre>{@code
    *
    * List<Customer> customers =
diff --git a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
index ab98f0e67..2f470fdb5 100644
--- a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
+++ b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
@@ -1,11 +1,17 @@
 package org.querytest;
 
+import io.ebean.DB;
 import io.ebean.FetchGroup;
+import io.ebean.test.LoggedSql;
 import org.example.domain.Order;
 import org.example.domain.query.QCustomer;
 import org.example.domain.query.QOrder;
 import org.junit.Test;
 
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class QOrderTest {
 
   private static final QCustomer cu = QCustomer.alias();
@@ -17,10 +23,14 @@ public class QOrderTest {
     .customer.fetchCache(cu.name, cu.status, cu.registered, cu.comments)
     .buildFetchGroup();
 
+  private static final FetchGroup<Order> fg2 = QOrder.forFetchGroup()
+    .select(or.status)
+    .customer.fetch(cu.name)
+    .buildFetchGroup();
+
   @Test
   public void fetchCache() {
 
-
     new QOrder()
       .status.eq(Order.Status.NEW)
       .customer.fetchCache(cu.name, cu.registered)
@@ -35,10 +45,72 @@ public class QOrderTest {
   @Test
   public void viaFetchGraph() {
 
+    DB.getDefault();
+    LoggedSql.start();
+
     new QOrder()
       .status.eq(Order.Status.NEW)
       .select(fg)
       .findList();
+
+
+    final List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.ship_date, t0.customer_id from o_order t0 where");
+  }
+
+  @Test
+  public void viaFetchGraph_withJoin() {
+
+    DB.getDefault();
+    LoggedSql.start();
+
+    new QOrder()
+      .status.eq(Order.Status.NEW)
+      .select(fg2)
+      .findList();
+
+
+    final List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t1.id, t1.name from o_order t0 join be_customer t1 on t1.id = t0.customer_id where");
+  }
+
+  @Test
+  public void select_partial() {
+
+    DB.getDefault();
+    LoggedSql.start();
+
+    final QOrder o = QOrder.alias();
+
+    new QOrder()
+      .select(o.status, o.orderDate)
+      .findList();
+
+    final List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.order_date from o_order t0");
+  }
+
+  @Test
+  public void fetch_partial() {
+
+    DB.getDefault();
+    LoggedSql.start();
+
+    final QOrder o = QOrder.alias();
+    final QCustomer c = QCustomer.alias();
+
+    new QOrder()
+      .select(o.status)
+      .customer.fetch(c.email, c.name)
+      .findList();
+
+    final List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t1.id, t1.email, t1.name from o_order t0 join be_customer t1 on t1.id = t0.customer_id");
+
   }
 
 }

From e5ec72df5cbc0a836ac36773b0b7d5602f8d4938 Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Tue, 16 Feb 2021 20:37:58 +1300
Subject: [PATCH 106/447] Refactor internals OrmQueryProperties invert
 isEmpty() -> nonEmpty()

---
 .../server/autotune/service/ProfileOriginTest.java          | 5 +----
 .../io/ebeaninternal/server/querydefn/OrmQueryDetail.java   | 2 +-
 .../ebeaninternal/server/querydefn/OrmQueryProperties.java  | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
index ec0a09596..c3995d215 100644
--- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
+++ b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
@@ -11,12 +11,9 @@ import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-//import org.tests.model.basic.ResetBasicData;
-
 public class ProfileOriginTest extends BaseTestCase {
 
-
-  private BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
+  private final BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
 
   @Test
   public void buildDetail() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 1c441cbf4..ba03b7c78 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -111,7 +111,7 @@ public class OrmQueryDetail implements Serializable {
    */
   public String asStringDebug() {
     StringBuilder sb = new StringBuilder();
-    if (!baseProps.isEmpty()) {
+    if (baseProps.notEmpty()) {
       baseProps.asStringDebug("select ", sb);
     }
     if (fetchPaths != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index e84828f09..eb41bb40f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -214,7 +214,7 @@ public class OrmQueryProperties implements Serializable {
    */
   @SuppressWarnings("unchecked")
   public void configureBeanQuery(SpiQuery<?> query) {
-    if (!isEmpty()) {
+    if (notEmpty()) {
       query.selectProperties(this);
     }
 
@@ -252,8 +252,8 @@ public class OrmQueryProperties implements Serializable {
   /**
    * Return true if the properties and configuration are empty.
    */
-  boolean isEmpty() {
-    return !allProperties && included == null;
+  boolean notEmpty() {
+    return allProperties || included != null;
   }
 
   public void asStringDebug(String prefix, StringBuilder sb) {

From de439e7695b3731c16f1672ced953217d9759391 Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Tue, 16 Feb 2021 23:20:44 +1300
Subject: [PATCH 107/447] Improve Refactor internals OrmQueryProperties invert
 isEmpty()

Rename to hasProperties() and improve javadoc
---
 .../server/querydefn/OrmQueryDetail.java             |  2 +-
 .../server/querydefn/OrmQueryProperties.java         | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index ba03b7c78..6f96fbbea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -111,7 +111,7 @@ public class OrmQueryDetail implements Serializable {
    */
   public String asStringDebug() {
     StringBuilder sb = new StringBuilder();
-    if (baseProps.notEmpty()) {
+    if (baseProps.hasProperties()) {
       baseProps.asStringDebug("select ", sb);
     }
     if (fetchPaths != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index eb41bb40f..d1a3aeafc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -214,7 +214,7 @@ public class OrmQueryProperties implements Serializable {
    */
   @SuppressWarnings("unchecked")
   public void configureBeanQuery(SpiQuery<?> query) {
-    if (notEmpty()) {
+    if (hasProperties()) {
       query.selectProperties(this);
     }
 
@@ -242,17 +242,13 @@ public class OrmQueryProperties implements Serializable {
   }
 
   public boolean hasSelectClause() {
-    if (allProperties) {
-      return true;
-    }
-    // explicitly selected some properties
-    return included != null || filterMany != null;
+    return allProperties || included != null || filterMany != null;
   }
 
   /**
-   * Return true if the properties and configuration are empty.
+   * Return true if explicit properties have been specified.
    */
-  boolean notEmpty() {
+  boolean hasProperties() {
     return allProperties || included != null;
   }
 

From 3bb4126e2652425f89c6ffb5db0b0aace1ecd004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Camilo?= <ajcamilo@users.noreply.github.com>
Date: Wed, 17 Feb 2021 05:04:43 +0000
Subject: [PATCH 108/447] #2169 Support for
 jakarta.validation.constraints.NotNull and (#2170)

jakarta.validation.constraints.Size
---
 CONFIGURATION.md                              |  2 +-
 ebean-api/pom.xml                             |  6 ++
 .../java/io/ebean/config/ClassLoadConfig.java |  7 ++
 .../java/io/ebean/config/DatabaseConfig.java  | 15 ++--
 ebean-core/pom.xml                            |  6 ++
 .../deploy/meta/DeployBeanProperty.java       | 11 ++-
 .../deploy/parse/AnnotationAssocOnes.java     | 12 ++-
 .../server/deploy/parse/AnnotationFields.java | 37 ++++++--
 .../server/deploy/parse/AnnotationParser.java |  9 +-
 .../server/deploy/parse/DeployUtil.java       |  8 +-
 .../InitMetaJakartaValidationAnnotation.java  | 11 +++
 ...=> InitMetaJavaxValidationAnnotation.java} |  2 +-
 .../deploy/parse/ReadAnnotationConfig.java    |  6 ++
 .../server/deploy/parse/ReadAnnotations.java  |  5 +-
 .../org/tests/basic/TestAnnotationBase.java   | 84 +++++++++++++++++++
 15 files changed, 191 insertions(+), 30 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java
 rename ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/{InitMetaValidationAnnotation.java => InitMetaJavaxValidationAnnotation.java} (85%)

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index 16fa6d698..46be98f0b 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -293,6 +293,6 @@ ebean.tenant.schemaProvider
 ebean.updateAllPropertiesInBatch
 ebean.updateChangesOnly
 ebean.updatesDeleteMissingChildren
-ebean.useJavaxValidationNotNull
+ebean.useValidationNotNull
 ebean.useJtaTransactionManager
 
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 0d8e67b00..1edc0a655 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -109,6 +109,12 @@
       <version>1.1.0.Final</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>3.0.0</version>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java b/ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java
index 821905405..764fa86a1 100644
--- a/ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java
@@ -40,6 +40,13 @@ public class ClassLoadConfig {
     return isPresent("javax.validation.constraints.NotNull");
   }
 
+  /**
+   * Return true if jakarta validation annotations like Size and NotNull are present.
+   */
+  public boolean isJakartaValidationAnnotationsPresent() {
+    return isPresent("jakarta.validation.constraints.NotNull");
+  }
+
   /**
    * Return true if javax PostConstruct annotation is present (maybe not in java9).
    * If not we don't support PostConstruct lifecycle events.
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 7ea8e56e9..036a39040 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -489,7 +489,7 @@ public class DatabaseConfig {
    * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
    * If set to false, use io.ebean.annotation.NotNull or Column(nullable=true).
    */
-  private boolean useJavaxValidationNotNull = true;
+  private boolean useValidationNotNull = true;
 
   /**
    * Generally we want to perform L2 cache notification in the background and not impact
@@ -2809,7 +2809,7 @@ public class DatabaseConfig {
     enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
     notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
-    useJavaxValidationNotNull = p.getBoolean("useJavaxValidationNotNull", useJavaxValidationNotNull);
+    useValidationNotNull = p.getBoolean("useValidationNotNull", useValidationNotNull);
     autoReadOnlyDataSource = p.getBoolean("autoReadOnlyDataSource", autoReadOnlyDataSource);
     idGeneratorAutomatic = p.getBoolean("idGeneratorAutomatic", idGeneratorAutomatic);
 
@@ -3056,20 +3056,21 @@ public class DatabaseConfig {
   /**
    * Returns if we use javax.validation.constraints.NotNull
    */
-  public boolean isUseJavaxValidationNotNull() {
-    return useJavaxValidationNotNull;
+  public boolean isUseValidationNotNull() {
+    return useValidationNotNull;
   }
 
   /**
-   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code>
+   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code> or
+   * <code>&x64;jakarta.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;
+  public void setUseValidationNotNull(boolean useValidationNotNull) {
+    this.useValidationNotNull = useValidationNotNull;
   }
 
   /**
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 20d9cfe6c..dcdad1b0e 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -138,6 +138,12 @@
       <version>1.1.0.Final</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>3.0.0</version>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>joda-time</groupId>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index df3a46094..bccc21bcc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -1140,7 +1140,7 @@ public class DeployBeanProperty {
     return result;
   }
 
-  public List<Size> getMetaAnnotationSize() {
+  public List<Size> getMetaAnnotationJavaxSize() {
     final List<Size> size = getMetaAnnotations(Size.class);
     final List<Size.List> lists = getMetaAnnotations(Size.List.class);
     for (Size.List list : lists) {
@@ -1149,6 +1149,15 @@ public class DeployBeanProperty {
     return size;
   }
 
+  public List<jakarta.validation.constraints.Size> getMetaAnnotationJakartaSize() {
+    final List<jakarta.validation.constraints.Size> size = getMetaAnnotations(jakarta.validation.constraints.Size.class);
+    final List<jakarta.validation.constraints.Size.List> lists = getMetaAnnotations(jakarta.validation.constraints.Size.List.class);
+    for (jakarta.validation.constraints.Size.List list : lists) {
+      Collections.addAll(size, list.value());
+    }
+    return size;
+  }
+
   public Formula getMetaAnnotationFormula(Platform platform) {
     Formula fallback = null;
     for (Annotation ann : metaAnnotations) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 6750633cb..aa38d93e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -4,13 +4,11 @@ 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;
 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;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
@@ -117,7 +115,7 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
     if (nonNull != null) {
       prop.setNullable(false);
     }
-    if (validationAnnotations) {
+    if (javaxValidationAnnotations) {
       NotNull notNull = get(prop, NotNull.class);
       if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
         prop.setNullable(false);
@@ -125,6 +123,14 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
         prop.getTableJoin().setType(SqlJoinType.INNER);
       }
     }
+    if (jakartaValidationAnnotations) {
+      jakarta.validation.constraints.NotNull notNull = get(prop, jakarta.validation.constraints.NotNull.class);
+      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
+        prop.setNullable(false);
+        // overrides optional attribute of ManyToOne etc
+        prop.getTableJoin().setType(SqlJoinType.INNER);
+      }
+    }
 
     // check for manually defined joins
     BeanTable beanTable = prop.getBeanTable();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index aafbfa182..413929098 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -258,19 +258,38 @@ public class AnnotationFields extends AnnotationParser {
   }
 
   private void initValidation(DeployBeanProperty prop) {
-    NotNull notNull = get(prop, NotNull.class);
-    if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
-      // Not null on all validation groups so enable
-      // DDL generation of Not Null Constraint
-      prop.setNullable(false);
+    if (javaxValidationAnnotations) {
+      NotNull notNull = get(prop, NotNull.class);
+      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
+        // Not null on all validation groups so enable
+        // DDL generation of Not Null Constraint
+        prop.setNullable(false);
+      }
+    }
+    if (jakartaValidationAnnotations) {
+      jakarta.validation.constraints.NotNull notNull = get(prop, jakarta.validation.constraints.NotNull.class);
+      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
+        // Not null on all validation groups so enable
+        // DDL generation of Not Null Constraint
+        prop.setNullable(false);
+      }
     }
 
     if (!prop.isLob()) {
       // take the max size of all @Size annotations
       int maxSize = -1;
-      for (Size size : prop.getMetaAnnotationSize()) {
-        if (size.max() < Integer.MAX_VALUE) {
-          maxSize = Math.max(maxSize, size.max());
+      if (javaxValidationAnnotations) {
+        for (Size size : prop.getMetaAnnotationJavaxSize()) {
+          if (size.max() < Integer.MAX_VALUE) {
+            maxSize = Math.max(maxSize, size.max());
+          }
+        }
+      }
+      if (jakartaValidationAnnotations) {
+        for (jakarta.validation.constraints.Size size : prop.getMetaAnnotationJakartaSize()) {
+          if (size.max() < Integer.MAX_VALUE) {
+            maxSize = Math.max(maxSize, size.max());
+          }
         }
       }
       if (maxSize != -1) {
@@ -280,7 +299,7 @@ public class AnnotationFields extends AnnotationParser {
   }
 
   private void initTenantId(DeployBeanProperty prop) {
-    if (validationAnnotations) {
+    if (javaxValidationAnnotations || jakartaValidationAnnotations) {
       initValidation(prop);
     }
     if (has(prop, TenantId.class)) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index 64851135d..8a27981b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -26,14 +26,17 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   final Class<?> beanType;
 
-  final boolean validationAnnotations;
+  final boolean javaxValidationAnnotations;
+
+  final boolean jakartaValidationAnnotations;
 
   final ReadAnnotationConfig readConfig;
 
   AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
     super(info.getUtil());
     this.readConfig = readConfig;
-    this.validationAnnotations = readConfig.isJavaxValidationAnnotations();
+    this.javaxValidationAnnotations = readConfig.isJavaxValidationAnnotations();
+    this.jakartaValidationAnnotations = readConfig.isJakartaValidationAnnotations();
     this.info = info;
     this.beanType = info.getDescriptor().getBeanType();
     this.descriptor = info.getDescriptor();
@@ -132,7 +135,7 @@ public abstract class AnnotationParser extends AnnotationBase {
    * can be applied to DDL generation.
    */
   boolean isEbeanValidationGroups(Class<?>[] groups) {
-    if (!util.isUseJavaxValidationNotNull()) {
+    if (!util.isUseValidationNotNull()) {
       return false;
     }
     return groups.length == 0 || groups.length == 1 && Default.class.isAssignableFrom(groups[0]);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 3a0f8d826..65c7cf45e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -57,7 +57,7 @@ public class DeployUtil {
 
   private final Encryptor bytesEncryptor;
 
-  private final boolean useJavaxValidationNotNull;
+  private final boolean useValidationNotNull;
 
   public DeployUtil(TypeManager typeMgr, DatabaseConfig config) {
     this.typeManager = typeMgr;
@@ -67,7 +67,7 @@ public class DeployUtil {
     this.encryptKeyManager = config.getEncryptKeyManager();
     Encryptor be = config.getEncryptor();
     this.bytesEncryptor = be != null ? be : new SimpleAesEncryptor();
-    this.useJavaxValidationNotNull = config.isUseJavaxValidationNotNull();
+    this.useValidationNotNull = config.isUseValidationNotNull();
   }
 
   public TypeManager getTypeManager() {
@@ -286,8 +286,8 @@ public class DeployUtil {
     return type.equals(String.class);
   }
 
-  boolean isUseJavaxValidationNotNull() {
-    return useJavaxValidationNotNull;
+  boolean isUseValidationNotNull() {
+    return useValidationNotNull;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java
new file mode 100644
index 000000000..41ea9a8c7
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java
@@ -0,0 +1,11 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import jakarta.validation.constraints.Size;
+
+class InitMetaJakartaValidationAnnotation {
+
+  static void init(ReadAnnotationConfig readConfig) {
+    readConfig.addMetaAnnotation(Size.class);
+    readConfig.addMetaAnnotation(Size.List.class);
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaValidationAnnotation.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJavaxValidationAnnotation.java
similarity index 85%
rename from ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaValidationAnnotation.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJavaxValidationAnnotation.java
index 9d5ac9e30..495d26ff5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaValidationAnnotation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJavaxValidationAnnotation.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy.parse;
 
 import javax.validation.constraints.Size;
 
-class InitMetaValidationAnnotation {
+class InitMetaJavaxValidationAnnotation {
 
   static void init(ReadAnnotationConfig readConfig) {
     readConfig.addMetaAnnotation(Size.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
index bf96849b0..d7d46e9ce 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
@@ -21,6 +21,7 @@ class ReadAnnotationConfig {
   private final boolean disableL2Cache;
   private final boolean eagerFetchLobs;
   private final boolean javaxValidationAnnotations;
+  private final boolean jakartaValidationAnnotations;
   private final boolean jacksonAnnotations;
   private final boolean idGeneratorAutomatic;
 
@@ -34,6 +35,7 @@ class ReadAnnotationConfig {
     this.eagerFetchLobs = config.isEagerFetchLobs();
     this.idGeneratorAutomatic = config.isIdGeneratorAutomatic();
     this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
+    this.jakartaValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJakartaValidationAnnotationsPresent();
     this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
     this.metaAnnotations.add(Column.class);
     this.metaAnnotations.add(Formula.class);
@@ -75,6 +77,10 @@ class ReadAnnotationConfig {
     return javaxValidationAnnotations;
   }
 
+  boolean isJakartaValidationAnnotations() {
+    return jakartaValidationAnnotations;
+  }
+
   boolean isJacksonAnnotations() {
     return jacksonAnnotations;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
index 86a6a15f0..796a975aa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
@@ -15,7 +15,10 @@ public class ReadAnnotations {
   public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, DatabaseConfig config) {
     this.readConfig = new ReadAnnotationConfig(generatedPropFactory, asOfViewSuffix, versionsBetweenSuffix, config);
     if (readConfig.isJavaxValidationAnnotations()) {
-      InitMetaValidationAnnotation.init(readConfig);
+      InitMetaJavaxValidationAnnotation.init(readConfig);
+    }
+    if (readConfig.isJakartaValidationAnnotations()) {
+      InitMetaJakartaValidationAnnotation.init(readConfig);
     }
     if (readConfig.isJacksonAnnotations()) {
       InitMetaJacksonAnnotation.init(readConfig);
diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java
index aa0e0e926..c5781174d 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java
@@ -144,6 +144,69 @@ public class TestAnnotationBase extends BaseTestCase {
     }
   }
 
+  @Entity
+  public static class TestJakartaAnnotationBaseEntity extends MappedBaseEntity {
+    @Where(clause = "SELECT 'mysql' from 1", platforms = Platform.MYSQL)
+    @Where(clause = "SELECT 'h2' from 1", platforms = H2)
+    @Where(clause = "SELECT 'other' from 1")
+    private String direct;
+
+    @MetaTest
+    private String meta;
+
+    @MetaTest
+    @Where(clause = "SELECT 'oracle' from 1", platforms = Platform.ORACLE)
+    private String mixed;
+
+    @jakarta.validation.constraints.Size.List({
+      @jakarta.validation.constraints.Size(max = 10, message = "max length for you is 10"),
+      @jakarta.validation.constraints.Size(min = 1),
+      @jakarta.validation.constraints.Size(max = 40, message = "max value for you is 40", groups = ValidationGroupSomething.class)
+    })
+    private String constraintAnnotation;
+
+    @NotNull
+    private String null1;
+
+
+    @NotNull(groups = ValidationGroupSomething.class)
+    private String null2;
+
+    private String null3;
+
+    public String getConstraintAnnotation() {
+      return constraintAnnotation;
+    }
+
+    public void setConstraintAnnotation(String constraintAnnotation) {
+      this.constraintAnnotation = constraintAnnotation;
+    }
+
+    public String getNull1() {
+      return null1;
+    }
+
+    public void setNull1(String null1) {
+      this.null1 = null1;
+    }
+
+    public String getNull2() {
+      return null2;
+    }
+
+    public void setNull2(String null2) {
+      this.null2 = null2;
+    }
+
+    public String getNull3() {
+      return null3;
+    }
+
+    public void setNull3(String null3) {
+      this.null3 = null3;
+    }
+  }
+
 
   @Test
   public void testFindMaxSize() throws SecurityException {
@@ -152,6 +215,13 @@ public class TestAnnotationBase extends BaseTestCase {
     assertEquals(40, bp.getDbLength());
   }
 
+  @Test
+  public void testFindJakartaMaxSize() throws SecurityException {
+    BeanDescriptor<TestJakartaAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class);
+    BeanProperty bp = descriptor.findProperty("constraintAnnotation");
+    assertEquals(40, bp.getDbLength());
+  }
+
   @Test
   public void annotationClassIndexes() throws SecurityException {
     BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
@@ -173,6 +243,20 @@ public class TestAnnotationBase extends BaseTestCase {
     assertTrue(bp.isNullable());
   }
 
+  @Test
+  public void testJakartaNotNullWithGroup() throws SecurityException {
+    BeanDescriptor<TestJakartaAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class);
+
+    BeanProperty bp = descriptor.findProperty("null1");
+    assertFalse(bp.isNullable());
+
+    bp = descriptor.findProperty("null2");
+    assertTrue(bp.isNullable());
+
+    bp = descriptor.findProperty("null3");
+    assertTrue(bp.isNullable());
+  }
+
   @Test
   public void testFindAnnotation() throws NoSuchFieldException, SecurityException {
 

From b4ae721998f1e2b1b7982fefd1029e8669f1ed5b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Feb 2021 22:23:07 +1300
Subject: [PATCH 109/447] #2169 Refactor after #2170 tidy javax/jakarta
 validation annotation reading (#2171)

Introduces ReadValidationAnnotations with javax and jakarta implementations and moves the validation annotation reading there
---
 ebean-api/pom.xml                             | 14 ----
 .../deploy/meta/DeployBeanProperty.java       | 19 ------
 .../deploy/parse/AnnotationAssocOnes.java     | 20 ++----
 .../server/deploy/parse/AnnotationFields.java | 41 ++----------
 .../server/deploy/parse/AnnotationParser.java | 18 ------
 .../InitMetaJakartaValidationAnnotation.java  | 11 ----
 .../InitMetaJavaxValidationAnnotation.java    | 11 ----
 .../deploy/parse/ReadAnnotationConfig.java    | 64 +++++++++++++++----
 .../server/deploy/parse/ReadAnnotations.java  |  9 ---
 .../parse/ReadValidationAnnotations.java      | 19 ++++++
 .../ReadValidationAnnotationsJakarta.java     | 51 +++++++++++++++
 .../parse/ReadValidationAnnotationsJavax.java | 52 +++++++++++++++
 12 files changed, 182 insertions(+), 147 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJavaxValidationAnnotation.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotations.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 1edc0a655..80d8db37a 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -102,20 +102,6 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- provided scope to read validation annotations Size etc -->
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>1.1.0.Final</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-      <version>3.0.0</version>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index bccc21bcc..5b9e8d687 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -34,7 +34,6 @@ import javax.persistence.EmbeddedId;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.Version;
-import javax.validation.constraints.Size;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
@@ -1140,24 +1139,6 @@ public class DeployBeanProperty {
     return result;
   }
 
-  public List<Size> getMetaAnnotationJavaxSize() {
-    final List<Size> size = getMetaAnnotations(Size.class);
-    final List<Size.List> lists = getMetaAnnotations(Size.List.class);
-    for (Size.List list : lists) {
-      Collections.addAll(size, list.value());
-    }
-    return size;
-  }
-
-  public List<jakarta.validation.constraints.Size> getMetaAnnotationJakartaSize() {
-    final List<jakarta.validation.constraints.Size> size = getMetaAnnotations(jakarta.validation.constraints.Size.class);
-    final List<jakarta.validation.constraints.Size.List> lists = getMetaAnnotations(jakarta.validation.constraints.Size.List.class);
-    for (jakarta.validation.constraints.Size.List list : lists) {
-      Collections.addAll(size, list.value());
-    }
-    return size;
-  }
-
   public Formula getMetaAnnotationFormula(Platform platform) {
     Formula fallback = null;
     for (Annotation ann : metaAnnotations) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index aa38d93e6..d313ce925 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -26,7 +26,6 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.PrimaryKeyJoinColumn;
-import javax.validation.constraints.NotNull;
 
 /**
  * Read the deployment annotations for Associated One beans.
@@ -115,21 +114,10 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
     if (nonNull != null) {
       prop.setNullable(false);
     }
-    if (javaxValidationAnnotations) {
-      NotNull notNull = get(prop, NotNull.class);
-      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
-        prop.setNullable(false);
-        // overrides optional attribute of ManyToOne etc
-        prop.getTableJoin().setType(SqlJoinType.INNER);
-      }
-    }
-    if (jakartaValidationAnnotations) {
-      jakarta.validation.constraints.NotNull notNull = get(prop, jakarta.validation.constraints.NotNull.class);
-      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
-        prop.setNullable(false);
-        // overrides optional attribute of ManyToOne etc
-        prop.getTableJoin().setType(SqlJoinType.INNER);
-      }
+    if (readConfig.isValidationNotNull(prop)) {
+      // overrides optional attribute of ManyToOne etc
+      prop.setNullable(false);
+      prop.getTableJoin().setType(SqlJoinType.INNER);
     }
 
     // check for manually defined joins
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 413929098..8079f156f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -69,8 +69,6 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import javax.persistence.Version;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.sql.Types;
 import java.util.Set;
 import java.util.UUID;
@@ -258,48 +256,19 @@ public class AnnotationFields extends AnnotationParser {
   }
 
   private void initValidation(DeployBeanProperty prop) {
-    if (javaxValidationAnnotations) {
-      NotNull notNull = get(prop, NotNull.class);
-      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
-        // Not null on all validation groups so enable
-        // DDL generation of Not Null Constraint
-        prop.setNullable(false);
-      }
+    if (readConfig.isValidationNotNull(prop)) {
+      prop.setNullable(false);
     }
-    if (jakartaValidationAnnotations) {
-      jakarta.validation.constraints.NotNull notNull = get(prop, jakarta.validation.constraints.NotNull.class);
-      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
-        // Not null on all validation groups so enable
-        // DDL generation of Not Null Constraint
-        prop.setNullable(false);
-      }
-    }
-
     if (!prop.isLob()) {
-      // take the max size of all @Size annotations
-      int maxSize = -1;
-      if (javaxValidationAnnotations) {
-        for (Size size : prop.getMetaAnnotationJavaxSize()) {
-          if (size.max() < Integer.MAX_VALUE) {
-            maxSize = Math.max(maxSize, size.max());
-          }
-        }
-      }
-      if (jakartaValidationAnnotations) {
-        for (jakarta.validation.constraints.Size size : prop.getMetaAnnotationJakartaSize()) {
-          if (size.max() < Integer.MAX_VALUE) {
-            maxSize = Math.max(maxSize, size.max());
-          }
-        }
-      }
-      if (maxSize != -1) {
+      int maxSize = readConfig.maxValidationSize(prop);
+      if (maxSize > 0) {
         prop.setDbLength(maxSize);
       }
     }
   }
 
   private void initTenantId(DeployBeanProperty prop) {
-    if (javaxValidationAnnotations || jakartaValidationAnnotations) {
+    if (readConfig.checkValidationAnnotations()) {
       initValidation(prop);
     }
     if (has(prop, TenantId.class)) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index 8a27981b4..af015e1f5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -9,7 +9,6 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import javax.persistence.AttributeOverride;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
-import javax.validation.groups.Default;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -26,17 +25,11 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   final Class<?> beanType;
 
-  final boolean javaxValidationAnnotations;
-
-  final boolean jakartaValidationAnnotations;
-
   final ReadAnnotationConfig readConfig;
 
   AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
     super(info.getUtil());
     this.readConfig = readConfig;
-    this.javaxValidationAnnotations = readConfig.isJavaxValidationAnnotations();
-    this.jakartaValidationAnnotations = readConfig.isJakartaValidationAnnotations();
     this.info = info;
     this.beanType = info.getDescriptor().getBeanType();
     this.descriptor = info.getDescriptor();
@@ -130,17 +123,6 @@ public abstract class AnnotationParser extends AnnotationBase {
     }
   }
 
-  /**
-   * Return true if the validation groups are {@link Default} (respectively empty)
-   * can be applied to DDL generation.
-   */
-  boolean isEbeanValidationGroups(Class<?>[] groups) {
-    if (!util.isUseValidationNotNull()) {
-      return false;
-    }
-    return groups.length == 0 || groups.length == 1 && Default.class.isAssignableFrom(groups[0]);
-  }
-
   String[] convertColumnNames(String[] columnNames) {
     for (int i = 0; i < columnNames.length; i++) {
       columnNames[i] = databasePlatform.convertQuotedIdentifiers(columnNames[i]);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java
deleted file mode 100644
index 41ea9a8c7..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJakartaValidationAnnotation.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.ebeaninternal.server.deploy.parse;
-
-import jakarta.validation.constraints.Size;
-
-class InitMetaJakartaValidationAnnotation {
-
-  static void init(ReadAnnotationConfig readConfig) {
-    readConfig.addMetaAnnotation(Size.class);
-    readConfig.addMetaAnnotation(Size.List.class);
-  }
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJavaxValidationAnnotation.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJavaxValidationAnnotation.java
deleted file mode 100644
index 495d26ff5..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJavaxValidationAnnotation.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.ebeaninternal.server.deploy.parse;
-
-import javax.validation.constraints.Size;
-
-class InitMetaJavaxValidationAnnotation {
-
-  static void init(ReadAnnotationConfig readConfig) {
-    readConfig.addMetaAnnotation(Size.class);
-    readConfig.addMetaAnnotation(Size.List.class);
-  }
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
index d7d46e9ce..1daf37564 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
@@ -3,8 +3,10 @@ package io.ebeaninternal.server.deploy.parse;
 import io.ebean.annotation.Aggregation;
 import io.ebean.annotation.Formula;
 import io.ebean.annotation.Where;
+import io.ebean.config.ClassLoadConfig;
 import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 import javax.persistence.Column;
 import java.util.HashSet;
@@ -24,7 +26,9 @@ class ReadAnnotationConfig {
   private final boolean jakartaValidationAnnotations;
   private final boolean jacksonAnnotations;
   private final boolean idGeneratorAutomatic;
-
+  private final boolean useValidationNotNull;
+  private final ReadValidationAnnotations javaxValidation;
+  private final ReadValidationAnnotations jakartaValidation;
   private final Set<Class<?>> metaAnnotations = new HashSet<>();
 
   ReadAnnotationConfig(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, DatabaseConfig config) {
@@ -34,21 +38,32 @@ class ReadAnnotationConfig {
     this.disableL2Cache = config.isDisableL2Cache();
     this.eagerFetchLobs = config.isEagerFetchLobs();
     this.idGeneratorAutomatic = config.isIdGeneratorAutomatic();
-    this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
-    this.jakartaValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJakartaValidationAnnotationsPresent();
-    this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
+    this.useValidationNotNull = config.isUseValidationNotNull();
+    ClassLoadConfig classLoadConfig = generatedPropFactory.getClassLoadConfig();
+    this.javaxValidationAnnotations = classLoadConfig.isJavaxValidationAnnotationsPresent();
+    this.jakartaValidationAnnotations = classLoadConfig.isJakartaValidationAnnotationsPresent();
+    this.jacksonAnnotations = classLoadConfig.isJacksonAnnotationsPresent();
     this.metaAnnotations.add(Column.class);
     this.metaAnnotations.add(Formula.class);
     this.metaAnnotations.add(Formula.List.class);
     this.metaAnnotations.add(Where.class);
     this.metaAnnotations.add(Where.List.class);
     this.metaAnnotations.add(Aggregation.class);
+    this.javaxValidation = javaxValidationAnnotations ? new ReadValidationAnnotationsJavax(this) : null;
+    this.jakartaValidation = jakartaValidationAnnotations ? new ReadValidationAnnotationsJakarta(this) : null;
+    if (jacksonAnnotations) {
+      InitMetaJacksonAnnotation.init(this);
+    }
   }
 
-  public void addMetaAnnotation(Class<?> annotation) {
+  void addMetaAnnotation(Class<?> annotation) {
     metaAnnotations.add(annotation);
   }
 
+  boolean checkValidationAnnotations() {
+    return javaxValidationAnnotations || jakartaValidationAnnotations;
+  }
+
   GeneratedPropertyFactory getGeneratedPropFactory() {
     return generatedPropFactory;
   }
@@ -73,14 +88,6 @@ class ReadAnnotationConfig {
     return idGeneratorAutomatic;
   }
 
-  boolean isJavaxValidationAnnotations() {
-    return javaxValidationAnnotations;
-  }
-
-  boolean isJakartaValidationAnnotations() {
-    return jakartaValidationAnnotations;
-  }
-
   boolean isJacksonAnnotations() {
     return jacksonAnnotations;
   }
@@ -88,4 +95,35 @@ class ReadAnnotationConfig {
   public Set<Class<?>> getMetaAnnotations() {
     return metaAnnotations;
   }
+
+  /**
+   * Return true if a NotNull validation annotation is on the property.
+   */
+  boolean isValidationNotNull(DeployBeanProperty property) {
+    if (!useValidationNotNull) {
+      return false;
+    }
+    if (javaxValidation != null && javaxValidation.isValidationNotNull(property)) {
+      return true;
+    }
+    if (jakartaValidation != null && jakartaValidation.isValidationNotNull(property)) {
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Return the max size of all validation @Size annotations.
+   */
+  int maxValidationSize(DeployBeanProperty prop) {
+    int maxSize = 0;
+    if (javaxValidation != null) {
+      maxSize = Math.max(maxSize, javaxValidation.maxSize(prop));
+    }
+    if (jakartaValidation != null) {
+      maxSize = Math.max(maxSize, jakartaValidation.maxSize(prop));
+    }
+    return maxSize;
+  }
+
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
index 796a975aa..da2bc6030 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
@@ -14,15 +14,6 @@ public class ReadAnnotations {
 
   public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, DatabaseConfig config) {
     this.readConfig = new ReadAnnotationConfig(generatedPropFactory, asOfViewSuffix, versionsBetweenSuffix, config);
-    if (readConfig.isJavaxValidationAnnotations()) {
-      InitMetaJavaxValidationAnnotation.init(readConfig);
-    }
-    if (readConfig.isJakartaValidationAnnotations()) {
-      InitMetaJakartaValidationAnnotation.init(readConfig);
-    }
-    if (readConfig.isJacksonAnnotations()) {
-      InitMetaJacksonAnnotation.init(readConfig);
-    }
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotations.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotations.java
new file mode 100644
index 000000000..a2c0b8890
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotations.java
@@ -0,0 +1,19 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+/**
+ * Reads validation NotNull and Size annotations for mapping.
+ */
+interface ReadValidationAnnotations {
+
+  /**
+   * Return true if the property has a NotNull validation annotation.
+   */
+  boolean isValidationNotNull(DeployBeanProperty property);
+
+  /**
+   * Return the max value of the Size validation annotations on the property.
+   */
+  int maxSize(DeployBeanProperty property);
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java
new file mode 100644
index 000000000..016e9f13a
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java
@@ -0,0 +1,51 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import io.ebean.util.AnnotationUtil;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.groups.Default;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Jakarta validation annotations reader.
+ */
+class ReadValidationAnnotationsJakarta implements ReadValidationAnnotations {
+
+  ReadValidationAnnotationsJakarta(ReadAnnotationConfig readConfig) {
+    readConfig.addMetaAnnotation(Size.class);
+    readConfig.addMetaAnnotation(Size.List.class);
+  }
+
+  @Override
+  public boolean isValidationNotNull(DeployBeanProperty property) {
+    NotNull notNull = AnnotationUtil.get(property.getField(), NotNull.class);
+    return (notNull != null && isEbeanValidationGroups(notNull.groups()));
+  }
+
+  private boolean isEbeanValidationGroups(Class<?>[] groups) {
+    return groups.length == 0 || groups.length == 1 && Default.class.isAssignableFrom(groups[0]);
+  }
+
+  @Override
+  public int maxSize(DeployBeanProperty property) {
+    int maxSize = 0;
+    for (Size size : getMetaAnnotationJavaxSize(property)) {
+      if (size.max() < Integer.MAX_VALUE) {
+        maxSize = Math.max(maxSize, size.max());
+      }
+    }
+    return maxSize;
+  }
+
+  private List<Size> getMetaAnnotationJavaxSize(DeployBeanProperty prop) {
+    final List<Size> size = prop.getMetaAnnotations(Size.class);
+    final List<Size.List> lists = prop.getMetaAnnotations(Size.List.class);
+    for (Size.List list : lists) {
+      Collections.addAll(size, list.value());
+    }
+    return size;
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java
new file mode 100644
index 000000000..a690e69de
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java
@@ -0,0 +1,52 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import io.ebean.util.AnnotationUtil;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import javax.validation.groups.Default;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Javax validation annotations reader.
+ */
+class ReadValidationAnnotationsJavax implements ReadValidationAnnotations {
+
+  ReadValidationAnnotationsJavax(ReadAnnotationConfig readConfig) {
+      readConfig.addMetaAnnotation(Size.class);
+      readConfig.addMetaAnnotation(Size.List.class);
+  }
+
+  @Override
+  public boolean isValidationNotNull(DeployBeanProperty property) {
+    NotNull notNull = AnnotationUtil.get(property.getField(), NotNull.class);
+    return (notNull != null && isEbeanValidationGroups(notNull.groups()));
+  }
+
+  private boolean isEbeanValidationGroups(Class<?>[] groups) {
+    return groups.length == 0 || groups.length == 1 && Default.class.isAssignableFrom(groups[0]);
+  }
+
+  @Override
+  public int maxSize(DeployBeanProperty prop) {
+    int maxSize = 0;
+    for (Size size : getMetaAnnotationJavaxSize(prop)) {
+      if (size.max() < Integer.MAX_VALUE) {
+        maxSize = Math.max(maxSize, size.max());
+      }
+    }
+    return maxSize;
+  }
+
+  private List<Size> getMetaAnnotationJavaxSize(DeployBeanProperty prop) {
+    final List<Size> size = prop.getMetaAnnotations(Size.class);
+    final List<Size.List> lists = prop.getMetaAnnotations(Size.List.class);
+    for (Size.List list : lists) {
+      Collections.addAll(size, list.value());
+    }
+    return size;
+  }
+
+}

From b7da2cbd97d0c80e6763433861852138cd990161 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Feb 2021 09:29:06 +1300
Subject: [PATCH 110/447] #2173 - ebean-test: Add assertContains -
 DbJson.of(entityBean).assertContains(...)

---
 ebean-test/pom.xml                            |  20 +--
 .../src/main/java/io/ebean/test/DbJson.java   | 101 ++++++++---
 .../src/main/java/io/ebean/test/IOUtils.java  |  12 ++
 .../src/main/java/io/ebean/test/Json.java     | 168 ++++++++++++++++++
 .../io/ebean/test/JsonAssertContains.java     | 118 ++++++++++++
 .../test/java/io/ebean/test/DbJsonTest.java   |  33 ++++
 .../io/ebean/test/JsonAssertContainsTest.java |  86 +++++++++
 .../src/test/java/io/ebean/test/JsonTest.java |  75 ++++++++
 .../test/java/org/test/BSimpleWithGen.java    |   7 +
 .../src/test/java/org/test/PlainBean.java     |  22 +++
 .../test/resources/bean/contains-minimal.json |   4 +
 .../resources/bean/contains-with-version.json |   5 +
 .../src/test/resources/bean/example-bean.json |   1 +
 .../src/test/resources/bean/example-list.json |   2 +
 .../resources/contains/check-null-actual.json |   9 +
 .../contains/check-null-expected.json         |   7 +
 .../resources/contains/check-type-actual.json |   3 +
 .../contains/check-type-expected.json         |   3 +
 .../contains/original-subset-modified.json    |  26 +++
 .../resources/contains/original-subset.json   |  15 ++
 .../src/test/resources/contains/original.json |  27 +++
 .../test/resources/example/plain-list.json    |  10 ++
 .../src/test/resources/example/plain.json     |   4 +
 23 files changed, 727 insertions(+), 31 deletions(-)
 create mode 100644 ebean-test/src/main/java/io/ebean/test/Json.java
 create mode 100644 ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
 create mode 100644 ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
 create mode 100644 ebean-test/src/test/java/io/ebean/test/JsonTest.java
 create mode 100644 ebean-test/src/test/java/org/test/PlainBean.java
 create mode 100644 ebean-test/src/test/resources/bean/contains-minimal.json
 create mode 100644 ebean-test/src/test/resources/bean/contains-with-version.json
 create mode 100644 ebean-test/src/test/resources/contains/check-null-actual.json
 create mode 100644 ebean-test/src/test/resources/contains/check-null-expected.json
 create mode 100644 ebean-test/src/test/resources/contains/check-type-actual.json
 create mode 100644 ebean-test/src/test/resources/contains/check-type-expected.json
 create mode 100644 ebean-test/src/test/resources/contains/original-subset-modified.json
 create mode 100644 ebean-test/src/test/resources/contains/original-subset.json
 create mode 100644 ebean-test/src/test/resources/contains/original.json
 create mode 100644 ebean-test/src/test/resources/example/plain-list.json
 create mode 100644 ebean-test/src/test/resources/example/plain.json

diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 92f4c590f..caef82218 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.7.1-SNAPSHOT</version>
   </parent>
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java8-oss</artifactId>-->
-<!--    <version>2.2</version>-->
-<!--  </parent>-->
-
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
-  </scm>
 
   <name>ebean test</name>
   <description>Testing support for Ebean</description>
@@ -60,6 +51,13 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <version>${jackson-databind.version}</version>
+      <optional>true</optional>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test-docker</artifactId>
diff --git a/ebean-test/src/main/java/io/ebean/test/DbJson.java b/ebean-test/src/main/java/io/ebean/test/DbJson.java
index 79de39099..3675063c1 100644
--- a/ebean-test/src/main/java/io/ebean/test/DbJson.java
+++ b/ebean-test/src/main/java/io/ebean/test/DbJson.java
@@ -2,34 +2,63 @@ package io.ebean.test;
 
 import io.ebean.DB;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Helper for testing to assert that the JSON form of an entity
- * or list of entities match a String / typically test resource.
+ * or list of entities is as expected.
+ * <p>
+ * Using assertContains() we can match the JSON form of an entity
+ * against a subset of JSON content. Typically the subset of JSON
+ * excludes generated properties like id, when created and
+ * when modified properties.
+ * </p>
+ *
+ * <h3>Assert contains</h3>
+ * <pre>{@code
+ *
+ *    DbJson.of(order)
+ *      .assertContains("/order-partial.json");
+ *
+ * }</pre>
+ *
+ *
+ * <h3>Assert content matches</h3>
+ * <p>
+ * Using assertContentMatches() we are doing an exact content match.
+ * We typically need to replace generated property values. This assert
+ * will start to fail if the model changes like adding a property to
+ * the entity so we should use it less widely due to the maintenance
+ * burden we have with it.
+ * </p>
  *
  * <pre>{@code
  *
- *    DbJson.of(timedEntries)
- *      .replace("id", "eventTime")
- *      .assertContentMatches("/assertJson/full-1-timed.json");
+ *    DbJson.of(order)
+ *      .replace("id", "whenCreated", "whenModified)
+ *      .assertContentMatches("/order-full.json");
  *
  * }</pre>
  */
 public class DbJson {
 
   /**
-   * Create a PrettyJson object that has the JSON form of the
-   * entity bean or beans.
+   * Create a PrettyJson object that has the JSON form of the entity bean or beans.
    *
+   * <h3>Assert contains</h3>
    * <pre>{@code
    *
-   *    DbJson.of(timedEntries)
-   *      .replace("id", "eventTime")
-   *      .assertContentMatches("/assertJson/full-1-timed.json");
+   *    DbJson.of(order)
+   *      .assertContains("/order-partial.json");
+   *
+   * }</pre>
+   *
+   * <h3>Assert content matches</h3>
+   * <pre>{@code
+   *
+   *    DbJson.of(order)
+   *      .replace("id", "whenCreated", "whenModified)
+   *      .assertContentMatches("/order-full.json");
    *
    * }</pre>
    */
@@ -41,12 +70,7 @@ public class DbJson {
    * Read the content for the given resource path.
    */
   public static String readResource(String resourcePath) {
-    InputStream is = DbJson.class.getResourceAsStream(resourcePath);
-    try {
-      return IOUtils.readUtf8(is).trim();
-    } catch (IOException e) {
-      throw new IllegalArgumentException(e);
-    }
+    return IOUtils.readResource(resourcePath);
   }
 
   /**
@@ -92,7 +116,7 @@ public class DbJson {
     }
 
     /**
-     * Assert the json matches the content at the given resource path.
+     * Assert the json exactly matches the content at the given resource path.
      *
      * <pre>{@code
      *
@@ -103,7 +127,44 @@ public class DbJson {
      * }</pre>
      */
     public void assertContentMatches(String resourcePath) {
-      assertThat(rawJson).isEqualTo(readResource(resourcePath));
+      assertThat(lineEnd(rawJson)).isEqualTo(lineEnd(readResource(resourcePath)));
+    }
+
+    /**
+     * Normalise line ending characters to just use new line.
+     */
+    private String lineEnd(String content) {
+      return content.replace("\r\n", "\n");
+    }
+
+    /**
+     * Assert the DB json contains the given json content.
+     * <p>
+     * With this "contains" check the DB Json can contain more content than what
+     * it is checked against. Typically the DB json can contain generated properties
+     * like id values, when created, when modified etc and we leave these out of the
+     * json content we are checking against.
+     * </p>
+     *
+     * @param json The subset json content that should be contained by the DB json.
+     */
+    public void assertContains(String json) {
+      Json.assertContains(rawJson, json);
+    }
+
+    /**
+     * Assert the DB Json contains the Json at the given resource path.
+     * <p>
+     * With this "contains" check the DB Json can contain more content than what
+     * it is checked against. Typically the DB json can contain generated properties
+     * like id values, when created, when modified etc and we leave these out of the
+     * json content we are checking against.
+     * </p>
+     *
+     * @param resourcePath The resource path of the JSON content we are checking against.
+     */
+    public void assertContainsResource(String resourcePath) {
+      assertContains(readResource(resourcePath));
     }
   }
 }
diff --git a/ebean-test/src/main/java/io/ebean/test/IOUtils.java b/ebean-test/src/main/java/io/ebean/test/IOUtils.java
index 79b706706..a9b98086b 100644
--- a/ebean-test/src/main/java/io/ebean/test/IOUtils.java
+++ b/ebean-test/src/main/java/io/ebean/test/IOUtils.java
@@ -11,6 +11,18 @@ import java.nio.charset.StandardCharsets;
  */
 class IOUtils {
 
+  /**
+   * Read the content for the given resource path.
+   */
+  static String readResource(String resourcePath) {
+    try {
+      InputStream is = IOUtils.class.getResourceAsStream(resourcePath);
+      return IOUtils.readUtf8(is).trim();
+    } catch (IOException e) {
+      throw new IllegalArgumentException("Error reading resource " + resourcePath, e);
+    }
+  }
+
   /**
    * Reads the entire contents of the specified input stream and return them as UTF-8 string.
    */
diff --git a/ebean-test/src/main/java/io/ebean/test/Json.java b/ebean-test/src/main/java/io/ebean/test/Json.java
new file mode 100644
index 000000000..7612757e3
--- /dev/null
+++ b/ebean-test/src/main/java/io/ebean/test/Json.java
@@ -0,0 +1,168 @@
+package io.ebean.test;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Helper to convert to and from json using Jackson object mapper and
+ * perform some useful asserts based on json content.
+ */
+public class Json {
+
+  /**
+   * For reading resource json content into a bean, list or jsonNode in a fluid style.
+   */
+  public static class Resource {
+    private final String resourcePath;
+
+    private Resource(String resourcePath) {
+      this.resourcePath = resourcePath;
+    }
+
+    /**
+     * Return as a plain bean.
+     */
+    <T> T asBean(Class<T> cls) {
+      return Json.read(cls, readResource(resourcePath));
+    }
+
+    /**
+     * Return as a list of beans.
+     */
+    <T> List<T> asList(Class<T> cls) {
+      return Json.readList(cls, readResource(resourcePath));
+    }
+
+    /**
+     * Return as a JsonNode.
+     */
+    JsonNode asNode() {
+      return Json.readNodeFromResource(resourcePath);
+    }
+  }
+
+  private static final ObjectMapper MAPPER = initMapper();
+
+  /**
+   * For fluid style reading resource json content and return as a
+   * bean, list of bean or JsonNode.
+   * <pre>{@code
+   *
+   *   PlainBean bean =
+   *     Json.resource("/example/plain-list.json").asBean(PlainBean.class);
+   *
+   *   List<PlainBean> list =
+   *     Json.resource("/example/plain-list.json").asList(PlainBean.class);
+   *
+   *   JsonNode jsonNode =
+   *     Json.resource("/example/plain-list.json").asJsonNode();
+   *
+   * }</pre>
+   *
+   * @param resourcePath The resource path where the json content is read from
+   * @return The resource to convert to a bean or jsonNode etc
+   */
+  public static Resource resource(String resourcePath) {
+    return new Resource(resourcePath);
+  }
+
+  /**
+   * Assert all the fields in the expectedJson are present in actualJson and values match.
+   */
+  public static void assertContains(String actualJson, String expectedJson) {
+    assertContains(readNode(actualJson), readNode(expectedJson));
+  }
+
+  /**
+   * Assert all the fields in the expectedJson are present in actualJson and values match.
+   */
+  public static void assertContains(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    JsonAssertContains.assertContains(actualJsonNode, expectedJsonNode);
+  }
+
+  /**
+   * Read the content for the given resource path.
+   */
+  public static String readResource(String resourcePath) {
+    return IOUtils.readResource(resourcePath);
+  }
+
+  /**
+   * Return a bean from json content of a resource path.
+   */
+  public static <T> T readFromResource(Class<T> type, String resourcePath) {
+    return read(type, readResource(resourcePath));
+  }
+
+  /**
+   * Return a typed object from json content.
+   */
+  public static <T> T read(Class<T> type, String json) {
+    try {
+      return MAPPER.readValue(json, type);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Return a list of a given type from json content.
+   */
+  public static <T> List<T> readList(Class<T> type, String json) {
+    final CollectionType collectionType = MAPPER.getTypeFactory().constructCollectionType(List.class, type);
+    try {
+      return MAPPER.readValue(json, collectionType);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Parse json into a generic JsonNode structure from resource.
+   */
+  public static JsonNode readNodeFromResource(String resourcePath) {
+    return readNode(IOUtils.readResource(resourcePath));
+  }
+
+  /**
+   * Parse json into a generic JsonNode structure.
+   */
+  public static JsonNode readNode(String json) {
+    try {
+      return MAPPER.readTree(json);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Serialize object to string
+   */
+  public static String toJsonString(Object bean) {
+    try {
+      return MAPPER.writeValueAsString(bean);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private static ObjectMapper initMapper() {
+    return new ObjectMapper()
+      .registerModule(new JavaTimeModule())
+      .configure(SerializationFeature.INDENT_OUTPUT, true)
+      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+      .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+      .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+      .configure(SerializationFeature.INDENT_OUTPUT, true)
+      .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+  }
+
+}
diff --git a/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java b/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
new file mode 100644
index 000000000..25e1e065a
--- /dev/null
+++ b/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
@@ -0,0 +1,118 @@
+package io.ebean.test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.assertj.core.api.Assertions;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Stack;
+
+/**
+ * Perform traversal of JsonNodes comparing against an expected JsonNode that
+ * typically contains a subset of the data (typically excludes any generated properties
+ * like when modified timestamps etc).
+ */
+class JsonAssertContains {
+
+  private final Stack<String> path = new Stack<>();
+  private final LinkedList<String> errors = new LinkedList<>();
+
+  static void assertContains(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    new JsonAssertContains().contains(actualJsonNode, expectedJsonNode);
+  }
+
+  private void contains(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    checkRecursive(null, actualJsonNode, expectedJsonNode);
+    if (!errors.isEmpty()) {
+      String errorsString = String.join("\n", errors);
+      errorsString += "\nExpected JSON fields: " + expectedJsonNode;
+      errorsString += "\nActual JSON: " + actualJsonNode;
+      Assertions.fail(errorsString);
+    }
+  }
+
+  private void checkRecursive(String name, JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    if (name != null) {
+      path.push(name);
+    }
+    if (checkNull(actualJsonNode, expectedJsonNode)) {
+      if (checkType(actualJsonNode, expectedJsonNode)) {
+        if (checkArray(actualJsonNode, expectedJsonNode)) {
+          if (checkObject(actualJsonNode, expectedJsonNode)) {
+            checkValue(actualJsonNode, expectedJsonNode);
+          }
+        }
+      }
+    }
+    if (name != null) {
+      path.pop();
+    }
+  }
+
+  private boolean checkNull(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    if (actualJsonNode == null) {
+      errors.add(String.format("Expected field '%s' to be '%s' but was null", path(), expectedJsonNode));
+      return false;
+    }
+    return true;
+  }
+
+  private boolean checkType(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    if (!expectedJsonNode.getNodeType().equals(actualJsonNode.getNodeType())) {
+      errors.add(String.format("Expected field '%s' to be of type '%s' but was '%s'", path(), expectedJsonNode.getNodeType(), actualJsonNode.getNodeType()));
+      return false;
+    }
+    return true;
+  }
+
+  private boolean checkArray(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    if (!expectedJsonNode.isArray()) {
+      return true;
+    }
+    for (int i = 0; i < expectedJsonNode.size(); i++) {
+      checkRecursive("[" + i + "]", actualJsonNode.get(i), expectedJsonNode.get(i));
+    }
+    // do not continue (object or scalar type check)
+    return false;
+  }
+
+  private boolean checkObject(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    if (!expectedJsonNode.isObject()) {
+      return true;
+    }
+    Iterator<Map.Entry<String, JsonNode>> expectedFields = expectedJsonNode.fields();
+    while (expectedFields.hasNext()) {
+      Map.Entry<String, JsonNode> expectedField = expectedFields.next();
+      String expectedKey = expectedField.getKey();
+      JsonNode actualNode = actualJsonNode.get(expectedKey);
+      if (actualNode == null) {
+        errors.add(String.format("Expected field '%s' to be present", path(expectedKey)));
+      } else {
+        checkRecursive(expectedKey, actualNode, expectedField.getValue());
+      }
+    }
+    // do not continue (scalar type check)
+    return false;
+  }
+
+  private void checkValue(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    if (!expectedJsonNode.equals(actualJsonNode)) {
+      errors.add(String.format("Expected field '%s' to be equal to '%s' but was '%s'", path(), expectedJsonNode, actualJsonNode));
+    }
+  }
+
+  String path(String expectedKey) {
+    if (path.isEmpty()) {
+      return expectedKey;
+    }
+    return path() + "." + expectedKey;
+  }
+
+  String path() {
+    if (path.isEmpty()) {
+      return "";
+    }
+    return String.join(".", path).replace(".[", "[");
+  }
+}
diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java
index dc841c88f..365c019cd 100644
--- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java
+++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java
@@ -1,11 +1,13 @@
 package io.ebean.test;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.ebean.DB;
 import org.junit.Test;
 import org.test.BSimpleWithGen;
 
 import java.util.List;
 
+import static io.ebean.test.DbJson.readResource;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
@@ -36,6 +38,37 @@ public class DbJsonTest {
       //.withPlaceholder("_")
       .replace("id", "whenModified")
       .assertContentMatches("/bean/example-list.json");
+  }
 
+  @Test
+  public void assertContains_pass() {
+
+    BSimpleWithGen bean = new BSimpleWithGen("something-contains-me", "YeahNah");
+    DB.save(bean);
+
+    BSimpleWithGen found = DB.find(BSimpleWithGen.class, bean.getId());
+
+    DbJson.of(found).assertContainsResource("/bean/contains-minimal.json");
+    DbJson.of(found).assertContains(readResource("/bean/contains-with-version.json"));
+
+    DB.delete(bean);
+  }
+
+  @Test
+  public void asJson() {
+
+    BSimpleWithGen bean = new BSimpleWithGen("other");
+    DB.save(bean);
+
+    String asJson = DbJson.of(bean)
+      .withPlaceholder("\"*Replaced*\"")
+      .replace("id")
+      .asJson();
+
+    JsonNode node = Json.readNode(asJson);
+    assertThat(node.get("id").asText()).isEqualTo("*Replaced*");
+    assertThat(node.get("name").asText()).isEqualTo("other");
+
+    DB.delete(bean);
   }
 }
diff --git a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
new file mode 100644
index 000000000..2c25776f9
--- /dev/null
+++ b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
@@ -0,0 +1,86 @@
+package io.ebean.test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.Test;
+
+import java.util.stream.Stream;
+
+import static io.ebean.test.Json.readNodeFromResource;
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class JsonAssertContainsTest {
+
+  @Test
+  public void assertContains_itself() {
+    JsonNode original = readNodeFromResource("/contains/original.json");
+    JsonAssertContains.assertContains(original, original);
+  }
+
+  @Test
+  public void assertContains_subset() {
+    JsonNode original = readNodeFromResource("/contains/original.json");
+    JsonNode expected = readNodeFromResource("/contains/original-subset.json");
+    JsonAssertContains.assertContains(original, expected);
+  }
+
+
+  @Test
+  public void testContainsFails() {
+    JsonNode original = readNodeFromResource("/contains/original.json");
+    JsonNode expected = readNodeFromResource("/contains/original-subset-modified.json");
+    try {
+      JsonAssertContains.assertContains(original, expected);
+    } catch (AssertionError e) {
+      String exceptionMessage = e.getMessage();
+      Stream.of("Expected field 'someString1' to be equal to '\"aaaa\"' but was '\"string1\"",
+        "Expected field 'someValue1' to be equal to '99' but was '1'",
+        "Expected field 'someArray1[0]' to be of type 'STRING' but was 'NUMBER",
+        "Expected field 'someArray2[0].value1' to be of type 'ARRAY' but was 'NUMBER'",
+        "Expected field 'someArray2[0].value2' to be of type 'OBJECT' but was 'STRING'",
+        "Expected field 'someArray2[0].array1[0]' to be '\"1\"' but was null",
+        "Expected field 'someArray2[0].object1.val5' to be present",
+        "Expected field 'someArray2[0].object1.val6' to be present",
+        "Expected field 'someArray2[0].object2' to be of type 'NULL' but was 'OBJECT'",
+        "Expected field 'someArray2[0].objectNull' to be of type 'OBJECT' but was 'NULL'")
+        .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+    }
+  }
+
+
+  @Test
+  public void assertContains_checkNull() {
+    JsonNode original = readNodeFromResource("/contains/check-null-actual.json");
+    JsonNode expected = readNodeFromResource("/contains/check-null-expected.json");
+    try {
+      JsonAssertContains.assertContains(original, expected);
+    } catch (AssertionError e) {
+      String exceptionMessage = e.getMessage();
+      Stream.of("Expected field 'someNull' to be of type 'NULL' but was 'STRING'",
+        "Expected field 'extra' to be present")
+        .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+    }
+  }
+
+  @Test
+  public void assertContains_checkType() {
+    JsonNode original = readNodeFromResource("/contains/check-type-actual.json");
+    JsonNode expected = readNodeFromResource("/contains/check-type-expected.json");
+    try {
+      JsonAssertContains.assertContains(original, expected);
+    } catch (AssertionError e) {
+      String exceptionMessage = e.getMessage();
+      Stream.of("Expected field 'some' to be of type 'NUMBER' but was 'STRING'")
+        .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+    }
+  }
+
+  @Test
+  public void path_when_empty() {
+    JsonAssertContains contains = new JsonAssertContains();
+
+    assertThat(contains.path()).isEqualTo("");
+    assertThat(contains.path("a")).isEqualTo("a");
+    assertThat(contains.path("b")).isEqualTo("b");
+  }
+}
diff --git a/ebean-test/src/test/java/io/ebean/test/JsonTest.java b/ebean-test/src/test/java/io/ebean/test/JsonTest.java
new file mode 100644
index 000000000..baf7a1563
--- /dev/null
+++ b/ebean-test/src/test/java/io/ebean/test/JsonTest.java
@@ -0,0 +1,75 @@
+package io.ebean.test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.Test;
+import org.test.PlainBean;
+
+import java.util.List;
+
+import static io.ebean.test.Json.readNodeFromResource;
+import static io.ebean.test.Json.readResource;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JsonTest {
+
+  @Test
+  public void assertContains_subset() {
+    JsonNode original = readNodeFromResource("/contains/original.json");
+    JsonNode expected = readNodeFromResource("/contains/original-subset.json");
+    Json.assertContains(original, expected);
+  }
+
+  @Test
+  public void readNode() {
+    JsonNode original = Json.readNode(readResource("/contains/original.json"));
+    Json.assertContains(original, original);
+  }
+
+  @Test
+  public void resource_asNode() {
+    JsonNode original = Json.resource("/contains/original.json").asNode();
+    JsonNode nonFluid = Json.readNode(readResource("/contains/original.json"));
+    assertThat(original).isEqualTo(nonFluid);
+  }
+
+  @Test
+  public void readBean_resource_asBean() {
+    // traditional style from resource
+    PlainBean bean1 = Json.readFromResource(PlainBean.class, "/example/plain.json");
+    assertThat(bean1.id).isEqualTo(42);
+    assertThat(bean1.name).isEqualTo("foo");
+
+    // traditional style given json content
+    PlainBean bean2 = Json.read(PlainBean.class, readResource("/example/plain.json"));
+    assertThat(bean2.id).isEqualTo(42);
+    assertThat(bean2.name).isEqualTo("foo");
+
+    // fluid style - resource asBean()
+    PlainBean bean3 = Json.resource("/example/plain.json").asBean(PlainBean.class);
+    assertThat(bean3.id).isEqualTo(42);
+    assertThat(bean3.name).isEqualTo("foo");
+  }
+
+  @Test
+  public void readList() {
+    List<PlainBean> list = Json.readList(PlainBean.class, readResource("/example/plain-list.json"));
+
+    String asJson = Json.toJsonString(list);
+    assertThat(list).hasSize(2);
+    assertThat(list.get(0).name).isEqualTo("foo");
+    assertThat(list.get(1).name).isEqualTo("bar");
+
+    assertThat(asJson).contains("\"name\" : \"foo\"");
+  }
+
+  @Test
+  public void resourceAsList() {
+    // fluid style - resource asList()
+    List<PlainBean> list = Json.resource("/example/plain-list.json").asList(PlainBean.class);
+
+    // traditional style
+    List<PlainBean> list2 = Json.readList(PlainBean.class, readResource("/example/plain-list.json"));
+    assertThat(list).isEqualTo(list2);
+  }
+
+}
diff --git a/ebean-test/src/test/java/org/test/BSimpleWithGen.java b/ebean-test/src/test/java/org/test/BSimpleWithGen.java
index cf3c7f2f6..5ee189229 100644
--- a/ebean-test/src/test/java/org/test/BSimpleWithGen.java
+++ b/ebean-test/src/test/java/org/test/BSimpleWithGen.java
@@ -18,6 +18,8 @@ public class BSimpleWithGen {
 
   private String name;
 
+  private String other;
+
   @Transient
   private Map<String, List<String>> someMap;
 
@@ -31,6 +33,11 @@ public class BSimpleWithGen {
     this.name = name;
   }
 
+  public BSimpleWithGen(String name, String other) {
+    this.name = name;
+    this.other = other;
+  }
+
   public Integer getId() {
     return id;
   }
diff --git a/ebean-test/src/test/java/org/test/PlainBean.java b/ebean-test/src/test/java/org/test/PlainBean.java
new file mode 100644
index 000000000..103e67425
--- /dev/null
+++ b/ebean-test/src/test/java/org/test/PlainBean.java
@@ -0,0 +1,22 @@
+package org.test;
+
+import java.util.Objects;
+
+public class PlainBean {
+
+  public int id;
+  public String name;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    PlainBean plainBean = (PlainBean) o;
+    return id == plainBean.id && name.equals(plainBean.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+}
diff --git a/ebean-test/src/test/resources/bean/contains-minimal.json b/ebean-test/src/test/resources/bean/contains-minimal.json
new file mode 100644
index 000000000..564060eec
--- /dev/null
+++ b/ebean-test/src/test/resources/bean/contains-minimal.json
@@ -0,0 +1,4 @@
+{
+  "name": "something-contains-me",
+  "version": 1
+}
diff --git a/ebean-test/src/test/resources/bean/contains-with-version.json b/ebean-test/src/test/resources/bean/contains-with-version.json
new file mode 100644
index 000000000..894b0bf14
--- /dev/null
+++ b/ebean-test/src/test/resources/bean/contains-with-version.json
@@ -0,0 +1,5 @@
+{
+  "name": "something-contains-me",
+  "other": "YeahNah",
+  "version": 1
+}
diff --git a/ebean-test/src/test/resources/bean/example-bean.json b/ebean-test/src/test/resources/bean/example-bean.json
index 593babff3..e9a935767 100644
--- a/ebean-test/src/test/resources/bean/example-bean.json
+++ b/ebean-test/src/test/resources/bean/example-bean.json
@@ -1,6 +1,7 @@
 {
   "id": _,
   "name": "something",
+  "other": null,
   "whenModified": _,
   "version": 1
 }
diff --git a/ebean-test/src/test/resources/bean/example-list.json b/ebean-test/src/test/resources/bean/example-list.json
index 21264b0a7..8c7b8b681 100644
--- a/ebean-test/src/test/resources/bean/example-list.json
+++ b/ebean-test/src/test/resources/bean/example-list.json
@@ -1,11 +1,13 @@
 [ {
   "id": "*",
   "name": "something",
+  "other": null,
   "whenModified": "*",
   "version": 1
 }, {
   "id": "*",
   "name": "other",
+  "other": null,
   "whenModified": "*",
   "version": 1
 } ]
diff --git a/ebean-test/src/test/resources/contains/check-null-actual.json b/ebean-test/src/test/resources/contains/check-null-actual.json
new file mode 100644
index 000000000..992d2aef4
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/check-null-actual.json
@@ -0,0 +1,9 @@
+{
+  "some": "val",
+  "someNull": "actualNotNull",
+  "matchNull": null,
+  "nullObject": {
+    "id": 42
+  }
+
+}
diff --git a/ebean-test/src/test/resources/contains/check-null-expected.json b/ebean-test/src/test/resources/contains/check-null-expected.json
new file mode 100644
index 000000000..ce4163032
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/check-null-expected.json
@@ -0,0 +1,7 @@
+{
+  "some": "val",
+  "someNull": null,
+  "extra": "notThere",
+  "matchNull": null,
+  "nullObject": null
+}
diff --git a/ebean-test/src/test/resources/contains/check-type-actual.json b/ebean-test/src/test/resources/contains/check-type-actual.json
new file mode 100644
index 000000000..6b240843c
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/check-type-actual.json
@@ -0,0 +1,3 @@
+{
+  "some": "val"
+}
diff --git a/ebean-test/src/test/resources/contains/check-type-expected.json b/ebean-test/src/test/resources/contains/check-type-expected.json
new file mode 100644
index 000000000..5b0cf6957
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/check-type-expected.json
@@ -0,0 +1,3 @@
+{
+  "some": 42
+}
diff --git a/ebean-test/src/test/resources/contains/original-subset-modified.json b/ebean-test/src/test/resources/contains/original-subset-modified.json
new file mode 100644
index 000000000..107d557d2
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/original-subset-modified.json
@@ -0,0 +1,26 @@
+{
+  "someString1": "aaaa",
+  "someString2": "string2",
+  "someValue1": 99,
+  "someValue2": 2,
+  "someArray1": [
+    "a"
+  ],
+  "someArray2": [
+    {
+      "value1": [],
+      "value2": {},
+      "array1": [
+        "1"
+      ],
+      "object1": {
+        "val5": "a",
+        "val6": 1
+      },
+      "object2": null,
+      "objectNull": {
+        "val": []
+      }
+    }
+  ]
+}
diff --git a/ebean-test/src/test/resources/contains/original-subset.json b/ebean-test/src/test/resources/contains/original-subset.json
new file mode 100644
index 000000000..e5823e2a4
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/original-subset.json
@@ -0,0 +1,15 @@
+{
+  "someString1": "string1",
+  "someValue1": 1,
+  "someArray2": [
+    {
+      "value1": 11,
+      "array1": [],
+      "object2": {
+        "v1": "v1",
+        "v4": []
+      },
+      "objectNull": null
+    }
+  ]
+}
diff --git a/ebean-test/src/test/resources/contains/original.json b/ebean-test/src/test/resources/contains/original.json
new file mode 100644
index 000000000..063affac4
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/original.json
@@ -0,0 +1,27 @@
+{
+  "someString1": "string1",
+  "someString2": "string2",
+  "someValue1": 1,
+  "someValue2": 2,
+  "someArray1": [
+    1,
+    2,
+    3,
+    4
+  ],
+  "someArray2": [
+    {
+      "value1": 11,
+      "value2": "22",
+      "array1": [],
+      "object1": {},
+      "object2": {
+        "v1": "v1",
+        "v2": 1,
+        "v3": {},
+        "v4": []
+      },
+      "objectNull": null
+    }
+  ]
+}
diff --git a/ebean-test/src/test/resources/example/plain-list.json b/ebean-test/src/test/resources/example/plain-list.json
new file mode 100644
index 000000000..49bc4c34d
--- /dev/null
+++ b/ebean-test/src/test/resources/example/plain-list.json
@@ -0,0 +1,10 @@
+[
+  {
+    "id": 42,
+    "name": "foo"
+  },
+  {
+    "id": 55,
+    "name": "bar"
+  }
+]
diff --git a/ebean-test/src/test/resources/example/plain.json b/ebean-test/src/test/resources/example/plain.json
new file mode 100644
index 000000000..63632de85
--- /dev/null
+++ b/ebean-test/src/test/resources/example/plain.json
@@ -0,0 +1,4 @@
+{
+  "id": 42,
+  "name": "foo"
+}

From 99d7a4e4b4ac8d41accd08ccf380abd37111305a Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Feb 2021 09:43:56 +1300
Subject: [PATCH 111/447] Tidy up pom jackson dependency versions (all optional
 dependencies) and bump to 2.12.1

---
 ebean-api/pom.xml       | 9 ++-------
 ebean-core-type/pom.xml | 7 +------
 ebean-core/pom.xml      | 9 ++-------
 ebean-postgis/pom.xml   | 3 +--
 ebean-test/pom.xml      | 8 ++------
 pom.xml                 | 1 +
 6 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 80d8db37a..dc2bd347e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -11,11 +11,6 @@
   <description>ebean api</description>
   <artifactId>ebean-api</artifactId>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <dependencies>
 
     <!--
@@ -74,7 +69,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
@@ -82,7 +77,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 56aebbb2c..36e38b2da 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -11,11 +11,6 @@
   <name>ebean core type</name>
   <description>ebean scalar types api</description>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -27,7 +22,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index dcdad1b0e..e335e97c3 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -18,11 +18,6 @@
     <tag>ebean-parent-12.6.5</tag>
   </scm>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <profiles>
     <profile>
       <!-- Note: to use this profile, you need to download manually the db2jcc4 driver.
@@ -163,14 +158,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 0e6936d14..61271ef1f 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -15,7 +15,6 @@
 
   <properties>
     <postgis.jdbc.version>2.2.1</postgis.jdbc.version>
-    <jackson-core.version>2.11.3</jackson-core.version>
   </properties>
 
   <dependencies>
@@ -31,7 +30,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index caef82218..420986916 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -12,10 +12,6 @@
   <description>Testing support for Ebean</description>
   <artifactId>ebean-test</artifactId>
 
-  <properties>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -47,14 +43,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 88954f378..12b4d3540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
   <properties>
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
     <ebean-datasource.version>7.0</ebean-datasource.version>
+    <jackson.version>2.12.1</jackson.version>
   </properties>
 
   <dependencies>

From 6aa4337b27e3dd494b9903293819de097ab154a9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Feb 2021 22:42:48 +1300
Subject: [PATCH 112/447] #2174 - Entity beans with @Cache + @DbArray of enums
 (or UUID or Integer) not converted to enums (come back as String) (#2175)

---
 .../server/type/ArrayElementConverter.java    | 68 +++++++++++----
 .../type/ArrayElementConverterEnum.java       | 25 ------
 .../server/type/ScalarTypeArrayList.java      | 18 +++-
 .../server/type/ScalarTypeArraySet.java       | 18 +++-
 .../server/type/ScalarTypeArrayListTest.java  | 85 +++++++++++++++++-
 .../server/type/ScalarTypeArraySetH2Test.java | 86 +++++++++++++++++++
 .../org/tests/model/array/EArrayBean.java     |  2 +
 .../org/tests/model/array/EArraySetBean.java  | 13 +++
 .../tests/model/array/TestDbArray_asSet.java  | 32 +++++++
 .../tests/model/array/TestDbArray_basic.java  | 27 ++++++
 10 files changed, 327 insertions(+), 47 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
index 9db2bfad4..f2c2c1ee7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
@@ -10,9 +10,14 @@ import java.util.UUID;
 interface ArrayElementConverter<T> {
 
   /**
-   * Convert the array element to the logical type.
+   * Convert element it's json serialized form.
    */
-  T toElement(Object rawValue);
+  T fromSerialized(Object rawValue);
+
+  /**
+   * Convert the array element from it's DB array form.
+   */
+  T fromDbArray(Object rawValue);
 
   default Object[] toDbArray(Object[] objects) {
     return objects;
@@ -46,7 +51,12 @@ interface ArrayElementConverter<T> {
   class LongConverter implements ArrayElementConverter<Long> {
 
     @Override
-    public Long toElement(Object rawValue) {
+    public Long fromSerialized(Object rawValue) {
+      return fromDbArray(rawValue);
+    }
+
+    @Override
+    public Long fromDbArray(Object rawValue) {
       if (rawValue instanceof Long) {
         return (Long) rawValue;
       } else {
@@ -58,7 +68,12 @@ interface ArrayElementConverter<T> {
   class IntegerConverter implements ArrayElementConverter<Integer> {
 
     @Override
-    public Integer toElement(Object rawValue) {
+    public Integer fromSerialized(Object rawValue) {
+      return ((Number) rawValue).intValue();
+    }
+
+    @Override
+    public Integer fromDbArray(Object rawValue) {
       if (rawValue instanceof Integer) {
         return (Integer) rawValue;
       } else {
@@ -70,7 +85,12 @@ interface ArrayElementConverter<T> {
   class DoubleConverter implements ArrayElementConverter<Double> {
 
     @Override
-    public Double toElement(Object rawValue) {
+    public Double fromSerialized(Object rawValue) {
+      return fromDbArray(rawValue);
+    }
+
+    @Override
+    public Double fromDbArray(Object rawValue) {
       if (rawValue instanceof Double) {
         return (Double) rawValue;
       } else {
@@ -82,21 +102,34 @@ interface ArrayElementConverter<T> {
   /**
    * String converter (noop based).
    */
-  class StringConverter extends NoopConverter<String> {
+  class StringConverter implements ArrayElementConverter<String> {
+
+    public String fromDbArray(Object rawValue) {
+      return (String) rawValue;
+    }
+
+    @Override
+    public String fromSerialized(Object rawValue) {
+      return (String) rawValue;
+    }
   }
 
   /**
-   * UUID converter (noop based).
+   * UUID converter.
    */
-  class UuidConverter extends NoopConverter<UUID> {
-  }
+  class UuidConverter implements ArrayElementConverter<UUID> {
 
-  class NoopConverter<T> implements ArrayElementConverter<T> {
-
-    @SuppressWarnings("unchecked")
     @Override
-    public T toElement(Object rawValue) {
-      return (T) rawValue;
+    public java.util.UUID fromSerialized(Object rawValue) {
+      return java.util.UUID.fromString((String)rawValue);
+    }
+
+    @Override
+    public java.util.UUID fromDbArray(Object rawValue) {
+      if (rawValue instanceof UUID) {
+        return (java.util.UUID) rawValue;
+      }
+      return java.util.UUID.fromString(rawValue.toString());
     }
   }
 
@@ -113,7 +146,12 @@ interface ArrayElementConverter<T> {
     }
 
     @Override
-    public Object toElement(Object rawValue) {
+    public Object fromSerialized(Object rawValue) {
+      return scalarType.parse((String) rawValue);
+    }
+
+    @Override
+    public Object fromDbArray(Object rawValue) {
       return scalarType.toBeanType(rawValue);
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java
deleted file mode 100644
index e7bfe5606..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import io.ebean.core.type.ScalarType;
-
-public class ArrayElementConverterEnum implements ArrayElementConverter<String> {
-
-  final ScalarType<?> scalarType;
-
-  final Class<? extends Enum<?>> valueType1;
-
-  public ArrayElementConverterEnum(ScalarType<?> scalarType, Class<? extends Enum<?>> valueType1) {
-    this.scalarType = scalarType;
-    this.valueType1 = valueType1;
-  }
-
-  @Override
-  public String toElement(Object rawValue) {
-    // FIXME: Don't understand for what is this.
-    Enum<?>[] enumConstants = valueType1.getEnumConstants();
-    if (scalarType == null) {
-      return rawValue.toString();
-    }
-    return scalarType.format(rawValue);
-  }
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index 736cd94eb..6ee64d5cf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -105,7 +105,7 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
       if (element == null) {
         list.add(null);
       } else {
-        list.add(converter.toElement(element));
+        list.add(converter.fromDbArray(element));
       }
     }
     return new ModifyAwareList(list);
@@ -145,15 +145,27 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
   @Override
   public List parse(String value) {
     try {
-      return EJson.parseList(value, false);
+      return convert(EJson.parseList(value, false));
     } catch (IOException e) {
       throw new TextException("Failed to parse JSON [{}] as List", value, e);
     }
   }
 
+  /**
+   * Convert from the json types to the proper scalar types (uuid, enum, double etc)
+   */
+  @SuppressWarnings("rawtypes")
+  private List convert(List<Object> rawList) {
+    List list = new ArrayList(rawList.size());
+    for (Object rawVal : rawList) {
+      list.add(converter.fromSerialized(rawVal));
+    }
+    return new ModifyAwareList(list);
+  }
+
   @Override
   public List jsonRead(JsonParser parser) throws IOException {
-    return EJson.parseList(parser, parser.getCurrentToken());
+    return convert(EJson.parseList(parser, parser.getCurrentToken()));
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index fd0b7dd41..90f592428 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -17,6 +17,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -101,7 +102,7 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
   protected Set fromArray(Object[] array1) {
     Set set = new LinkedHashSet();
     for (Object element : array1) {
-      set.add(converter.toElement(element));
+      set.add(converter.fromDbArray(element));
     }
     return new ModifyAwareSet(set);
   }
@@ -140,15 +141,26 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
   @Override
   public Set parse(String value) {
     try {
-      return EJson.parseSet(value, false);
+      return convert(EJson.parseList(value, false));
     } catch (IOException e) {
       throw new TextException("Failed to parse JSON [{}] as Set", value, e);
     }
   }
 
+  /**
+   * Convert from the json types to the proper scalar types (uuid, enum, double etc)
+   */
+  private Set convert(List<Object> rawList) {
+    Set asSet = new LinkedHashSet();
+    for (Object rawVal : rawList) {
+        asSet.add(converter.fromSerialized(rawVal));
+    }
+    return new ModifyAwareSet(asSet);
+  }
+
   @Override
   public Set jsonRead(JsonParser parser) throws IOException {
-    return EJson.parseSet(parser, parser.getCurrentToken());
+    return convert(EJson.parseList(parser, parser.getCurrentToken()));
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java
index 5e9a99645..13496e407 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java
@@ -1,13 +1,18 @@
 package io.ebeaninternal.server.type;
 
 
+import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.DB;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
+import io.ebean.text.json.EJson;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import java.io.IOException;
+import java.io.StringReader;
 import java.sql.SQLException;
-import java.util.UUID;
+import java.util.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -63,4 +68,82 @@ public class ScalarTypeArrayListTest extends BasePlatformArrayTypeFactoryTest {
     assertBindNullTo_Null(factory.typeFor(UUID.class, true));
   }
 
+  @Test
+  @SuppressWarnings("unchecked")
+  public void parse_withUuidType_expect_uuidTypeReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(UUID.class, true);
+
+    List<UUID> input = new ArrayList<>();
+    input.add(UUID.randomUUID());
+    input.add(UUID.randomUUID());
+
+    String formatToJson = scalarType.format(input);
+
+    Object parsed = scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void parse_withIntegerType_expect_longIntegerReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(Integer.class, true);
+
+    List<Integer> input = new ArrayList<>();
+    input.add(2);
+    input.add(4);
+
+    String formatToJson = scalarType.format(input);
+
+    Object parsed = scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void parse_withLongType_expect_longTypeReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(Long.class, true);
+
+    List<Long> input = new ArrayList<>();
+    input.add(2L);
+    input.add(4L);
+
+    String formatToJson = scalarType.format(input);
+
+    Object parsed = scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  public void parse_withDoubleType_expect_longTypeReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(Double.class, true);
+
+    List<Double> input = new ArrayList<>();
+    input.add(2D);
+    input.add(4D);
+
+    String formatToJson = scalarType.format(input);
+
+    Object parsed = scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  public void jsonRead_withUuidType() throws IOException {
+
+    ScalarType<?> scalarType = factory.typeFor(UUID.class, true);
+
+    List<UUID> input = new ArrayList<>();
+    input.add(UUID.randomUUID());
+    input.add(UUID.randomUUID());
+    String asJson = EJson.write(input);
+
+    JsonParser parser = DB.json().createParser(new StringReader(asJson));
+
+    Object parsed = scalarType.jsonRead(parser);
+    assertThat(parsed).isEqualTo(input);
+  }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java
index 0e2e14fa9..ece3a122b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java
@@ -1,8 +1,16 @@
 package io.ebeaninternal.server.type;
 
+import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.DB;
+import io.ebean.core.type.ScalarType;
+import io.ebean.text.json.EJson;
 import org.junit.Test;
 
+import java.io.IOException;
+import java.io.StringReader;
 import java.sql.SQLException;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -49,4 +57,82 @@ public class ScalarTypeArraySetH2Test extends BasePlatformArrayTypeFactoryTest {
     assertBindNullTo_Null(factory.typeFor(UUID.class, true));
   }
 
+  @Test
+  @SuppressWarnings("unchecked")
+  public void parse_withUuidType_expect_uuidTypeReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(UUID.class, true);
+
+    Set<UUID> input = new LinkedHashSet<>();
+    input.add(UUID.randomUUID());
+    input.add(UUID.randomUUID());
+
+    String formatToJson = scalarType.format(input);
+
+    Set<UUID> parsed = (Set<UUID>)scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void parse_withIntegerType_expect_longIntegerReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(Integer.class, true);
+
+    Set<Integer> input = new LinkedHashSet<>();
+    input.add(2);
+    input.add(4);
+
+    String formatToJson = scalarType.format(input);
+
+    Set<Integer> parsed = (Set<Integer>)scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void parse_withLongType_expect_longTypeReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(Long.class, true);
+
+    Set<Long> input = new LinkedHashSet<>();
+    input.add(2L);
+    input.add(4L);
+
+    String formatToJson = scalarType.format(input);
+
+    Set<Long> parsed = (Set<Long>)scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  public void parse_withDoubleType_expect_longTypeReturned() {
+
+    ScalarType<?> scalarType = factory.typeFor(Double.class, true);
+
+    Set<Double> input = new LinkedHashSet<>();
+    input.add(2D);
+    input.add(4D);
+
+    String formatToJson = scalarType.format(input);
+
+    Object parsed = scalarType.parse(formatToJson);
+    assertThat(parsed).isEqualTo(input);
+  }
+
+  @Test
+  public void jsonRead_withUuidType() throws IOException {
+
+    ScalarType<?> scalarType = factory.typeFor(UUID.class, true);
+
+    Set<UUID> input = new LinkedHashSet<>();
+    input.add(UUID.randomUUID());
+    input.add(UUID.randomUUID());
+    String asJson = EJson.write(input);
+
+    JsonParser parser = DB.json().createParser(new StringReader(asJson));
+
+    Object parsed = scalarType.jsonRead(parser);
+    assertThat(parsed).isEqualTo(input);
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-core/src/test/java/org/tests/model/array/EArrayBean.java
index 956134f3c..dfe91a27b 100644
--- a/ebean-core/src/test/java/org/tests/model/array/EArrayBean.java
+++ b/ebean-core/src/test/java/org/tests/model/array/EArrayBean.java
@@ -1,6 +1,7 @@
 package org.tests.model.array;
 
 
+import io.ebean.annotation.Cache;
 import io.ebean.annotation.DbArray;
 import io.ebean.annotation.NotNull;
 
@@ -13,6 +14,7 @@ import java.util.Set;
 import java.util.UUID;
 
 @Entity
+@Cache
 public class EArrayBean {
 
   enum Status {
diff --git a/ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java b/ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java
index 585256a79..523fa3436 100644
--- a/ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java
+++ b/ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java
@@ -1,6 +1,7 @@
 package org.tests.model.array;
 
 
+import io.ebean.annotation.Cache;
 import io.ebean.annotation.DbArray;
 
 import javax.persistence.Entity;
@@ -11,6 +12,7 @@ import java.util.Set;
 import java.util.UUID;
 
 @Entity
+@Cache
 public class EArraySetBean {
 
   @Id
@@ -30,6 +32,9 @@ public class EArraySetBean {
   @DbArray
   Set<Double> doubs;
 
+  @DbArray
+  Set<EArrayBean.Status> status;
+
   @Version
   Long version;
 
@@ -81,6 +86,14 @@ public class EArraySetBean {
     this.doubs = doubs;
   }
 
+  public Set<EArrayBean.Status> getStatus() {
+    return status;
+  }
+
+  public void setStatus(Set<EArrayBean.Status> status) {
+    this.status = status;
+  }
+
   public Long getVersion() {
     return version;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
index 4a1cb7aec..36b917c36 100644
--- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
+++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
@@ -46,6 +46,11 @@ public class TestDbArray_asSet extends BaseTestCase {
     bean.getOtherIds().add(97L);
     bean.setDoubs(doubles);
 
+    Set<EArrayBean.Status> status = new LinkedHashSet<>();
+    status.add(EArrayBean.Status.ONE);
+    status.add(EArrayBean.Status.TWO);
+    bean.setStatus(status);
+
     Ebean.save(bean);
 
     found = Ebean.find(EArraySetBean.class, bean.getId());
@@ -154,4 +159,31 @@ public class TestDbArray_asSet extends BaseTestCase {
     Ebean.saveAll(all);
     Ebean.deleteAll(all);
   }
+
+  @Test
+  @IgnorePlatform(Platform.HANA)
+  public void hitCache() {
+
+    Set<UUID> uids = new LinkedHashSet<>();
+    uids.add(UUID.randomUUID());
+    uids.add(UUID.randomUUID());
+
+    Set<EArrayBean.Status> statuses = new LinkedHashSet<>();
+    statuses.add(EArrayBean.Status.ONE);
+    statuses.add(EArrayBean.Status.THREE);
+
+    EArraySetBean bean = new EArraySetBean();
+    bean.setName("hitCache");
+    bean.setUids(uids);
+    bean.setStatus(statuses);
+
+    Ebean.save(bean);
+    // load cache
+    Ebean.find(EArraySetBean.class, bean.getId());
+    // hit cache
+    EArraySetBean found = Ebean.find(EArraySetBean.class, bean.getId());
+
+    assertThat(found.getUids()).isEqualTo(uids);
+    assertThat(found.getStatus()).isEqualTo(statuses);
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
index 40a10e494..69796b6a3 100644
--- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -249,4 +249,31 @@ public class TestDbArray_basic extends BaseTestCase {
     assertThat(found.getIntEnums()).containsExactly(null, IntEnum.ZERO, null, IntEnum.TWO);
     Ebean.delete(bean);
   }
+
+  @Test
+  @IgnorePlatform(Platform.HANA)
+  public void hitCache() {
+
+    List<UUID> uids = new ArrayList<>();
+    uids.add(UUID.randomUUID());
+    uids.add(UUID.randomUUID());
+
+    List<EArrayBean.Status> statuses = new ArrayList<>();
+    statuses.add(EArrayBean.Status.ONE);
+    statuses.add(EArrayBean.Status.THREE);
+
+    EArrayBean bean = new EArrayBean();
+    bean.setName("hitCache");
+    bean.setUids(uids);
+    bean.setStatuses(statuses);
+
+    Ebean.save(bean);
+    // load cache
+    Ebean.find(EArrayBean.class, bean.getId());
+    // hit cache
+    EArrayBean found = Ebean.find(EArrayBean.class, bean.getId());
+
+    assertThat(found.getUids()).isEqualTo(uids);
+    assertThat(found.getStatuses()).isEqualTo(statuses);
+  }
 }

From bbf46bb0ece20989dc7690b81cdcdae247a6544e Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Fri, 19 Feb 2021 22:50:53 +1300
Subject: [PATCH 113/447] [maven-release-plugin] prepare release
 ebean-parent-12.7.1

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  9 ++++-----
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index dc2bd347e..188db1c49 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 7b0dabb3b..878f95090 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index c6219cfea..7e773ec45 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.7.1-SNAPSHOT</version>
+        <version>12.7.1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 36e38b2da..dbe59f45e 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index e335e97c3..48f2a741d 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.1</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 983902210..0662d9339 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 54bb5c7bb..416410762 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 98f90d1ac..310ae0299 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 61271ef1f..3e5346f2e 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 0bdeeb257..d105a5abc 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 98186aa7f..a1f4b6c04 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 420986916..ac9a323db 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -30,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 337b3deba..b0cad2be9 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 07993d49e..02d01a09f 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1-SNAPSHOT</version>
+      <version>12.7.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 12b4d3540..547bd731e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.7.1-SNAPSHOT</version>
+  <version>12.7.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 90140df71..64c2c4d91 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1-SNAPSHOT</version>
+    <version>12.7.1</version>
   </parent>
 
   <name>querybean generator</name>

From b77c62e0db470698a62b1e3335e62ea1959ac91a Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Fri, 19 Feb 2021 22:51:03 +1300
Subject: [PATCH 114/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 188db1c49..79962ff51 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 878f95090..b86469ddd 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.1</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 7e773ec45..c47601c85 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.7.1</version>
+        <version>12.7.2-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index dbe59f45e..f0db31343 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 48f2a741d..bab9e7624 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.1</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 0662d9339..90f3270e4 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 416410762..76e5ced23 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 310ae0299..620a1de73 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.1</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 3e5346f2e..d8acdb157 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index d105a5abc..52ab4f7c0 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index a1f4b6c04..cf4f83208 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index ac9a323db..32810609f 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index b0cad2be9..e1bf6282a 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 02d01a09f..8529dbe7f 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.1</version>
+      <version>12.7.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 547bd731e..6edda0cd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.7.1</version>
+  <version>12.7.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.1</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 64c2c4d91..9f5303d0f 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.1</version>
+    <version>12.7.2-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From d036af8d1a5b2ed3ccff01ea95c4c8bc8cbf0938 Mon Sep 17 00:00:00 2001
From: Ben Kempe <ben@vowel.ai>
Date: Sun, 28 Feb 2021 19:06:51 +0100
Subject: [PATCH 115/447] Add more assertions for nested one-to-many fetch

---
 .../tests/query/joins/TestQueryJoinManyNonRoot.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java
index 82eb65935..b5f2f61bf 100644
--- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java
+++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java
@@ -11,6 +11,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -54,6 +55,17 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase {
     assertTrue(sql.contains("join o_customer t1 on t1.id "));
     assertTrue(sql.contains("left join contact t2 on"));
 
+    Map<Integer, Order> ordersById = Ebean.find(Order.class).setMapKey("id").where().gt("id", 0).query().findMap();
+    for (Order o: list) {
+      int withoutFetch = ordersById.get(o.getId()).getCustomer().getContacts().size();
+      int withFetch = o.getCustomer().getContacts().size();
+      assertEquals(String.format("order.customer.contacts for order %d did not match. " +
+              "Items without fetch: %d, with fetch: %d", o.getId(), withoutFetch, withFetch),
+              withoutFetch,
+              withFetch);
+    }
+
+
     // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6,
     //        t1.id c7, t1.status c8, t1.name c9, t1.smallnote c10, t1.anniversary c11, t1.cretime c12, t1.updtime c13, t1.billing_address_id c14, t1.shipping_address_id c15,
     //        t2.id c16, t2.first_name c17, t2.last_name c18, t2.phone c19, t2.mobile c20, t2.email c21, t2.cretime c22, t2.updtime c23, t2.customer_id c24, t2.group_id c25

From 6acf93c97804deba3e7e54fcbeae4a41ded8b88a Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 13:38:40 +1300
Subject: [PATCH 116/447] #2178 - Fix for duplicate instances added to
 collection for nested one-to-many fetch

This is an initial fix for this case.
---
 .../java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index 6b050f51a..a1f6ea357 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -36,7 +36,7 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
     EntityBean detailBean = super.load(cquery, null, null);
     // initialise the collection and add detailBean if it is not null
     if (contextParent != null) {
-      manyProp.addBeanToCollectionWithCreate(contextParent, detailBean, false);
+      manyProp.addBeanToCollectionWithCreate(contextParent, detailBean, true);
     }
     return detailBean;
   }

From 5ebad53072e5b72446ed6ce9cb4828b79134f343 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 14:00:40 +1300
Subject: [PATCH 117/447] #2179 - Improve internals for outer join resulting in
 null many bean

Refactor improving the BeanList.internalAddWithCheck() for the null bean case
---
 ebean-api/src/main/java/io/ebean/common/BeanList.java | 2 +-
 ebean-api/src/main/java/io/ebean/common/BeanMap.java  | 2 +-
 ebean-api/src/main/java/io/ebean/common/BeanSet.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/common/BeanList.java b/ebean-api/src/main/java/io/ebean/common/BeanList.java
index 0aee7f211..0aa774a81 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanList.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanList.java
@@ -87,7 +87,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public void internalAddWithCheck(Object bean) {
-    if (list == null || !containsInstance(bean)) {
+    if (list == null || bean == null || !containsInstance(bean)) {
       internalAdd(bean);
     }
   }
diff --git a/ebean-api/src/main/java/io/ebean/common/BeanMap.java b/ebean-api/src/main/java/io/ebean/common/BeanMap.java
index b2ded02c9..09b37d38a 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanMap.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanMap.java
@@ -77,7 +77,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   public void internalPutWithCheck(Object key, Object bean) {
-    if (map == null || !map.containsKey(key)) {
+    if (map == null || key == null || !map.containsKey(key)) {
       internalPut(key, bean);
     }
   }
diff --git a/ebean-api/src/main/java/io/ebean/common/BeanSet.java b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
index ec4dc3829..91f0ae672 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanSet.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
@@ -70,7 +70,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public void internalAddWithCheck(Object bean) {
-    if (set == null || !set.contains(bean)) {
+    if (set == null || bean == null || !set.contains(bean)) {
       internalAdd(bean);
     }
   }

From 8c7df3212a1546bda56b94631ea34c2699dc62e1 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 17:44:13 +1300
Subject: [PATCH 118/447] Refactor internals add SqlTreeRoot as follow up to
 #2179

Adds SqlTreeRoot interface to make it more explicit that SqlTreeNodeRoot is the only valid top level node in the sql tree (and as such has the root level load() method)
---
 .../io/ebeaninternal/server/query/CQuery.java |  8 ++---
 .../ebeaninternal/server/query/SqlTree.java   |  4 +--
 .../server/query/SqlTreeNode.java             |  5 ---
 .../server/query/SqlTreeNodeBean.java         | 14 --------
 .../server/query/SqlTreeNodeExtraJoin.java    |  8 -----
 .../query/SqlTreeNodeFormulaWhereJoin.java    |  6 ----
 .../query/SqlTreeNodeManyWhereJoin.java       |  6 ----
 .../server/query/SqlTreeNodeRoot.java         | 26 +++++++++++++-
 .../server/query/SqlTreeRoot.java             | 34 +++++++++++++++++++
 9 files changed, 65 insertions(+), 46 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 861ccc337..9f30e9a29 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -142,7 +142,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * Tree that knows how to build the master and detail beans from the
    * resultSet.
    */
-  private final SqlTreeNode rootNode;
+  private final SqlTreeRoot rootNode;
 
   /**
    * For master detail query.
@@ -444,13 +444,13 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     if (manyProperty == null) {
       // only single resultSet row required to build object so we are done
       // read a single resultSet row into single bean
-      nextBean = rootNode.load(this, null, null);
+      nextBean = rootNode.load(this);
       return true;
     }
 
     if (nextBean == null) {
       // very first read
-      nextBean = rootNode.load(this, null, null);
+      nextBean = rootNode.load(this);
     } else {
       // nextBean set to previously read currentBean
       nextBean = currentBean;
@@ -478,7 +478,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * is different to the nextBean (false if we need to read more rows).
    */
   private boolean checkForDifferentBean() throws SQLException {
-    currentBean = rootNode.load(this, null, null);
+    currentBean = rootNode.load(this);
     return currentBean != nextBean;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index c537ace29..1befa650b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -122,8 +122,8 @@ class SqlTree {
     return inheritanceWhereSql;
   }
 
-  SqlTreeNode getRootNode() {
-    return rootNode;
+  SqlTreeRoot getRootNode() {
+    return (SqlTreeRoot)rootNode;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
index b341802d1..39844cb59 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
@@ -73,11 +73,6 @@ interface SqlTreeNode {
    */
   EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean contextBean) throws SQLException;
 
-  /**
-   * Load a version of a @History bean with effective dates.
-   */
-  <T> Version<T> loadVersion(DbReadContext ctx) throws SQLException;
-
   /**
    * Return true if the query has a many join.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 010793506..51ed19d32 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -192,20 +192,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
   }
 
-  /**
-   * Read the version bean.
-   */
-  @Override
-  @SuppressWarnings("unchecked")
-  public <T> Version<T> loadVersion(DbReadContext ctx) throws SQLException {
-    // read the sys period lower and upper bounds
-    // these are always the first 2 columns in the resultSet
-    Timestamp start = ctx.getDataReader().getTimestamp();
-    Timestamp end = ctx.getDataReader().getTimestamp();
-    T bean = (T) load(ctx, null, null);
-    return new Version<>(bean, start, end);
-  }
-
   /**
    * Load that takes into account inheritance.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index fbab8e6b1..074457a30 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -178,14 +178,6 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
     return null;
   }
 
-  /**
-   * Does nothing.
-   */
-  @Override
-  public <T> Version<T> loadVersion(DbReadContext ctx) {
-    return null;
-  }
-
   @Override
   public boolean hasMany() {
     return manyJoin;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
index f5e47eac5..20a3037da 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
@@ -99,12 +99,6 @@ class SqlTreeNodeFormulaWhereJoin implements SqlTreeNode {
     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/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index f3d1999ca..c537c4bf7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -144,12 +144,6 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
     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/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
index 3a7fffd98..e52477cf1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
@@ -1,16 +1,21 @@
 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.deploy.TableJoin;
 
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.Set;
 
 /**
  * Represents the root node of the Sql Tree.
  */
-final class SqlTreeNodeRoot extends SqlTreeNodeBean {
+final class SqlTreeNodeRoot extends SqlTreeNodeBean implements SqlTreeRoot {
 
   private final TableJoin includeJoin;
 
@@ -35,6 +40,25 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
     return true;
   }
 
+  @Override
+  public EntityBean load(DbReadContext ctx) throws SQLException {
+    return load(ctx, null, null);
+  }
+
+  /**
+   * Read the version bean.
+   */
+  @Override
+  @SuppressWarnings("unchecked")
+  public <T> Version<T> loadVersion(DbReadContext ctx) throws SQLException {
+    // read the sys period lower and upper bounds
+    // these are always the first 2 columns in the resultSet
+    Timestamp start = ctx.getDataReader().getTimestamp();
+    Timestamp end = ctx.getDataReader().getTimestamp();
+    T bean = (T) load(ctx, null, null);
+    return new Version<>(bean, start, end);
+  }
+
   @Override
   public boolean isSqlDistinct() {
     return sqlDistinct;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java
new file mode 100644
index 000000000..64938bc22
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java
@@ -0,0 +1,34 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.Version;
+import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarDataReader;
+import io.ebeaninternal.server.deploy.DbReadContext;
+
+import java.sql.SQLException;
+
+/**
+ * The root level node of the SqlTree.
+ */
+interface SqlTreeRoot {
+
+  /**
+   * Load the bean from the DbReadContext.
+   * <p>
+   * At a high level this actually controls the reading of the data from the
+   * jdbc resultSet and putting it into the bean etc.
+   * </p>
+   */
+  EntityBean load(DbReadContext ctx) throws SQLException;
+
+  /**
+   * Load a version of a @History bean with effective dates.
+   */
+  <T> Version<T> loadVersion(DbReadContext ctx) throws SQLException;
+
+  /**
+   * Return a Scalar single attribute reader based on the first property.
+   */
+  ScalarDataReader<?> getSingleAttributeReader();
+
+}

From 68138bc0099f707a4f9191a7cfb1ddfd2ef40e39 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 17:45:52 +1300
Subject: [PATCH 119/447] Refactor internals no effective change - reorder
 methods of SqlTreeNodeManyRoot

---
 .../server/query/SqlTreeNodeManyRoot.java     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index a1f6ea357..4947514d1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -18,14 +18,9 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
     this.manyProp = prop;
   }
 
-  /**
-   * Append the property columns to the buffer.
-   */
   @Override
-  public void appendDistinctOn(DbSqlContext ctx, boolean subQuery) {
-    ctx.pushTableAlias(prefix);
-    appendSelectId(ctx, idBinder.getBeanProperty());
-    ctx.popTableAlias();
+  public boolean hasMany() {
+    return true;
   }
 
   @Override
@@ -41,6 +36,15 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
     return detailBean;
   }
 
+  /**
+   * Append the property columns to the buffer.
+   */
+  @Override
+  public void appendDistinctOn(DbSqlContext ctx, boolean subQuery) {
+    ctx.pushTableAlias(prefix);
+    appendSelectId(ctx, idBinder.getBeanProperty());
+    ctx.popTableAlias();
+  }
 
   /**
    * append extraWhere to the join.
@@ -64,9 +68,4 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
     super.appendFrom(ctx, joinType.autoToOuter());
   }
-
-  @Override
-  public boolean hasMany() {
-    return true;
-  }
 }

From 5a73c85e6eab847037c83ea53d5eabbe11862e78 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 18:36:49 +1300
Subject: [PATCH 120/447] Refactor internals - SqlTreeNodeBean add derived
 readIdNormal + private methods

This is no effective change
---
 .../server/query/SqlTreeNodeBean.java         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 51ed19d32..011d9f1a7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.Version;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -16,7 +15,6 @@ import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +54,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
    * False if report bean and has no id property.
    */
   final boolean readId;
+  private final boolean readIdNormal;
 
   private final boolean disableLazyLoad;
 
@@ -120,7 +119,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
     boolean aggregationRoot = props.isAggregationRoot();
     // the bean has an Id property and we want to use it
     this.readId = !aggregationRoot && withId && desc.hasId();
-    this.disableLazyLoad = disableLazyLoad || !readId || desc.isRawSqlBased() || temporalVersions;
+    this.readIdNormal = readId && !temporalVersions;
+    this.disableLazyLoad = disableLazyLoad || !readIdNormal || desc.isRawSqlBased();
     this.partialObject = props.isPartialObject();
     this.properties = props.getProps();
     this.children = myChildren == null ? NO_CHILDREN : myChildren.toArray(new SqlTreeNode[0]);
@@ -253,7 +253,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       this.parentBean = parentBean;
     }
 
-    void initLazyParent() throws SQLException {
+    private void initLazyParent() throws SQLException {
       if (lazyLoadParentIdBinder != null) {
         lazyLoadParentId = lazyLoadParentIdBinder.read(ctx);
       }
@@ -265,12 +265,12 @@ class SqlTreeNodeBean implements SqlTreeNode {
       localIdBinder = idBinder;
     }
 
-    void initPersistenceContext() {
+    private void initPersistenceContext() {
       queryMode = ctx.getQueryMode();
-      persistenceContext = (!readId || temporalVersions) ? null : ctx.getPersistenceContext();
+      persistenceContext = (!readIdNormal) ? null : ctx.getPersistenceContext();
     }
 
-    void readId() throws SQLException {
+    private void readId() throws SQLException {
       if (readId) {
         id = localIdBinder.readSet(ctx, localBean);
         if (id == null) {
@@ -311,7 +311,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
     }
 
-    void initSqlLoadBean() {
+    private void initSqlLoadBean() {
       ctx.setCurrentPrefix(prefix, pathMap);
       ctx.propagateState(localBean);
       sqlBeanLoad = new SqlBeanLoad(ctx, localType, localBean, queryMode);
@@ -323,7 +323,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
     }
 
-    void loadChildren() throws SQLException {
+    private void loadChildren() throws SQLException {
       //boolean lazyLoadMany = false;
       if (localBean == null && queryMode == Mode.LAZYLOAD_MANY) {
         // batch lazy load many into existing contextBean
@@ -338,18 +338,18 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
     }
 
-    boolean isLazyLoadManyRoot() {
+    private boolean isLazyLoadManyRoot() {
       return queryMode == Mode.LAZYLOAD_MANY && isRoot();
     }
 
-    EntityBean getContextBean() {
+    private EntityBean getContextBean() {
       return contextBean;
     }
 
-    void postLoad() {
+    private void postLoad() {
       if (!lazyLoadMany && localBean != null) {
         ctx.setCurrentPrefix(prefix, pathMap);
-        if (readId && !temporalVersions) {
+        if (readIdNormal) {
           createListProxies();
         }
         if (temporalMode == SpiQuery.TemporalMode.DRAFT) {
@@ -411,15 +411,15 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
     }
 
-    void setBeanToParent() {
+    private void setBeanToParent() {
       if (parentBean != null) {
         // set this back to the parentBean
         nodeBeanProp.setValue(parentBean, contextBean);
       }
     }
 
-    EntityBean complete() {
-      if (!readId || temporalVersions) {
+    private EntityBean complete() {
+      if (!readIdNormal) {
         // a bean with no Id (never found in context)
         if (lazyLoadParentId != null) {
           ctx.setLazyLoadedChildBean(localBean, lazyLoadParentId);
@@ -434,7 +434,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
     }
 
-    void initialise() throws SQLException {
+    private void initialise() throws SQLException {
       initLazyParent();
       initBeanType();
       initPersistenceContext();

From 297c1d7abb2b28bb5457a9f51e14644159a52193 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 20:27:50 +1300
Subject: [PATCH 121/447] #2179 - Improved fix for (2179) Fetch on nested
 one-to-many collections results in duplicates

The improvement here is that SqlTreeNodeManyRoot uses load and isContextBean() so that it only checks if the collection already contains the detailBean if the detailBean was already in the persistence context (aka not newly loaded and added).  The vast majority case is that detailBean is loaded fresh so for the common case we can skip the extra collection contains() check.
---
 .../main/java/io/ebean/common/BeanSet.java    |  5 +-
 .../server/query/SqlTreeNodeBean.java         | 48 ++++++++++++-------
 .../server/query/SqlTreeNodeManyRoot.java     | 13 ++---
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/common/BeanSet.java b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
index 91f0ae672..880ece106 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanSet.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
@@ -70,9 +70,8 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public void internalAddWithCheck(Object bean) {
-    if (set == null || bean == null || !set.contains(bean)) {
-      internalAdd(bean);
-    }
+    // set add() already de-dups so just add it
+    internalAdd(bean);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 011d9f1a7..b9df45760 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -230,7 +230,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   /**
    * Load a bean instance.
    */
-  private class Load {
+  class Load {
 
     final DbReadContext ctx;
     final EntityBean parentBean;
@@ -324,17 +324,13 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
 
     private 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);
+      for (SqlTreeNode child : children) {
+        child.load(ctx, localBean, contextBean);
       }
     }
 
@@ -425,7 +421,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
           ctx.setLazyLoadedChildBean(localBean, lazyLoadParentId);
         }
         return localBean;
-
       } else {
         if (lazyLoadParentId != null) {
           ctx.setLazyLoadedChildBean(contextBean, lazyLoadParentId);
@@ -443,6 +438,27 @@ class SqlTreeNodeBean implements SqlTreeNode {
       loadProperties();
       loadChildren();
     }
+
+    /**
+     * Perform the load returning the loaded bean.
+     */
+    EntityBean perform() throws SQLException {
+      initialise();
+      if (isLazyLoadManyRoot()) {
+        return getContextBean();
+      }
+      postLoad();
+      setBeanToParent();
+      return complete();
+    }
+
+    /**
+     * Return true if this bean was already in the context. If already in the
+     * context we need to check if it is already contained in the collection.
+     */
+    boolean isContextBean() {
+      return localBean == null;
+    }
   }
 
   /**
@@ -450,14 +466,14 @@ class SqlTreeNodeBean implements SqlTreeNode {
    */
   @Override
   public EntityBean load(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) throws SQLException {
-    Load load = (inheritInfo != null) ? new LoadInherit(ctx, parentBean) : new Load(ctx, parentBean);
-    load.initialise();
-    if (load.isLazyLoadManyRoot()) {
-      return load.getContextBean();
-    }
-    load.postLoad();
-    load.setBeanToParent();
-    return load.complete();
+    return createLoad(ctx, parentBean).perform();
+  }
+
+  /**
+   * Create the loader with or without inheritance.
+   */
+  Load createLoad(DbReadContext ctx, EntityBean parentBean) {
+    return (inheritInfo != null) ? new LoadInherit(ctx, parentBean) : new Load(ctx, parentBean);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index 4947514d1..8c5517a76 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -25,13 +25,14 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
 
   @Override
   public EntityBean load(DbReadContext cquery, EntityBean parentBean, EntityBean contextParent) throws SQLException {
-    // pass in null for parentBean because the localBean
-    // that is built is added to a collection rather than
-    // being set to the parentBean directly
-    EntityBean detailBean = super.load(cquery, null, null);
-    // initialise the collection and add detailBean if it is not null
+    // pass in null for parentBean because added to a collection rather than set to the parentBean
+    SqlTreeNodeBean.Load load = createLoad(cquery, null);
+    EntityBean detailBean = load.perform();
     if (contextParent != null) {
-      manyProp.addBeanToCollectionWithCreate(contextParent, detailBean, true);
+      // Add to the collection and initialise collection if needed
+      // A null detailBean may initialise an empty collection
+      // Check for bean existing in collection based on load.isContextBean()
+      manyProp.addBeanToCollectionWithCreate(contextParent, detailBean, load.isContextBean());
     }
     return detailBean;
   }

From eacfaf340365192551ca0a6c0a2232de499543f2 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 21:19:25 +1300
Subject: [PATCH 122/447] No effective change - refactor tidy SqlTreeNodeBean

---
 .../server/query/SqlTreeNodeBean.java         | 37 +++++++------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index b9df45760..1c9bff694 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -87,7 +87,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
    */
   SqlTreeNodeBean(String prefix, STreePropertyAssoc beanProp, SqlTreeProperties props,
                   List<SqlTreeNode> myChildren, boolean withId, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
-
     this(prefix, beanProp, beanProp.target(), props, myChildren, withId, null, temporalMode, disableLazyLoad);
   }
 
@@ -197,7 +196,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
    */
   private class LoadInherit extends Load {
 
-    LoadInherit(DbReadContext ctx, EntityBean parentBean) {
+    private LoadInherit(DbReadContext ctx, EntityBean parentBean) {
       super(ctx, parentBean);
     }
 
@@ -218,10 +217,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     @Override
     void loadProperties() {
-      // take account of inheritance and due to subclassing approach
-      // need to get a 'local' version of the property
+      // take account of inheritance
       for (STreeProperty property : properties) {
-        // get a local version of the BeanProperty
         localDesc.inheritanceLoad(sqlBeanLoad, property, ctx);
       }
     }
@@ -248,7 +245,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     SqlBeanLoad sqlBeanLoad;
     boolean lazyLoadMany;
 
-    Load(DbReadContext ctx, EntityBean parentBean) {
+    private Load(DbReadContext ctx, EntityBean parentBean) {
       this.ctx = ctx;
       this.parentBean = parentBean;
     }
@@ -366,7 +363,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
         if (disableLazyLoad) {
           // bean does not have an Id or is SqlSelect based
           ebi.setDisableLazyLoad(true);
-
         } else if (partialObject) {
           if (readId) {
             // register for lazy loading
@@ -390,7 +386,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
     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)
@@ -491,8 +486,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
         property.appendSelect(ctx, subQuery);
       }
     }
-    for (SqlTreeNode aChildren : children) {
-      aChildren.appendGroupBy(ctx, subQuery);
+    for (SqlTreeNode child : children) {
+      child.appendGroupBy(ctx, subQuery);
     }
     ctx.popTableAlias();
     ctx.popJoin();
@@ -529,11 +524,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
       appendSelectId(ctx, idBinder.getBeanProperty());
     }
     appendSelect(ctx, subQuery, properties);
-
-    for (SqlTreeNode aChildren : children) {
-      // read each child... and let them set their
-      // values back to this localBean
-      aChildren.appendSelect(ctx, subQuery);
+    for (SqlTreeNode child : children) {
+      child.appendSelect(ctx, subQuery);
     }
     ctx.popTableAlias();
     ctx.popJoin();
@@ -581,10 +573,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
       }
     }
     appendExtraWhere(ctx);
-    for (SqlTreeNode aChildren : children) {
-      // recursively add to the where clause any
-      // fixed predicates (extraWhere etc)
-      aChildren.appendWhere(ctx);
+    for (SqlTreeNode child : children) {
+      child.appendWhere(ctx);
     }
   }
 
@@ -620,10 +610,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
       property.appendFrom(ctx, joinType);
     }
 
-    for (SqlTreeNode aChildren : children) {
-      aChildren.appendFrom(ctx, joinType);
+    for (SqlTreeNode child : children) {
+      child.appendFrom(ctx, joinType);
     }
-
     ctx.popTableAlias();
     ctx.popJoin();
   }
@@ -648,8 +637,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
     if (intersectionAsOfTableAlias) {
       query.incrementAsOfTableCount();
     }
-    for (SqlTreeNode aChildren : children) {
-      aChildren.addAsOfTableAlias(query);
+    for (SqlTreeNode child : children) {
+      child.addAsOfTableAlias(query);
     }
   }
 

From 464f48d71726a164bbbc70505e532d8b1d49445c Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 21:34:17 +1300
Subject: [PATCH 123/447] Bump test kotlin-querybean-generator version

---
 kotlin-querybean-generator/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 8529dbe7f..4373c3275 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -106,7 +106,7 @@
                 <annotationProcessorPath>
                   <groupId>io.ebean</groupId>
                   <artifactId>kotlin-querybean-generator</artifactId>
-                  <version>12.6.1</version>
+                  <version>12.7.1</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>

From 6315edfc214066a63336f42d2e4f2ce4503904bc Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 22:08:17 +1300
Subject: [PATCH 124/447] #2177 - findNative not mapping bean when schema
 specified in entity mapping

---
 .../server/deploy/BeanDescriptor.java         | 17 +++-
 .../server/query/CQueryBuilder.java           |  3 +-
 .../test/java/org/example/domain/Product.java |  2 +-
 .../org/querytest/FindNative_withSchema.java  | 78 +++++++++++++++++++
 .../resources/application-test.properties     |  1 +
 .../src/test/resources/init-db.sql            |  1 +
 6 files changed, 96 insertions(+), 6 deletions(-)
 create mode 100644 ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java
 create mode 100644 ebean-querybean/src/test/resources/init-db.sql

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index c2c69b164..a2d902f13 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -727,7 +727,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     String[] cols = indexDef.getColumns();
     BeanProperty[] props = new BeanProperty[cols.length];
     for (int i = 0; i < cols.length; i++) {
-      String propName = findBeanPath("", cols[i]);
+      String propName = findBeanPath("", "", cols[i]);
       if (propName == null) {
         return;
       }
@@ -2472,13 +2472,16 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the property path given the db table and column.
    */
-  public String findBeanPath(String tableName, String columnName) {
-    if (tableName.isEmpty() || tableName.equalsIgnoreCase(baseTable)) {
+  public String findBeanPath(String schemaName, String tableName, String columnName) {
+    if (matchBaseTable(schemaName, tableName)) {
       return columnPath.get(columnName);
     }
     BeanPropertyAssoc<?> assocProperty = tablePath.get(tableName);
+    if (assocProperty == null) {
+      assocProperty = tablePath.get(schemaName + "." + tableName);
+    }
     if (assocProperty != null) {
-      String relativePath = assocProperty.getTargetDescriptor().findBeanPath(tableName, columnName);
+      String relativePath = assocProperty.getTargetDescriptor().findBeanPath(schemaName, tableName, columnName);
       if (relativePath != null) {
         return SplitName.add(assocProperty.getName(), relativePath);
       }
@@ -2486,6 +2489,12 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return null;
   }
 
+  private boolean matchBaseTable(String schemaName, String tableName) {
+    return tableName.isEmpty()
+      || baseTable.equalsIgnoreCase(tableName)
+      || baseTable.equalsIgnoreCase(schemaName + "." + tableName);
+  }
+
   /**
    * Return a 'dynamic property' used to read a formula.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 75aa7e3cc..ab008a5cf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -442,9 +442,10 @@ class CQueryBuilder {
       int cols = 1 + metaData.getColumnCount();
       List<String> propertyNames = new ArrayList<>(cols - 1);
       for (int i = 1; i < cols; i++) {
+        String schemaName = metaData.getSchemaName(i).toLowerCase();
         String tableName = metaData.getTableName(i).toLowerCase();
         String columnName = metaData.getColumnName(i).toLowerCase();
-        String path = desc.findBeanPath(tableName, columnName);
+        String path = desc.findBeanPath(schemaName, tableName, columnName);
         if (path != null) {
           propertyNames.add(path);
         } else {
diff --git a/ebean-querybean/src/test/java/org/example/domain/Product.java b/ebean-querybean/src/test/java/org/example/domain/Product.java
index e41d4fc34..ed58daa05 100644
--- a/ebean-querybean/src/test/java/org/example/domain/Product.java
+++ b/ebean-querybean/src/test/java/org/example/domain/Product.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.Size;
  * Product entity bean.
  */
 @Entity
-@Table(name = "o_product")
+@Table(name = "o_product", schema = "foo")
 public class Product extends BaseModel {
 
   @Size(max = 20)
diff --git a/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java b/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java
new file mode 100644
index 000000000..59146648d
--- /dev/null
+++ b/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java
@@ -0,0 +1,78 @@
+package org.querytest;
+
+import io.ebean.DB;
+import org.example.domain.Customer;
+import org.example.domain.Order;
+import org.example.domain.OrderDetail;
+import org.example.domain.Product;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindNative_withSchema {
+
+  @Test
+  public void test_rootLevelUsesSchema() {
+
+    Product p = new Product();
+    p.setName("prod1");
+    p.setSku("p1");
+    p.save();
+
+    String sql = "select * from foo.o_product p where p.sku = ?";
+
+    Product product = DB.findNative(Product.class, sql)
+      .setParameter("p1")
+      .findOne();
+
+    assertThat(product).isNotNull();
+    assertThat(product.getName()).isEqualTo("prod1");
+  }
+
+  @Test
+  public void test_joinToSchema() {
+
+    Order order = setupData();
+
+    String sql = "select l.*, p.* " +
+      " from o_order_detail l " +
+      " join foo.o_product p on p.id = l.product_id " +
+      " where l.order_id = ?";
+
+    List<OrderDetail> lines = DB.findNative(OrderDetail.class, sql)
+      .setParameter(order.getId())
+      .findList();
+
+    assertThat(lines).hasSize(1);
+    OrderDetail line = lines.get(0);
+    Product product = line.getProduct();
+
+    // check normal bean population
+    assertThat(line.getOrderQty()).isEqualTo(10);
+    assertThat(line.getOrder().getId()).isEqualTo(order.getId());
+    // check associated bean with schema is populated
+    assertThat(product).isNotNull();
+    assertThat(product.getName()).isEqualTo("prod2");
+  }
+
+  private Order setupData() {
+    Product p = new Product();
+    p.setName("prod2");
+    p.setSku("p2");
+    p.save();
+
+    Customer customer = new Customer();
+    customer.setName("junk");
+    customer.save();
+    Order order = new Order();
+    order.setCustomer(customer);
+
+    OrderDetail line = new OrderDetail(p, 10, 10.0);
+    order.getDetails().add(line);
+
+    order.save();
+    return order;
+  }
+}
diff --git a/ebean-querybean/src/test/resources/application-test.properties b/ebean-querybean/src/test/resources/application-test.properties
index 68e06a3f9..76f2d661f 100644
--- a/ebean-querybean/src/test/resources/application-test.properties
+++ b/ebean-querybean/src/test/resources/application-test.properties
@@ -1,5 +1,6 @@
 ebean.ddl.generate=true
 ebean.ddl.run=true
+ebean.ddl.initSql=init-db.sql
 
 datasource.default=h2
 
diff --git a/ebean-querybean/src/test/resources/init-db.sql b/ebean-querybean/src/test/resources/init-db.sql
new file mode 100644
index 000000000..fde39032e
--- /dev/null
+++ b/ebean-querybean/src/test/resources/init-db.sql
@@ -0,0 +1 @@
+create schema foo;

From 7bfacb095b0de1d39bccb54325272c7774dfac1b Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 22:47:34 +1300
Subject: [PATCH 125/447] #2181 - Oracle 9,10,11 rownum based limiting for
 SqlQuery and DtoQuery (rather than Oracle 12g row limiting)

---
 .../dbplatform/oracle/Oracle11Platform.java   |  1 +
 .../oracle/OracleRownumBasicLimiter.java      | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumBasicLimiter.java

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java
index e13155f3f..cb32a7470 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java
@@ -13,6 +13,7 @@ public class Oracle11Platform extends OraclePlatform {
     this.platform = Platform.ORACLE11;
     this.columnAliasPrefix = "c";
     this.sqlLimiter = new OracleRownumSqlLimiter();
+    this.basicSqlLimiter = new OracleRownumBasicLimiter();
     dbIdentity.setIdType(IdType.SEQUENCE);
   }
 }
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumBasicLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumBasicLimiter.java
new file mode 100644
index 000000000..e51df98cb
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumBasicLimiter.java
@@ -0,0 +1,35 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.config.dbplatform.BasicSqlLimiter;
+
+/**
+ * Row limiter for Oracle 9,10,11 using rownum.
+ */
+public class OracleRownumBasicLimiter implements BasicSqlLimiter {
+
+  @Override
+  public String limit(String dbSql, int firstRow, int maxRows) {
+    if (firstRow < 1 && maxRows < 1) {
+      return dbSql;
+    }
+    StringBuilder sb = new StringBuilder(60 + dbSql.length());
+    int lastRow = maxRows;
+    if (lastRow > 0) {
+      lastRow += firstRow;
+    }
+    sb.append("select * from (select ");
+    if (maxRows > 0) {
+      sb.append("/*+ FIRST_ROWS(").append(maxRows).append(") */ ");
+    }
+    sb.append("a.*, rownum rn_ from (");
+    sb.append(dbSql).append(") a ");
+    if (lastRow > 0) {
+      sb.append(" where rownum <= ").append(lastRow);
+    }
+    sb.append(") ");
+    if (firstRow > 0) {
+      sb.append(" where rn_ > ").append(firstRow);
+    }
+    return sb.toString();
+  }
+}

From 1a26cd717f75ba6c2584b5066c1af6b476984510 Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 23:40:06 +1300
Subject: [PATCH 126/447] #2182 - Tidy javadoc - this may mean JDK 15 is
 required to generate javadoc

---
 .../src/main/java/io/ebean/BeanFinder.java    |  2 +-
 .../main/java/io/ebean/BeanRepository.java    |  4 +-
 .../src/main/java/io/ebean/Database.java      |  2 +-
 .../src/main/java/io/ebean/DocumentStore.java |  2 +-
 ebean-api/src/main/java/io/ebean/Ebean.java   |  2 +-
 .../main/java/io/ebean/ExpressionFactory.java |  4 +-
 .../main/java/io/ebean/ExpressionList.java    |  4 +-
 ebean-api/src/main/java/io/ebean/Finder.java  |  4 +-
 ebean-api/src/main/java/io/ebean/Model.java   | 12 ++--
 ebean-api/src/main/java/io/ebean/Pairs.java   |  2 +-
 ebean-api/src/main/java/io/ebean/RawSql.java  |  8 +--
 .../src/main/java/io/ebean/RowMapper.java     |  2 +-
 ebean-api/src/main/java/io/ebean/Update.java  | 12 ++--
 .../ebean/config/DatabaseConfigProvider.java  |  2 +-
 .../io/ebean/config/ServerConfigProvider.java |  2 +-
 .../config/dbplatform/DbDefaultValue.java     |  2 +-
 .../io/ebean/typequery/PBaseCompareable.java  |  8 +--
 .../java/io/ebean/typequery/TQRootBean.java   | 56 +++++++------------
 18 files changed, 57 insertions(+), 73 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/BeanFinder.java b/ebean-api/src/main/java/io/ebean/BeanFinder.java
index 00aec8de5..2c8e04eec 100644
--- a/ebean-api/src/main/java/io/ebean/BeanFinder.java
+++ b/ebean-api/src/main/java/io/ebean/BeanFinder.java
@@ -14,7 +14,7 @@ import java.util.Optional;
  *
  * public class CustomerFinder extends BeanFinder<Long,Customer> {
  *
- *   ＠Inject
+ *   @Inject
  *   public CustomerFinder(Database database) {
  *     super(Customer.class, database);
  *   }
diff --git a/ebean-api/src/main/java/io/ebean/BeanRepository.java b/ebean-api/src/main/java/io/ebean/BeanRepository.java
index 19f390582..b89a49b39 100644
--- a/ebean-api/src/main/java/io/ebean/BeanRepository.java
+++ b/ebean-api/src/main/java/io/ebean/BeanRepository.java
@@ -9,10 +9,10 @@ import java.util.Collection;
  * <p>
  * <pre>{@code
  *
- * ＠Repository
+ * @Repository
  * public class CustomerRepository extends BeanRepository<Long,Customer> {
  *
- *   ＠Inject
+ *   @Inject
  *   public CustomerRepository(Database server) {
  *     super(Customer.class, server);
  *   }
diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index 5bbf29ad3..bd38253de 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -897,7 +897,7 @@ public interface Database {
    * <pre>{@code
    *   public class Order { ...
    *
-   *     ＠OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   *     @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
    * 	   List<OrderDetail> details;
    * 	   ...
    *   }
diff --git a/ebean-api/src/main/java/io/ebean/DocumentStore.java b/ebean-api/src/main/java/io/ebean/DocumentStore.java
index a4f75132d..0a2353ff0 100644
--- a/ebean-api/src/main/java/io/ebean/DocumentStore.java
+++ b/ebean-api/src/main/java/io/ebean/DocumentStore.java
@@ -149,7 +149,7 @@ public interface DocumentStore {
    *    .setUseDocStore(true)
    *    .where()... // perhaps add predicates
    *    .findEachWhile(new Predicate<Order>() {
-   *      ＠Override
+   *      @Override
    *      public void accept(Order bean) {
    *        // process the bean
    *
diff --git a/ebean-api/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java
index f68a0666b..fb0e34db3 100644
--- a/ebean-api/src/main/java/io/ebean/Ebean.java
+++ b/ebean-api/src/main/java/io/ebean/Ebean.java
@@ -346,7 +346,7 @@ public final class Ebean {
    * <pre>{@code
    *   public class Order { ...
    *
-   *     ＠OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   *     @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
    * 	   List<OrderDetail> details;
    * 	   ...
    *   }
diff --git a/ebean-api/src/main/java/io/ebean/ExpressionFactory.java b/ebean-api/src/main/java/io/ebean/ExpressionFactory.java
index 1e5c4ebf5..3bcd5cb39 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionFactory.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionFactory.java
@@ -200,7 +200,7 @@ public interface ExpressionFactory {
   Expression gtOrNull(String propertyName, Object value);
 
   /**
-   * Greater than or Equal to OR Null <code> >= or null </code>
+   * Greater than or Equal to OR Null ({@code >= or null })
    * <p>
    * A convenient expression combining GE and Is Null.  Most often useful for range
    * expressions where the top range value is nullable.
@@ -227,7 +227,7 @@ public interface ExpressionFactory {
   Expression ltOrNull(String propertyName, Object value);
 
   /**
-   * Less Than or Equal to OR Null <code> <= or null </code>
+   * Less Than or Equal to OR Null ({@code <= or null })
    * <p>
    * A convenient expression combining LE and Is Null.  Most often useful for range
    * expressions where the bottom range value is nullable.
diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index e137f64ba..7e4e0f164 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -909,7 +909,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> gtOrNull(String propertyName, Object value);
 
   /**
-   * Greater Than or Equal to OR Null - <code> >= or null </code>.
+   * Greater Than or Equal to OR Null - ({@code >= or null }).
    */
   ExpressionList<T> geOrNull(String propertyName, Object value);
 
@@ -930,7 +930,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> ltOrNull(String propertyName, Object value);
 
   /**
-   * Less Than or Equal to OR Null - <code> <= or null </code>.
+   * Less Than or Equal to OR Null - ({@code <= or null }).
    */
   ExpressionList<T> leOrNull(String propertyName, Object value);
 
diff --git a/ebean-api/src/main/java/io/ebean/Finder.java b/ebean-api/src/main/java/io/ebean/Finder.java
index e91238344..3c9318e7d 100644
--- a/ebean-api/src/main/java/io/ebean/Finder.java
+++ b/ebean-api/src/main/java/io/ebean/Finder.java
@@ -37,7 +37,7 @@ import java.util.List;
  *   }
  * }
  *
- * ＠Entity
+ * @Entity
  * public class Customer extends BaseModel {
  *
  *   public static final CustomerFinder find = new CustomerFinder();
@@ -80,7 +80,7 @@ public class Finder<I, T> {
    *   // ... add extra customer specific finder methods
    * }
    *
-   * ＠Entity
+   * @Entity
    * public class Customer extends BaseModel {
    *
    *   public static final CustomerFinder find = new CustomerFinder();
diff --git a/ebean-api/src/main/java/io/ebean/Model.java b/ebean-api/src/main/java/io/ebean/Model.java
index 5fe2205e1..ac2f11ea7 100644
--- a/ebean-api/src/main/java/io/ebean/Model.java
+++ b/ebean-api/src/main/java/io/ebean/Model.java
@@ -32,16 +32,16 @@ import io.ebean.bean.EntityBean;
  *     // Typically there is a common base model that has some
  *     // common properties like the ones below
  *
- *   ＠MappedSuperclass
+ *   @MappedSuperclass
  *   public class BaseModel extends Model {
  *
- *     ＠Id Long id;
+ *     @Id Long id;
  *
- *     ＠Version Long version;
+ *     @Version Long version;
  *
- *     ＠WhenCreated Timestamp whenCreated;
+ *     @WhenCreated Timestamp whenCreated;
  *
- *     ＠WhenUpdated Timestamp whenUpdated;
+ *     @WhenUpdated Timestamp whenUpdated;
  *
  *     ...
  *   }
@@ -52,7 +52,7 @@ import io.ebean.bean.EntityBean;
  *
  *     // Extend the mappedSuperclass
  *
- *     ＠Entity ＠Table(name="o_account")
+ *     @Entity @Table(name="o_account")
  *     public class Customer extends BaseModel {
  *
  *       String name;
diff --git a/ebean-api/src/main/java/io/ebean/Pairs.java b/ebean-api/src/main/java/io/ebean/Pairs.java
index 4f609f95a..bd5ee5137 100644
--- a/ebean-api/src/main/java/io/ebean/Pairs.java
+++ b/ebean-api/src/main/java/io/ebean/Pairs.java
@@ -18,7 +18,7 @@ import java.util.List;
  *
  *   // where a bean is annotated with a complex
  *   // natural key made of several properties
- *   ＠Cache(naturalKey = {"store","code","sku"})
+ *   @Cache(naturalKey = {"store","code","sku"})
  *
  *
  *   Pairs pairs = new Pairs("sku", "code");
diff --git a/ebean-api/src/main/java/io/ebean/RawSql.java b/ebean-api/src/main/java/io/ebean/RawSql.java
index e0e20714b..901f1a43c 100644
--- a/ebean-api/src/main/java/io/ebean/RawSql.java
+++ b/ebean-api/src/main/java/io/ebean/RawSql.java
@@ -41,14 +41,14 @@ package io.ebean;
  * <h3>Example OrderAggregate</h3>
  * <pre>{@code
  *  ...
- *   // ＠Sql indicates to that this bean
+ *   // @Sql indicates to that this bean
  *   // is based on RawSql rather than a table
  *
- *   ＠Entity
- *   ＠Sql
+ *   @Entity
+ *   @Sql
  *   public class OrderAggregate {
  *
- *    ＠OneToOne
+ *    @OneToOne
  *    Order order;
  *
  *    Double totalAmount;
diff --git a/ebean-api/src/main/java/io/ebean/RowMapper.java b/ebean-api/src/main/java/io/ebean/RowMapper.java
index 47e96498d..b1d59c984 100644
--- a/ebean-api/src/main/java/io/ebean/RowMapper.java
+++ b/ebean-api/src/main/java/io/ebean/RowMapper.java
@@ -22,7 +22,7 @@ import java.sql.SQLException;
  *    //
  *    class CustomerMapper implements RowMapper<CustomerDto> {
  *
- *     ＠Override
+ *     @Override
  *     public CustomerDto map(ResultSet rset, int rowNum) throws SQLException {
  *
  *       long id = rset.getLong(1);
diff --git a/ebean-api/src/main/java/io/ebean/Update.java b/ebean-api/src/main/java/io/ebean/Update.java
index 25aed9315..ece973392 100644
--- a/ebean-api/src/main/java/io/ebean/Update.java
+++ b/ebean-api/src/main/java/io/ebean/Update.java
@@ -13,23 +13,23 @@ package io.ebean;
  * </p>
  * <pre>{@code
  *    ...
- *   ＠NamedUpdates(value = {
- *     ＠NamedUpdate(
+ *   @NamedUpdates(value = {
+ *     @NamedUpdate(
  *       name = "setTitle",
  *       notifyCache = false,
  *       update = "update topic set title = :title, postCount = :count where id = :id"),
- *    ＠NamedUpdate(
+ *    @NamedUpdate(
  *       name = "setPostCount",
  *       notifyCache = false,
  *       update = "update f_topic set post_count = :postCount where id = :id"),
- *    ＠NamedUpdate(
+ *    @NamedUpdate(
  *       name = "incrementPostCount",
  *       notifyCache = false,
  *       update = "update Topic set postCount = postCount + 1 where id = :id")
  *       //update = "update f_topic set post_count = post_count + 1 where id = :id")
  *   })
- *   ＠Entity
- *   ＠Table(name = "f_topic")
+ *   @Entity
+ *   @Table(name = "f_topic")
  *   public class Topic {
  *     ...
  *   }
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java
index 0a1f3e768..066af5fc4 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java
@@ -15,7 +15,7 @@ package io.ebean.config;
  *
  * public class EbeanConfigProvider implements DatabaseConfigProvider {
  *
- *   ＠Override
+ *   @Override
  *   public void apply(DatabaseConfig config) {
  *
  *     // register the entity bean classes explicitly
diff --git a/ebean-api/src/main/java/io/ebean/config/ServerConfigProvider.java b/ebean-api/src/main/java/io/ebean/config/ServerConfigProvider.java
index f992b004d..1ba45907d 100644
--- a/ebean-api/src/main/java/io/ebean/config/ServerConfigProvider.java
+++ b/ebean-api/src/main/java/io/ebean/config/ServerConfigProvider.java
@@ -16,7 +16,7 @@ package io.ebean.config;
  *
  * public class EbeanConfigProvider implements ServerConfigProvider {
  *
- *   ＠Override
+ *   @Override
  *   public void apply(ServerConfig config) {
  *
  *     // register the entity bean classes explicitly
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java
index b74465f35..851fc2707 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java
@@ -79,7 +79,7 @@ public class DbDefaultValue {
   }
 
   /**
-   * This method checks & convert the {@link DbDefault#value()} to a valid SQL literal.
+   * This method checks and converts the {@link DbDefault#value()} to a valid SQL literal.
    *
    * This is mainly to quote string literals and verify integer/dates for correctness.
    * <p>
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseCompareable.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseCompareable.java
index c9488f63c..4e0ba7c1d 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseCompareable.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseCompareable.java
@@ -121,12 +121,12 @@ public class PBaseCompareable<R, T> extends PBaseValueEqual<R, T> {
    * Greater or equal to lower value and strictly less than upper value.
    * <p>
    * This is generally preferable over Between for date and datetime types
-   * as SQL Between is inclusive on the upper bound (<=) and generally we
-   * need the upper bound to be exclusive (<).
+   * as SQL Between is inclusive on the upper bound ({@code <= }) and generally
+   * we need the upper bound to be exclusive ({@code < }).
    * </p>
    *
-   * @param lower the lower bind value (>=)
-   * @param upper the upper bind value (<)
+   * @param lower the lower bind value ({@code >= })
+   * @param upper the upper bind value ({@code < })
    * @return the root query bean instance
    */
   public final R inRange(T lower, T upper) {
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index de8f846a6..4deab6037 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -43,55 +43,39 @@ import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 /**
- * Base root query bean.
+ * Base root query bean providing common features for all root query beans.
  * <p>
- * With code generation for each entity bean type a query bean is created that extends this.
+ * For each entity bean querybean-generator generates a query bean that extends TQRootBean.
  * <p>
- * Provides common features for all root query beans
+ *
  * </p>
- * <p>
- * <h2>Example - QCustomer extends TQRootBean</h2>
- * <p>
- * These 'query beans' like QCustomer are generated using the <code>avaje-ebeanorm-typequery-generator</code>.
- * </p>
- * <pre>{@code
- *
- *   public class QCustomer extends TQRootBean<Customer,QCustomer> {
- *
- *     // properties
- *     public PLong<QCustomer> id;
- *
- *     public PString<QCustomer> name;
- *     ...
- *
- * }</pre>
- * <p>
  * <h2>Example - usage of QCustomer</h2>
  * <pre>{@code
  *
- *    Date fiveDaysAgo = ...
+ *  Date fiveDaysAgo = ...
  *
- *    List<Customer> customers =
- *        new QCustomer()
- *          .name.ilike("rob")
- *          .status.equalTo(Customer.Status.GOOD)
- *          .registered.after(fiveDaysAgo)
- *          .contacts.email.endsWith("@foo.com")
- *          .orderBy()
- *            .name.asc()
- *            .registered.desc()
- *          .findList();
+ *  List<Customer> customers =
+ *      new QCustomer()
+ *        .name.ilike("rob")
+ *        .status.equalTo(Customer.Status.GOOD)
+ *        .registered.after(fiveDaysAgo)
+ *        .contacts.email.endsWith("@foo.com")
+ *        .orderBy()
+ *          .name.asc()
+ *          .registered.desc()
+ *        .findList();
  *
  * }</pre>
  * <p>
  * <h2>Resulting SQL where</h2>
  * <p>
- * <pre>{@code sql
+ * <pre>{@code
  *
- *     where lower(t0.name) like ?  and t0.status = ?  and t0.registered > ?  and u1.email like ?
- *     order by t0.name, t0.registered desc;
+ *   where lower(t0.name) like ?  and t0.status = ?  and t0.registered > ?  and u1.email like ?
+ *   order by t0.name, t0.registered desc;
+ *
+ *   --bind(rob,GOOD,Mon Jul 27 12:05:37 NZST 2015,%@foo.com)
  *
- *     --bind(rob,GOOD,Mon Jul 27 12:05:37 NZST 2015,%@foo.com)
  * }</pre>
  *
  * @param <T> the entity bean type (normal entity bean type e.g. Customer)
@@ -280,7 +264,7 @@ public abstract class TQRootBean<T, R> {
    */
   @SafeVarargs
   public final R select(TQProperty<R>... properties) {
-    ((SpiQueryFetch)query).selectProperties(properties(properties));
+    ((SpiQueryFetch) query).selectProperties(properties(properties));
     return root;
   }
 

From 907b182931372719924674de312f8d63319da69b Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 23:45:05 +1300
Subject: [PATCH 127/447] [maven-release-plugin] prepare release
 ebean-parent-12.7.2

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 79962ff51..1aed817f7 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index b86469ddd..0646db6e7 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.2</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index c47601c85..4cec55855 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.7.2-SNAPSHOT</version>
+        <version>12.7.2</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index f0db31343..ae4039137 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index bab9e7624..9eb1f764a 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.2</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 90f3270e4..3aada00a8 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 76e5ced23..e27b3dfce 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 620a1de73..42fa08b21 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.2</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index d8acdb157..583dc83a3 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 52ab4f7c0..86a5bf64c 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index cf4f83208..eef70ea0f 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 32810609f..246de76b3 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index e1bf6282a..77f88c51e 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 4373c3275..7e72e1e3c 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2-SNAPSHOT</version>
+      <version>12.7.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 6edda0cd5..9448cc54e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.7.2-SNAPSHOT</version>
+  <version>12.7.2</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.7.2</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 9f5303d0f..be2082334 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2-SNAPSHOT</version>
+    <version>12.7.2</version>
   </parent>
 
   <name>querybean generator</name>

From e4d0341e67201d9107dc694f06967ed1ea27792f Mon Sep 17 00:00:00 2001
From: robin <robin.bygrave@gmail.com>
Date: Mon, 1 Mar 2021 23:45:15 +1300
Subject: [PATCH 128/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 1aed817f7..c073c2699 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 0646db6e7..4ced5a224 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.2</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 4cec55855..2293b2db9 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.7.2</version>
+        <version>12.7.3-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index ae4039137..9e7a3c6eb 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 9eb1f764a..b493318d1 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.2</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 3aada00a8..571f4e090 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index e27b3dfce..4c33334e1 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 42fa08b21..0ae68425e 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.2</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 583dc83a3..99fe84dca 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 86a5bf64c..132ef56e2 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index eef70ea0f..476ee7c2a 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 246de76b3..4b5e47899 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 77f88c51e..7356b26ff 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 7e72e1e3c..8e4df4f39 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.2</version>
+      <version>12.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 9448cc54e..8e06ae121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.7.2</version>
+  <version>12.7.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.7.2</tag>
+    <tag>ebean-parent-12.6.5</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index be2082334..bc6fc7019 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.2</version>
+    <version>12.7.3-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 79dde23ec6b8e022e5b510e04288dd9929e1d5c9 Mon Sep 17 00:00:00 2001
From: Ben Kempe <ben@vowel.ai>
Date: Mon, 1 Mar 2021 12:16:22 +0100
Subject: [PATCH 129/447] added tests for findNative fetches

---
 .../org/tests/query/TestQueryFindNative.java  | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java
index ff4acac9d..7cc4ac9c6 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java
@@ -246,4 +246,101 @@ public class TestQueryFindNative extends BaseTestCase {
     }
   }
 
+
+  @Test
+  public void findNativeWithOneFetchQuery() {
+
+    ResetBasicData.reset();
+
+    String sql = "select * from o_customer";
+
+    LoggedSqlCollector.start();
+
+    List<Customer> result = DB.findNative(Customer.class, sql)
+            .fetchQuery("contacts")
+            .findList();
+
+    assertThat(result).isNotEmpty();
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    if (isH2()) {
+      assertThat(loggedSql).hasSize(2);
+      assertThat(loggedSql.get(0)).contains("from o_customer");
+      assertThat(loggedSql.get(1)).contains("from contact");
+    }
+  }
+
+  @Test
+  public void findNativeWithOneFetch() {
+
+    ResetBasicData.reset();
+
+    String sql = "select * from o_customer";
+
+    LoggedSqlCollector.start();
+
+    List<Customer> result = DB.findNative(Customer.class, sql)
+            .fetch("contacts")
+            .findList();
+
+    assertThat(result).isNotEmpty();
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    if (isH2()) {
+      assertThat(loggedSql).hasSize(2);
+      assertThat(loggedSql.get(0)).contains("from o_customer");
+      assertThat(loggedSql.get(1)).contains("from contact");
+    }
+  }
+
+  @Test
+  public void findNativeWithMultipleFetchQuery() {
+
+    ResetBasicData.reset();
+
+    String sql = "select * from o_customer";
+
+    LoggedSqlCollector.start();
+
+    List<Customer> result = DB.findNative(Customer.class, sql)
+            .fetchQuery("orders")
+            .fetchQuery("contacts")
+            .findList();
+
+    assertThat(result).isNotEmpty();
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    if (isH2()) {
+      assertThat(loggedSql).hasSize(3);
+      assertThat(loggedSql.get(0)).contains("from o_customer");
+      assertThat(loggedSql).anyMatch(s -> s.contains("from o_order"));
+      assertThat(loggedSql).anyMatch(s -> s.contains("from contact"));
+    }
+  }
+
+  @Test
+  public void findNativeWithMultipleFetch() {
+
+    ResetBasicData.reset();
+
+    String sql = "select * from o_customer";
+
+    LoggedSqlCollector.start();
+
+    List<Customer> result = DB.findNative(Customer.class, sql)
+            .fetch("orders")
+            .fetch("contacts")
+            .findList();
+
+    assertThat(result).isNotEmpty();
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    if (isH2()) {
+      assertThat(loggedSql).hasSize(3);
+      assertThat(loggedSql.get(0)).contains("from o_customer");
+      assertThat(loggedSql).anyMatch(s -> s.contains("from o_order"));
+      assertThat(loggedSql).anyMatch(s -> s.contains("from contact"));
+    }
+  }
+
 }

From af4f70e3a7162cf2fe0bec0a955f6241cbfa3d6b Mon Sep 17 00:00:00 2001
From: Ben Kempe <ben@vowel.ai>
Date: Mon, 1 Mar 2021 13:21:05 +0100
Subject: [PATCH 130/447] add in(subQuery) support for query beans

---
 .../io/ebean/typequery/PBaseValueEqual.java   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java
index c102d9991..3883afe66 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java
@@ -1,5 +1,7 @@
 package io.ebean.typequery;
 
+import io.ebean.Query;
+
 import java.util.Collection;
 
 /**
@@ -224,4 +226,25 @@ public abstract class PBaseValueEqual<R, T> extends TQPropertyBase<R> {
     expr().in(_name, values);
     return _root;
   }
+
+  /**
+   * Is in the result of a subquery.
+   *
+   * @param subQuery values provided by a subQuery
+   * @return the root query bean instance
+   */
+  public final R in(Query<?> subQuery) {
+    expr().in(_name, subQuery);
+    return _root;
+  }
+
+  /**
+   * Is in the result of a subquery. Synonym for in().
+   *
+   * @param subQuery values provided by a subQuery
+   * @return the root query bean instance
+   */
+  public final R isIn(Query<?> subQuery) {
+    return in(subQuery);
+  }
 }

From f416309863f69b48126b25054fc4406c227753d2 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Mar 2021 14:44:54 +1300
Subject: [PATCH 131/447] No effective change - change DefaultOrmQuery methods
 to return Query<T> rather than DefaultOrmQuery<T>

This is no effective functional change but we do need to update the test OrmQueryPlanKeyTest to cast now.
---
 .../server/querydefn/DefaultOrmQuery.java     |  82 ++++++-------
 .../server/querydefn/OrmQueryPlanKeyTest.java | 113 +++++++++---------
 2 files changed, 97 insertions(+), 98 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index e19212e96..7a012d034 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -391,7 +391,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setUseDocStore(boolean useDocStore) {
+  public Query<T> setUseDocStore(boolean useDocStore) {
     this.useDocStore = useDocStore;
     return this;
   }
@@ -431,7 +431,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setAllowLoadErrors() {
+  public Query<T> setAllowLoadErrors() {
     this.allowLoadErrors = true;
     return this;
   }
@@ -452,21 +452,21 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> asOf(Timestamp asOfDateTime) {
+  public Query<T> asOf(Timestamp asOfDateTime) {
     this.temporalMode = (asOfDateTime != null) ? TemporalMode.AS_OF : TemporalMode.CURRENT;
     this.asOf = asOfDateTime;
     return this;
   }
 
   @Override
-  public DefaultOrmQuery<T> asDraft() {
+  public Query<T> asDraft() {
     this.temporalMode = TemporalMode.DRAFT;
     this.useBeanCache = CacheMode.OFF;
     return this;
   }
 
   @Override
-  public DefaultOrmQuery<T> setIncludeSoftDeletes() {
+  public Query<T> setIncludeSoftDeletes() {
     this.temporalMode = TemporalMode.SOFT_DELETED;
     return this;
   }
@@ -489,7 +489,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setRawSql(RawSql rawSql) {
+  public Query<T> setRawSql(RawSql rawSql) {
     this.rawSql = (SpiRawSql) rawSql;
     return this;
   }
@@ -802,12 +802,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> copy() {
+  public SpiQuery<T> copy() {
     return copy(server);
   }
 
   @Override
-  public DefaultOrmQuery<T> copy(SpiEbeanServer server) {
+  public SpiQuery<T> copy(SpiEbeanServer server) {
     DefaultOrmQuery<T> copy = new DefaultOrmQuery<>(beanDescriptor, server, expressionFactory);
     copy.transaction = transaction;
     copy.m2mIncludeJoin = m2mIncludeJoin;
@@ -955,7 +955,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setAutoTune(boolean autoTune) {
+  public Query<T> setAutoTune(boolean autoTune) {
     this.autoTune = autoTune;
     return this;
   }
@@ -971,21 +971,21 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> forUpdate() {
+  public Query<T> forUpdate() {
     return setForUpdateWithMode(LockWait.WAIT, LockType.DEFAULT);
   }
 
   @Override
-  public DefaultOrmQuery<T> forUpdateNoWait() {
+  public Query<T> forUpdateNoWait() {
     return setForUpdateWithMode(LockWait.NOWAIT, LockType.DEFAULT);
   }
 
   @Override
-  public DefaultOrmQuery<T> forUpdateSkipLocked() {
+  public Query<T> forUpdateSkipLocked() {
     return setForUpdateWithMode(LockWait.SKIPLOCKED, LockType.DEFAULT);
   }
 
-  private DefaultOrmQuery<T> setForUpdateWithMode(LockWait mode, LockType lockType) {
+  private Query<T> setForUpdateWithMode(LockWait mode, LockType lockType) {
     this.forUpdate = mode;
     this.lockType = lockType;
     this.useBeanCache = CacheMode.OFF;
@@ -1329,7 +1329,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setReadOnly(boolean readOnly) {
+  public Query<T> setReadOnly(boolean readOnly) {
     this.readOnly = readOnly;
     return this;
   }
@@ -1375,19 +1375,19 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setUseQueryCache(CacheMode useQueryCache) {
+  public Query<T> setUseQueryCache(CacheMode useQueryCache) {
     this.useQueryCache = useQueryCache;
     return this;
   }
 
   @Override
-  public DefaultOrmQuery<T> setLoadBeanCache(boolean loadBeanCache) {
+  public Query<T> setLoadBeanCache(boolean loadBeanCache) {
     this.useBeanCache = CacheMode.PUT;
     return this;
   }
 
   @Override
-  public DefaultOrmQuery<T> setTimeout(int secs) {
+  public Query<T> setTimeout(int secs) {
     this.timeout = secs;
     return this;
   }
@@ -1413,19 +1413,19 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> select(String columns) {
+  public Query<T> select(String columns) {
     detail.select(columns);
     return this;
   }
 
   @Override
-  public DefaultOrmQuery<T> select(FetchGroup<T> fetchGroup) {
+  public Query<T> select(FetchGroup<T> fetchGroup) {
     this.detail = ((SpiFetchGroup<T>) fetchGroup).detail();
     return this;
   }
 
   @Override
-  public DefaultOrmQuery<T> fetch(String property) {
+  public Query<T> fetch(String property) {
     return fetch(property, null, null);
   }
 
@@ -1444,12 +1444,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> fetch(String property, FetchConfig joinConfig) {
+  public Query<T> fetch(String property, FetchConfig joinConfig) {
     return fetch(property, null, joinConfig);
   }
 
   @Override
-  public DefaultOrmQuery<T> fetch(String property, String columns) {
+  public Query<T> fetch(String property, String columns) {
     return fetch(property, columns, null);
   }
 
@@ -1469,7 +1469,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> fetch(String property, String columns, FetchConfig config) {
+  public Query<T> fetch(String property, String columns, FetchConfig config) {
     detail.fetch(property, columns, config);
     return this;
   }
@@ -1633,7 +1633,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setParameter(Object value) {
+  public Query<T> setParameter(Object value) {
     if (bindParams == null) {
       bindParams = new BindParams();
     }
@@ -1642,7 +1642,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setParameters(Object... values) {
+  public Query<T> setParameters(Object... values) {
     if (bindParams == null) {
       bindParams = new BindParams();
     }
@@ -1656,7 +1656,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * have in the query.
    */
   @Override
-  public DefaultOrmQuery<T> setParameter(int position, Object value) {
+  public Query<T> setParameter(int position, Object value) {
     if (bindParams == null) {
       bindParams = new BindParams();
     }
@@ -1668,7 +1668,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * Set a named bind parameter. Named parameters have a colon to prefix the name.
    */
   @Override
-  public DefaultOrmQuery<T> setParameter(String name, Object value) {
+  public Query<T> setParameter(String name, Object value) {
     if (namedParams != null) {
       ONamedParam param = namedParams.get(name);
       if (param != null) {
@@ -1714,12 +1714,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   @Deprecated
-  public DefaultOrmQuery<T> orderBy(String orderByClause) {
+  public Query<T> orderBy(String orderByClause) {
     return order(orderByClause);
   }
 
   @Override
-  public DefaultOrmQuery<T> order(String orderByClause) {
+  public Query<T> order(String orderByClause) {
     if (orderByClause == null || orderByClause.trim().isEmpty()) {
       this.orderBy = null;
     } else {
@@ -1730,12 +1730,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   @Deprecated
-  public DefaultOrmQuery<T> setOrderBy(OrderBy<T> orderBy) {
+  public Query<T> setOrderBy(OrderBy<T> orderBy) {
     return setOrder(orderBy);
   }
 
   @Override
-  public DefaultOrmQuery<T> setOrder(OrderBy<T> orderBy) {
+  public Query<T> setOrder(OrderBy<T> orderBy) {
     this.orderBy = orderBy;
     if (orderBy != null) {
       orderBy.setQuery(this);
@@ -1767,13 +1767,13 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * Internally set to use SQL DISTINCT on the query but still have id property included.
    */
   @Override
-  public DefaultOrmQuery<T> setDistinct(boolean distinct) {
+  public Query<T> setDistinct(boolean distinct) {
     this.distinct = distinct;
     return this;
   }
 
   @Override
-  public DefaultOrmQuery<T> setCountDistinct(CountDistinctOrder countDistinctOrder) {
+  public Query<T> setCountDistinct(CountDistinctOrder countDistinctOrder) {
     this.countDistinctOrder = countDistinctOrder;
     return this;
   }
@@ -1824,7 +1824,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setDisableLazyLoading(boolean disableLazyLoading) {
+  public Query<T> setDisableLazyLoading(boolean disableLazyLoading) {
     this.disableLazyLoading = disableLazyLoading;
     return this;
   }
@@ -1840,7 +1840,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setFirstRow(int firstRow) {
+  public Query<T> setFirstRow(int firstRow) {
     this.firstRow = firstRow;
     return this;
   }
@@ -1851,7 +1851,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setMaxRows(int maxRows) {
+  public Query<T> setMaxRows(int maxRows) {
     this.maxRows = maxRows;
     return this;
   }
@@ -1862,7 +1862,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setMapKey(String mapKey) {
+  public Query<T> setMapKey(String mapKey) {
     this.mapKey = mapKey;
     return this;
   }
@@ -1873,7 +1873,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> setId(Object id) {
+  public Query<T> setId(Object id) {
     if (id == null) {
       throw new NullPointerException("The id is null");
     }
@@ -1887,7 +1887,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> where(Expression expression) {
+  public Query<T> where(Expression expression) {
     where().add(expression);
     return this;
   }
@@ -1917,7 +1917,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> having(Expression expression) {
+  public Query<T> having(Expression expression) {
     having().add(expression);
     return this;
   }
@@ -2043,7 +2043,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public DefaultOrmQuery<T> alias(String alias) {
+  public Query<T> alias(String alias) {
     this.rootTableAlias = alias;
     return this;
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
index 0c2f07e98..305f9122b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java
@@ -18,8 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
-
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private DefaultOrmQuery<Customer> query() {
     return (DefaultOrmQuery) server().find(Customer.class);
   }
@@ -85,41 +84,40 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_firstRowsDifferent() {
 
-    CQueryPlanKey key1 = query().setFirstRow(10).createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setFirstRow(10));
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
 
-    key1 = query().setFirstRow(10).createQueryPlanKey();
-    key2 = query().setFirstRow(9).createQueryPlanKey();
+    key1 = planKey(query().setFirstRow(10));
+    key2 = planKey(query().setFirstRow(9));
     assertDifferent(key1, key2);
 
-    key1 = query().createQueryPlanKey();
-    key2 = query().setFirstRow(9).createQueryPlanKey();
+    key1 = planKey(query());
+    key2 = planKey(query().setFirstRow(9));
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_maxRowsDifferent() {
 
-    CQueryPlanKey key1 = query().setMaxRows(10).createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setMaxRows(10));
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
 
-    key1 = query().setMaxRows(10).createQueryPlanKey();
-    key2 = query().setMaxRows(9).createQueryPlanKey();
+    key1 = planKey(query().setMaxRows(10));
+    key2 = planKey(query().setMaxRows(9));
     assertDifferent(key1, key2);
 
-    key1 = query().createQueryPlanKey();
-    key2 = query().setMaxRows(9).createQueryPlanKey();
+    key1 = planKey(query());
+    key2 = planKey(query().setMaxRows(9));
     assertDifferent(key1, key2);
-
   }
 
   @Test
   public void equals_when_firstRowsMaxRowsSame() {
 
-    CQueryPlanKey key1 = query().setMaxRows(10).setFirstRow(20).createQueryPlanKey();
-    CQueryPlanKey key2 = query().setFirstRow(20).setMaxRows(10).createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setMaxRows(10).setFirstRow(20));
+    CQueryPlanKey key2 = planKey(query().setFirstRow(20).setMaxRows(10));
     assertSame(key1, key2);
   }
 
@@ -132,43 +130,43 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffOrderByNull() {
 
-    CQueryPlanKey key1 = query().order("id").createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().order("id"));
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
 
-    key1 = ((DefaultOrmQuery) query().order().asc("id")).createQueryPlanKey();
-    key2 = query().createQueryPlanKey();
+    key1 = planKey(query().order().asc("id"));
+    key2 = planKey(query());
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_orderBySame() {
 
-    CQueryPlanKey key1 = query().order("id, name").createQueryPlanKey();
-    CQueryPlanKey key2 = query().order("id, name").createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().order("id, name"));
+    CQueryPlanKey key2 = planKey(query().order("id, name"));
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffDistinct() {
 
-    CQueryPlanKey key1 = query().setDistinct(true).createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setDistinct(true));
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_sameDistinct() {
 
-    CQueryPlanKey key1 = query().setDistinct(true).createQueryPlanKey();
-    CQueryPlanKey key2 = query().setDistinct(true).createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setDistinct(true));
+    CQueryPlanKey key2 = planKey(query().setDistinct(true));
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_useDocStore() {
-    CQueryPlanKey key1 = query().setUseDocStore(true).createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setUseDocStore(true));
+    CQueryPlanKey key2 = planKey(query());
 
     assertDifferent(key1, key2);
   }
@@ -176,79 +174,78 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
   @Test
   public void equals_when_diffMapKey() {
 
-    CQueryPlanKey key1 = query().setMapKey("name").createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setMapKey("name"));
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
 
-    CQueryPlanKey key3 = query().setMapKey("email").createQueryPlanKey();
+    CQueryPlanKey key3 = planKey(query().setMapKey("email"));
     assertDifferent(key1, key3);
 
-    CQueryPlanKey key4 = query().setMapKey("name").createQueryPlanKey();
+    CQueryPlanKey key4 = planKey(query().setMapKey("name"));
     assertSame(key1, key4);
   }
 
   @Test
   public void equals_when_diffIdNull() {
 
-    CQueryPlanKey key1 = query().setId(42).createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setId(42));
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
   }
 
   @Test
   public void equals_when_idBothGiven() {
 
-    CQueryPlanKey key1 = query().setId(42).createQueryPlanKey();
-    CQueryPlanKey key2 = query().setId(23).createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().setId(42));
+    CQueryPlanKey key2 = planKey(query().setId(23));
     assertSame(key1, key2);
   }
 
   @Test
   public void equals_when_diffTemporalMode() {
 
-    CQueryPlanKey key1 = query().createQueryPlanKey();
-    CQueryPlanKey key2 = query().asDraft().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query());
+    CQueryPlanKey key2 = planKey(query().asDraft());
     assertDifferent(key1, key2);
 
-    CQueryPlanKey key3 = query().asOf(new Timestamp(System.currentTimeMillis())).createQueryPlanKey();
+    CQueryPlanKey key3 = planKey(query().asOf(new Timestamp(System.currentTimeMillis())));
     assertDifferent(key1, key3);
 
-    CQueryPlanKey key4 = query().setIncludeSoftDeletes().createQueryPlanKey();
+    CQueryPlanKey key4 = planKey(query().setIncludeSoftDeletes());
     assertDifferent(key1, key4);
   }
 
   @Test
   public void equals_when_diffForUpdate() {
 
-    CQueryPlanKey key1 = query().forUpdate().createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().forUpdate());
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
 
-    CQueryPlanKey key3 = query().forUpdateNoWait().createQueryPlanKey();
+    CQueryPlanKey key3 = planKey(query().forUpdateNoWait());
     assertDifferent(key1, key3);
 
-    CQueryPlanKey key4 = query().forUpdateSkipLocked().createQueryPlanKey();
+    CQueryPlanKey key4 = planKey(query().forUpdateSkipLocked());
     assertDifferent(key1, key4);
 
-    CQueryPlanKey key5 = query().forUpdate().createQueryPlanKey();
+    CQueryPlanKey key5 = planKey(query().forUpdate());
     assertSame(key1, key5);
   }
 
   @Test
   public void equals_when_diffRootAliasNull() {
 
-    CQueryPlanKey key1 = query().alias("alias").createQueryPlanKey();
-    CQueryPlanKey key2 = query().createQueryPlanKey();
+    CQueryPlanKey key1 = planKey(query().alias("alias"));
+    CQueryPlanKey key2 = planKey(query());
     assertDifferent(key1, key2);
 
-    CQueryPlanKey key3 = query().alias("diff").createQueryPlanKey();
+    CQueryPlanKey key3 = planKey(query().alias("diff"));
     assertDifferent(key1, key3);
 
-    CQueryPlanKey key4 = query().alias("alias").createQueryPlanKey();
+    CQueryPlanKey key4 = planKey(query().alias("alias"));
     assertSame(key1, key4);
   }
 
-
   private DefaultOrmQuery<Customer> list_id_eq_42() {
     return (DefaultOrmQuery<Customer>) server().find(Customer.class)
       .where().eq("id", 42).query();
@@ -298,7 +295,6 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     assertDifferent(key1, key4);
   }
 
-
   @Test
   public void equals_when_sameHaving() {
 
@@ -309,7 +305,7 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
 
   @Test
   public void equals_when_manualId_andSelectClause() {
-    DefaultOrmQuery<Customer> q1 = query().select("name");
+    DefaultOrmQuery<Customer> q1 = (DefaultOrmQuery<Customer>)query().select("name");
     q1.setManualId();
 
     assertDifferent(q1, query().select("name"));
@@ -327,16 +323,19 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest {
     return planKey(id.query());
   }
 
+  @SuppressWarnings({"rawtypes"})
   private CQueryPlanKey planKey(Query<Customer> query) {
     return ((DefaultOrmQuery) query).createQueryPlanKey();
   }
 
-  private void assertDifferent(DefaultOrmQuery q1, DefaultOrmQuery q2) {
-    assertDifferent(q1.createQueryPlanKey(), q2.createQueryPlanKey());
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  private void assertDifferent(Query q1, Query q2) {
+    assertDifferent(planKey(q1), planKey(q2));
   }
 
-  private void assertSame(DefaultOrmQuery q1, DefaultOrmQuery q2) {
-    assertSame(q1.createQueryPlanKey(), q2.createQueryPlanKey());
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  private void assertSame(Query q1, Query q2) {
+    assertSame(planKey(q1), planKey(q2));
   }
 
   private void assertDifferent(CQueryPlanKey key1, CQueryPlanKey key2) {

From fe62ad2ea2c251f7135658f394505bd4058759af Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Mar 2021 15:28:17 +1300
Subject: [PATCH 132/447] #2184 - Initial refactor of DefaultOrmQuery to
 support 2184

- Add fetchInternal() and point fetchQuery() fetchLazy() and fetchCache() to it
- Move the fetch() methods so they are located together
---
 .../server/querydefn/DefaultOrmQuery.java     | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 7a012d034..cd1782ad7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1425,52 +1425,56 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   }
 
   @Override
-  public Query<T> fetch(String property) {
-    return fetch(property, null, null);
+  public Query<T> fetch(String path) {
+    return fetch(path, null, null);
   }
 
   @Override
-  public Query<T> fetchQuery(String property) {
-    return fetch(property, null, FETCH_QUERY);
-  }
-
-  public Query<T> fetchCache(String property) {
-    return fetch(property, null, FETCH_CACHE);
+  public Query<T> fetch(String path, FetchConfig joinConfig) {
+    return fetch(path, null, joinConfig);
   }
 
   @Override
-  public Query<T> fetchLazy(String property) {
-    return fetch(property, null, FETCH_LAZY);
+  public Query<T> fetch(String path, String properties) {
+    return fetch(path, properties, null);
   }
 
   @Override
-  public Query<T> fetch(String property, FetchConfig joinConfig) {
-    return fetch(property, null, joinConfig);
+  public Query<T> fetch(String path, String properties, FetchConfig config) {
+    return fetchInternal(path, properties, config);
   }
 
   @Override
-  public Query<T> fetch(String property, String columns) {
-    return fetch(property, columns, null);
+  public Query<T> fetchQuery(String path) {
+    return fetchInternal(path, null, FETCH_QUERY);
+  }
+
+  public Query<T> fetchCache(String path) {
+    return fetchInternal(path, null, FETCH_CACHE);
   }
 
   @Override
-  public Query<T> fetchQuery(String property, String columns) {
-    return fetch(property, columns, FETCH_QUERY);
+  public Query<T> fetchLazy(String path) {
+    return fetchInternal(path, null, FETCH_LAZY);
   }
 
   @Override
-  public Query<T> fetchCache(String property, String columns) {
-    return fetch(property, columns, FETCH_CACHE);
+  public Query<T> fetchQuery(String path, String properties) {
+    return fetchInternal(path, properties, FETCH_QUERY);
   }
 
   @Override
-  public Query<T> fetchLazy(String property, String columns) {
-    return fetch(property, columns, FETCH_LAZY);
+  public Query<T> fetchCache(String path, String properties) {
+    return fetchInternal(path, properties, FETCH_CACHE);
   }
 
   @Override
-  public Query<T> fetch(String property, String columns, FetchConfig config) {
-    detail.fetch(property, columns, config);
+  public Query<T> fetchLazy(String path, String properties) {
+    return fetchInternal(path, properties, FETCH_LAZY);
+  }
+
+  private Query<T> fetchInternal(String path, String properties, FetchConfig config) {
+    detail.fetch(path, properties, config);
     return this;
   }
 

From 81e445e386496a9c76e011f0bbdfcf283c19314a Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 2 Mar 2021 15:47:07 +1300
Subject: [PATCH 133/447] #2184 - Fix for findNative() with fetch() - convert
 fetch to fetchQuery with nativeSql

When using nativeSql (think of it as the "root query") we can't use "fetch joins" (FetchConfig.ofDefault()) as that means to prefer to use a SQL JOIN. In this nativeSql case we need to effectively automatically convert fetch() to fetchQuery()
---
 .../ebeaninternal/server/querydefn/DefaultOrmQuery.java   | 4 ++++
 .../test/java/org/tests/query/TestQueryFindNative.java    | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index cd1782ad7..6f72febb9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1441,6 +1441,10 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public Query<T> fetch(String path, String properties, FetchConfig config) {
+    if (nativeSql != null && (config == null || config.isJoin())) {
+      // can't use fetch join with nativeSql (as the root query)
+      config = FETCH_QUERY;
+    }
     return fetchInternal(path, properties, config);
   }
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java
index 7cc4ac9c6..8e11d3328 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java
@@ -2,6 +2,7 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
+import io.ebean.FetchConfig;
 import io.ebean.PagedList;
 import org.assertj.core.util.Lists;
 import org.ebeantest.LoggedSqlCollector;
@@ -280,7 +281,7 @@ public class TestQueryFindNative extends BaseTestCase {
     LoggedSqlCollector.start();
 
     List<Customer> result = DB.findNative(Customer.class, sql)
-            .fetch("contacts")
+            .fetch("contacts", "firstName, lastName")
             .findList();
 
     assertThat(result).isNotEmpty();
@@ -289,7 +290,7 @@ public class TestQueryFindNative extends BaseTestCase {
     if (isH2()) {
       assertThat(loggedSql).hasSize(2);
       assertThat(loggedSql.get(0)).contains("from o_customer");
-      assertThat(loggedSql.get(1)).contains("from contact");
+      assertThat(loggedSql.get(1)).contains("select t0.customer_id, t0.id, t0.first_name, t0.last_name from contact t0 where");
     }
   }
 
@@ -328,8 +329,9 @@ public class TestQueryFindNative extends BaseTestCase {
     LoggedSqlCollector.start();
 
     List<Customer> result = DB.findNative(Customer.class, sql)
+            // with nativeSql fetch (default) are converted to fetchQuery()
             .fetch("orders")
-            .fetch("contacts")
+            .fetch("contacts", FetchConfig.ofDefault())
             .findList();
 
     assertThat(result).isNotEmpty();

From ef1143bb702822654d40b4e05312e4ada477c7a0 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 2 Mar 2021 15:26:29 +0100
Subject: [PATCH 134/447] FIX: orderBy does not work when used on formula
 property or in conjunction with "exists" query

---
 .../server/query/CQueryBuilder.java           | 12 +++++--
 .../server/querydefn/DefaultOrmQuery.java     |  9 +++++
 .../java/org/tests/basic/TestFetchId.java     | 36 +++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index ab008a5cf..1162e914d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -616,11 +616,19 @@ class CQueryBuilder {
         if (request.isInlineCountDistinct()) {
           sb.append(")");
         }
-        if (distinct && dbOrderBy != null && !query.isSingleAttribute()) {
+        if (distinct && dbOrderBy != null) {
           // add the orderBy columns to the select clause (due to distinct)
           final OrderBy<?> orderBy = query.getOrderBy();
           if (orderBy != null && orderBy.supportsSelect()) {
-            sb.append(", ").append(DbOrderByTrim.trim(dbOrderBy));
+            String trimmed = DbOrderByTrim.trim(dbOrderBy);
+            if (query.isSingleAttribute() && trimmed.equals(select.getSelectSql())) {
+              // NOP, already in SQL
+              // TODO: what to do if we select("id").orderBy("prop,id")?
+              // Can we live with a query like "select t0.id, t0.prop, t0.id from"
+              // or should we elliminate the second "t0.id" from select
+            } else {
+              sb.append(", ").append(trimmed);
+            }
           }
         }
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 6f72febb9..e6eafc0b8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -53,6 +53,7 @@ import io.ebeaninternal.server.deploy.BeanNaturalKey;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
+import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.expression.DefaultExpressionList;
 import io.ebeaninternal.server.expression.IdInExpression;
 import io.ebeaninternal.server.expression.SimpleExpression;
@@ -537,6 +538,14 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (havingExpressions != null) {
       havingExpressions.containsMany(beanDescriptor, manyWhereJoins);
     }
+    if (orderBy != null) {
+      for (Property orderProperty : orderBy.getProperties()) {
+        ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(orderProperty.getProperty());
+        if (elProp != null && elProp.containsFormulaWithJoin()) {
+          manyWhereJoins.addFormulaWithJoin(orderProperty.getProperty());
+        }
+      }
+    }
   }
 
   /**
diff --git a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java
index cf207995c..c830208d5 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java
@@ -1,10 +1,14 @@
 package org.tests.basic;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.FutureIds;
 import io.ebean.Query;
+import io.ebeantest.LoggedSql;
+
 import org.tests.model.basic.Order;
+import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
@@ -36,4 +40,36 @@ public class TestFetchId extends BaseTestCase {
     List<Object> idList = futureIds.get();
     assertThat(idList).isNotEmpty();
   }
+  
+  @Test
+  public void testFetchIdWithExists() throws InterruptedException, ExecutionException {
+
+    ResetBasicData.reset();
+
+    Query<OrderDetail> subQuery = Ebean.find(OrderDetail.class)
+        .alias("sq")
+        .where().raw("details.id = sq.id").query();
+    Query<Order> query = Ebean.find(Order.class)
+      .where().exists(subQuery)
+      .orderBy("orderDate").query();
+
+    List<Object> ids = query.findIds();
+    // TODO: assert(query.getGeneratedSql())
+    assertThat(ids).isNotEmpty();
+    FutureIds<Order> futureIds = query.findFutureIds();
+
+    // wait for all the id's to be fetched
+    List<Object> idList = futureIds.get();
+    assertThat(idList).isNotEmpty();
+  }
+  
+  @Test
+  public void testFetchIdWithOrderFormula() throws InterruptedException, ExecutionException {
+
+    ResetBasicData.reset();
+
+    Query<Order> query = DB.find(Order.class).orderBy("totalItems");
+    query.findIds();
+    // TODO: assert(query.getGeneratedSql())
+  }
 }

From c86f965d36a280f5a323aa7873a726bbd87d4994 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 4 Mar 2021 08:55:11 +1300
Subject: [PATCH 135/447] #2187 - Improve error message thrown when @JoinTable
 @JoinColumn not satisfied.

Added " or a @JoinColumn needs an explicit referencedColumnName specified?";
---
 .../java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index a2a091ef6..739021196 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -609,7 +609,8 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
 
     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?";
+      + " Perhaps using a @JoinColumn with the name/referencedColumnName attributes swapped? "
+      + " or a @JoinColumn needs an explicit referencedColumnName specified?";
     throw new PersistenceException(msg);
   }
 }

From 2bb5a85bd6e78b435fb21c9d16cb5f3f36f01210 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 10 Mar 2021 00:18:35 +1300
Subject: [PATCH 136/447] ENH: Add Query findEach() with batch consumer

This is a variation of findEach() that makes it easy to have a batch consumer processing a large result in batches.  For example, process in batches of 50 beans.

Note that the last batch consumed/processed will often have less than the batch size.
---
 .../main/java/io/ebean/ExpressionList.java    |   7 +
 .../main/java/io/ebean/ExtendedServer.java    |   7 +
 ebean-api/src/main/java/io/ebean/Query.java   |  21 +-
 .../server/core/DefaultServer.java            |  12 +
 .../server/core/OrmQueryRequest.java          |  18 ++
 .../server/core/SpiOrmQueryRequest.java       |   7 +-
 .../expression/DefaultExpressionList.java     |   5 +
 .../server/expression/JunctionExpression.java |   5 +
 .../server/query/DefaultFetchGroupQuery.java  |   5 +
 .../server/querydefn/DefaultOrmQuery.java     |   5 +
 .../ebeaninternal/api/TDSpiEbeanServer.java   |   4 +
 .../java/io/ebean/typequery/TQRootBean.java   |  33 ++-
 .../java/org/querytest/QCustomerTest.java     | 224 +++++++++++-------
 13 files changed, 252 insertions(+), 101 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index 7e4e0f164..72f1c06f9 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -307,6 +307,13 @@ public interface ExpressionList<T> {
    */
   void findEach(Consumer<T> consumer);
 
+  /**
+   * Execute findEach with a batch consumer.
+   *
+   * @see Query#findEach(int, Consumer)
+   */
+  void findEach(int batch, Consumer<List<T>> consumer);
+
   /**
    * Execute the query processing the beans one at a time with the ability to
    * stop processing before reading all the beans.
diff --git a/ebean-api/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
index 06ee85c2b..9a7e62e0c 100644
--- a/ebean-api/src/main/java/io/ebean/ExtendedServer.java
+++ b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
@@ -159,6 +159,13 @@ public interface ExtendedServer {
    */
   <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
 
+  /**
+   * Execute findEach with batch consumer.
+   *
+   * @see Query#findEach(int, Consumer)
+   */
+  <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t);
+
   /**
    * Execute the query visiting the each bean one at a time.
    * <p>
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index 24a8445be..db7bf8cb9 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -810,7 +810,7 @@ public interface Query<T> {
    * </p>
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Consumer interface which is better suited to use with Java8 closures.
+   * iterator uses the Consumer interface which is better suited to use with closures.
    * </p>
    * <pre>{@code
    *
@@ -829,6 +829,21 @@ public interface Query<T> {
    */
   void findEach(Consumer<T> consumer);
 
+  /**
+   * Execute findEach streaming query batching the results for consuming.
+   * <p>
+   * This query execution will stream the results and is suited to consuming
+   * large numbers of results from the database.
+   * <p>
+   * Typically we use this batch consumer when we want to do further processing on
+   * the beans and want to do that processing in batch form, for example - 100 at
+   * a time.
+   *
+   * @param batch    The number of beans processed in the batch
+   * @param consumer Process the batch of beans
+   */
+  void findEach(int batch, Consumer<List<T>> consumer);
+
   /**
    * Execute the query using callbacks to a visitor to process the resulting
    * beans one at a time.
@@ -839,12 +854,12 @@ public interface Query<T> {
    * </p>
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Predicate (SAM) interface which is better suited to use with Java8 closures.
+   * iterator uses the Predicate interface which is better suited to use with closures.
    * </p>
    * <pre>{@code
    *
    *  DB.find(Customer.class)
-   *     .fetch("contacts", FetchConfig.ofQuery(2))
+   *     .fetchQuery("contacts")
    *     .where().eq("status", Status.NEW)
    *     .order().asc("id")
    *     .setMaxRows(2000)
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index c6665a757..a51bff04d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1446,6 +1446,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     // no try finally - findEach guarantee's cleanup of the transaction if required
   }
 
+  @Override
+  public <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
+//    if (request.isUseDocStore()) {
+//      docStore().findEach(request, consumer);
+//      return;
+//    }
+    request.initTransIfRequired();
+    request.findEach(batch, consumer);
+    // no try finally - findEach guarantee's cleanup of the transaction if required
+  }
+
   @Override
   public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction t) {
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 2b97c1140..9b0e1235e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -430,6 +430,24 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     }
   }
 
+  @Override
+  public void findEach(int batch, Consumer<List<T>> batchConsumer) {
+    final List<T> buffer = new ArrayList<>(batch);
+    try (QueryIterator<T> it = queryEngine.findIterate(this)) {
+      while (it.hasNext()) {
+        buffer.add(it.next());
+        if (buffer.size() >= batch) {
+          batchConsumer.accept(buffer);
+          buffer.clear();
+        }
+      }
+      if (!buffer.isEmpty()) {
+        // consume the remainder
+        batchConsumer.accept(buffer);
+      }
+    }
+  }
+
   @Override
   public void findEachWhile(Predicate<T> consumer) {
     try (QueryIterator<T> it = queryEngine.findIterate(this)) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index 8dcd03d49..41cfff829 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -80,10 +80,15 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
   <A> List<A> findIds();
 
   /**
-   * Execute the find returning a QueryIterator and visitor pattern.
+   * Execute findEach iterating results one bean at a time.
    */
   void findEach(Consumer<T> consumer);
 
+  /**
+   * Execute findEach with a batch consumer.
+   */
+  void findEach(int batch, Consumer<List<T>> batchConsumer);
+
   /**
    * Execute the find returning a QueryIterator and visitor pattern.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 13c111713..c034b2992 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -436,6 +436,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     query.findEach(consumer);
   }
 
+  @Override
+  public void findEach(int batch, Consumer<List<T>> consumer) {
+    query.findEach(batch, consumer);
+  }
+
   @Override
   public void findEachWhile(Predicate<T> consumer) {
     query.findEachWhile(consumer);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 4f1784f11..f048f1163 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -446,6 +446,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     exprList.findEach(consumer);
   }
 
+  @Override
+  public void findEach(int batch, Consumer<List<T>> consumer) {
+    exprList.findEach(batch, consumer);
+  }
+
   @Override
   public void findEachWhile(Predicate<T> consumer) {
     exprList.findEachWhile(consumer);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 5da152185..5b2ed841a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -263,6 +263,11 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
+  @Override
+  public void findEach(int batch, Consumer<List<T>> consumer) {
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
+  }
+
   @Override
   public void findEachWhile(Predicate<T> consumer) {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 6f72febb9..074f364bc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1551,6 +1551,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     server.findEach(this, consumer, transaction);
   }
 
+  @Override
+  public void findEach(int batch, Consumer<List<T>> consumer) {
+    server.findEach(this, batch, consumer, transaction);
+  }
+
   @Override
   public QueryIterator<T> findIterate() {
     return server.findIterate(this, transaction);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 6305fdb08..09e75825b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -675,6 +675,10 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
   }
 
+  @Override
+  public <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t) {
+  }
+
   @Override
   public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction) {
   }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 4deab6037..654e35e9d 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -1794,24 +1794,19 @@ public abstract class TQRootBean<T, R> {
    * This method is appropriate to process very large query results as the
    * beans are consumed one at a time and do not need to be held in memory
    * (unlike #findList #findSet etc)
-   * </p>
    * <p>
    * Note that internally Ebean can inform the JDBC driver that it is expecting larger
    * resultSet and specifically for MySQL this hint is required to stop it's JDBC driver
    * from buffering the entire resultSet. As such, for smaller resultSets findList() is
    * generally preferable.
-   * </p>
    * <p>
    * Compared with #findEachWhile this will always process all the beans where as
    * #findEachWhile provides a way to stop processing the query result early before
    * all the beans have been read.
-   * </p>
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the QueryEachConsumer (SAM) interface which is better suited to use
-   * with Java8 closures.
-   * </p>
-   * <p>
+   * iterator uses the Consumer interface which is better suited to use with closures.
+   *
    * <pre>{@code
    *
    *  new QCustomer()
@@ -1831,16 +1826,30 @@ public abstract class TQRootBean<T, R> {
     query.findEach(consumer);
   }
 
+  /**
+   * Execute findEach streaming query batching the results for consuming.
+   * <p>
+   * This query execution will stream the results and is suited to consuming
+   * large numbers of results from the database.
+   * <p>
+   * Typically we use this batch consumer when we want to do further processing on
+   * the beans and want to do that processing in batch form, for example - 100 at
+   * a time.
+   *
+   * @param batch    The number of beans processed in the batch
+   * @param consumer Process the batch of beans
+   */
+  public void findEach(int batch, Consumer<List<T>> consumer) {
+    query.findEach(batch, consumer);
+  }
+
   /**
    * Execute the query using callbacks to a visitor to process the resulting
    * beans one at a time.
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the QueryEachWhileConsumer (SAM) interface which is better suited to use
-   * with Java8 closures.
-   * </p>
-   * <p>
-   * <p>
+   * iterator uses the Predicate interface which is better suited to use with closures.
+   *
    * <pre>{@code
    *
    *  new QCustomer()
diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
index 73c7a9dbd..56aec1c51 100644
--- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
+++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
@@ -38,6 +38,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.StringJoiner;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -82,14 +83,67 @@ public class QCustomerTest {
   public void findSingleAttribute() {
 
     List<String> names = new QCustomer()
-        .setDistinct(true)
-        .select(QCustomer.alias().name)
-        .status.equalTo(Customer.Status.BAD)
-        .findSingleAttributeList();
+      .setDistinct(true)
+      .select(QCustomer.alias().name)
+      .status.equalTo(Customer.Status.BAD)
+      .findSingleAttributeList();
 
     assertThat(names).isNotNull();
   }
 
+  @Test
+  public void findEachBatch() {
+
+    for (int i = 0; i < 22; i++) {
+      Customer customer = new Customer();
+      customer.setStatus(Customer.Status.MIDDLING);
+      customer.setName("findEachBatch_a_" + i);
+      customer.save();
+    }
+
+    final List<Integer> batchSizes = new ArrayList<>();
+
+    final AtomicInteger counter = new AtomicInteger();
+    new QCustomer()
+      .status.eq(Customer.Status.MIDDLING)
+      .name.startsWith("findEachBatch_a_")
+      .findEach(10, customers -> {
+        batchSizes.add(customers.size());
+        System.out.println("Batch " + counter.incrementAndGet() + " size:" + customers.size());
+      });
+
+    assertThat(batchSizes).hasSize(3);
+    assertThat(batchSizes.get(0)).isEqualTo(10);
+    assertThat(batchSizes.get(1)).isEqualTo(10);
+    assertThat(batchSizes.get(2)).isEqualTo(2);
+  }
+
+  @Test
+  public void findEachBatch_when_lastBatchEmpty() {
+
+    for (int i = 0; i < 18; i++) {
+      Customer customer = new Customer();
+      customer.setStatus(Customer.Status.MIDDLING);
+      customer.setName("findEachBatch_b_" + i);
+      customer.save();
+    }
+
+    final List<Integer> batchSizes = new ArrayList<>();
+
+    final AtomicInteger counter = new AtomicInteger();
+    new QCustomer()
+      .status.eq(Customer.Status.MIDDLING)
+      .name.startsWith("findEachBatch_b_")
+      .findEach(9, customers -> {
+        batchSizes.add(customers.size());
+        System.out.println("Batch " + counter.incrementAndGet() + " size:" + customers.size());
+      });
+
+    assertThat(batchSizes).hasSize(2);
+    assertThat(batchSizes.get(0)).isEqualTo(9);
+    assertThat(batchSizes.get(1)).isEqualTo(9);
+  }
+
   @Test
   public void findIterate() {
 
@@ -99,21 +153,21 @@ public class QCustomerTest {
     cust.save();
 
     List<Long> ids = new QCustomer()
-        .status.equalTo(Customer.Status.GOOD)
-        .findIds();
+      .status.equalTo(Customer.Status.GOOD)
+      .findIds();
 
     assertThat(ids).isNotEmpty();
 
 
     Map<List, Customer> map = new QCustomer()
-        .status.equalTo(Customer.Status.GOOD)
-        .findMap();
+      .status.equalTo(Customer.Status.GOOD)
+      .findMap();
 
     assertThat(map.size()).isEqualTo(ids.size());
 
     QueryIterator<Customer> iterate = new QCustomer()
-        .status.equalTo(Customer.Status.GOOD)
-        .findIterate();
+      .status.equalTo(Customer.Status.GOOD)
+      .findIterate();
 
     try {
       while (iterate.hasNext()) {
@@ -130,12 +184,12 @@ public class QCustomerTest {
   public void isEmpty() {
 
     new QCustomer()
-        .contacts.isEmpty()
-        .findList();
+      .contacts.isEmpty()
+      .findList();
 
     new QCustomer()
-        .contacts.isNotEmpty()
-        .findList();
+      .contacts.isNotEmpty()
+      .findList();
   }
 
   @Transactional
@@ -143,19 +197,19 @@ public class QCustomerTest {
   public void forUpdate() {
 
     new QCustomer()
-        .id.eq(42)
-        .forUpdate()
-        .findOne();
+      .id.eq(42)
+      .forUpdate()
+      .findOne();
 
     new QCustomer()
-        .id.eq(42)
-        .forUpdateNoWait()
-        .findOne();
+      .id.eq(42)
+      .forUpdateNoWait()
+      .findOne();
 
     new QCustomer()
-        .id.eq(42)
-        .forUpdateSkipLocked()
-        .findOne();
+      .id.eq(42)
+      .forUpdateSkipLocked()
+      .findOne();
   }
 
 
@@ -164,42 +218,42 @@ public class QCustomerTest {
   public void arrayContains() {
 
     new QContact()
-        .phoneNumbers.contains("4312")
-        .findList();
+      .phoneNumbers.contains("4312")
+      .findList();
 
     new QCustomer()
-        .contacts.phoneNumbers.contains("4312")
-        .findList();
+      .contacts.phoneNumbers.contains("4312")
+      .findList();
   }
 
   @Test
   public void setIncludeSoftDeletes() {
 
     new QCustomer()
-        .setIdIn(42L)
-        .setIncludeSoftDeletes()
-        .findList();
+      .setIdIn(42L)
+      .setIncludeSoftDeletes()
+      .findList();
   }
 
   @Test
   public void testIdIn() {
 
     new QCustomer()
-        .setIdIn("1", "2")
-        .findList();
+      .setIdIn("1", "2")
+      .findList();
 
     new QCustomer()
-        .id.in(1L, 2L, 3L)
-        .findList();
+      .id.in(1L, 2L, 3L)
+      .findList();
   }
 
   @Test
   public void testIn() {
     new QCustomer()
-        .id.in(34L, 33L)
-        .name.in("asd", "foo", "bar")
-        .registered.in(new Date())
-        .findList();
+      .id.in(34L, 33L)
+      .name.in("asd", "foo", "bar")
+      .registered.in(new Date())
+      .findList();
   }
 
   @Test
@@ -284,24 +338,24 @@ public class QCustomerTest {
   @Test
   public void testNotIn() {
     new QCustomer()
-        .id.isIn(34L, 33L)
-        .name.notIn("asd", "foo", "bar")
-        .registered.in(new Date())
-        .findList();
+      .id.isIn(34L, 33L)
+      .name.notIn("asd", "foo", "bar")
+      .registered.in(new Date())
+      .findList();
   }
 
   @Test
   public void testQueryBoolean() {
 
     new QCustomer()
-        .name.contains("rob")
-        //.setUseDocStore(true)
-        .setMaxRows(10)
-        .findPagedList();
+      .name.contains("rob")
+      //.setUseDocStore(true)
+      .setMaxRows(10)
+      .findPagedList();
 
     new QCustomer()
-        .inactive.isFalse()
-        .findList();
+      .inactive.isFalse()
+      .findList();
   }
 
   @Test
@@ -484,7 +538,7 @@ public class QCustomerTest {
     assertThat(billingAddressIds).hasSize(2);
 
 
-    Map<Long,Customer> map
+    Map<Long, Customer> map
       = new QCustomer()
       .billingAddress.id.asMapKey()
       .name.startsWith("asdBilling")
@@ -515,21 +569,21 @@ public class QCustomerTest {
       .findList();
 
     new QCustomer()
-      .currentInet.in(Inet.setOf("129.1.1.4","129.1.1.5"))
+      .currentInet.in(Inet.setOf("129.1.1.4", "129.1.1.5"))
       .findList();
 
     new QCustomer()
       .contacts.fetch("email")
       .orderBy()
-        .name.asc()
-        .contacts.email.asc()
+      .name.asc()
+      .contacts.email.asc()
       .findList();
 
     new QCustomer()
       .contacts.fetchQuery("email")
       .orderBy()
-        .name.asc()
-        .contacts.email.asc()
+      .name.asc()
+      .contacts.email.asc()
       .findList();
   }
 
@@ -608,8 +662,8 @@ public class QCustomerTest {
 
     boolean customerExists =
       new QCustomer()
-      .name.equalTo("DoesNotExistReally")
-      .exists();
+        .name.equalTo("DoesNotExistReally")
+        .exists();
 
     assertThat(customerExists).isFalse();
   }
@@ -621,37 +675,37 @@ public class QCustomerTest {
     QCustomer cust = QCustomer.alias();
 
     new QCustomer()
-        // tune query
-        .select(cust.name)
-        .status.isIn(Customer.Status.BAD, Customer.Status.BAD)
-        .contacts.fetch()
-        // predicates
-        .findList();
+      // tune query
+      .select(cust.name)
+      .status.isIn(Customer.Status.BAD, Customer.Status.BAD)
+      .contacts.fetch()
+      // predicates
+      .findList();
 
     new QCustomer()
-        // tune query
-        .select(cust.name)
-        .contacts.fetch()
-        // predicates
-        .findList();
+      // tune query
+      .select(cust.name)
+      .contacts.fetch()
+      // predicates
+      .findList();
 
     new QCustomer()
-        // tune query
-        .select(cust.id, cust.name)
-        .contacts.fetch(contact.firstName, contact.lastName, contact.email)
-        // predicates
-        .id.greaterThan(1)
-        .findList();
+      // tune query
+      .select(cust.id, cust.name)
+      .contacts.fetch(contact.firstName, contact.lastName, contact.email)
+      // predicates
+      .id.greaterThan(1)
+      .findList();
 
     PagedList<Customer> pagedList = new QCustomer()
-        // tune query
-        .select(cust.id, cust.name)
-        .contacts.fetch(contact.firstName, contact.lastName, contact.email)
-        // predicates
-        .id.greaterThan(1)
-        .setFirstRow(20)
-        .setMaxRows(10)
-        .findPagedList();
+      // tune query
+      .select(cust.id, cust.name)
+      .contacts.fetch(contact.firstName, contact.lastName, contact.email)
+      // predicates
+      .id.greaterThan(1)
+      .setFirstRow(20)
+      .setMaxRows(10)
+      .findPagedList();
 
     pagedList.getList();
     pagedList.getList();
@@ -765,7 +819,7 @@ public class QCustomerTest {
     cust.setRegistered(new Date());
     cust.save();
 
-    java.util.Date maxDate =  new QCustomer()
+    java.util.Date maxDate = new QCustomer()
       .select("max(registered)")
       .findSingleAttribute();
 
@@ -799,15 +853,15 @@ public class QCustomerTest {
     assertThat(new QCustomer()
       .name.eq(testName.getMethodName())
       .email.gt(new ValidEmail("foo2@example.org"))
-            .findOne()).isNull();
+      .findOne()).isNull();
     assertThat(new QCustomer()
       .name.eq(testName.getMethodName())
       .email.gt(new ValidEmail("foo1@example.org"))
-            .findOne()).isNotNull();
+      .findOne()).isNotNull();
     assertThat(new QCustomer()
       .name.eq(testName.getMethodName())
       .email.greaterOrEqualTo(new ValidEmail("foo2@example.org"))
-            .findOne()).isNotNull();
+      .findOne()).isNotNull();
   }
 
 

From 2a1c170aa4b11346cfb9c06f02c89a27362ac7d6 Mon Sep 17 00:00:00 2001
From: sebastian-mrozek <sebastian.mrozek@gmail.com>
Date: Thu, 11 Mar 2021 13:44:59 +1300
Subject: [PATCH 137/447] Add test for shuffled array comparison

---
 .../test/java/io/ebean/test/JsonAssertContainsTest.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
index 2c25776f9..1d5864a6b 100644
--- a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
+++ b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
@@ -83,4 +83,13 @@ public class JsonAssertContainsTest {
     assertThat(contains.path("a")).isEqualTo("a");
     assertThat(contains.path("b")).isEqualTo("b");
   }
+
+  @Test
+  public void assertContainsArrayShuffled() {
+    JsonNode array = readNodeFromResource("/contains/array.json");
+    JsonNode arrayShuffled = readNodeFromResource("/contains/array-shuffled.json");
+
+    JsonAssertContains.assertContains(array, arrayShuffled);
+    JsonAssertContains.assertContains(arrayShuffled, array);
+  }
 }

From ef3980a3ee5805dda1b7cce19590aee80d73f71c Mon Sep 17 00:00:00 2001
From: sebastian-mrozek <sebastian.mrozek@gmail.com>
Date: Thu, 11 Mar 2021 13:47:46 +1300
Subject: [PATCH 138/447] Add test resources

---
 ebean-test/src/test/resources/contains/array-shuffled.json | 1 +
 ebean-test/src/test/resources/contains/array.json          | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 ebean-test/src/test/resources/contains/array-shuffled.json
 create mode 100644 ebean-test/src/test/resources/contains/array.json

diff --git a/ebean-test/src/test/resources/contains/array-shuffled.json b/ebean-test/src/test/resources/contains/array-shuffled.json
new file mode 100644
index 000000000..07546c233
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/array-shuffled.json
@@ -0,0 +1 @@
+[2, 54, 13, 10]
\ No newline at end of file
diff --git a/ebean-test/src/test/resources/contains/array.json b/ebean-test/src/test/resources/contains/array.json
new file mode 100644
index 000000000..547a670c1
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/array.json
@@ -0,0 +1 @@
+[10, 2, 13, 54]
\ No newline at end of file

From d75d1fce43a35bbb9c4c795634cd02d116d7c8b9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 11 Mar 2021 20:42:25 +1300
Subject: [PATCH 139/447] Change ModuleInfoLoader API and querybean-generator
 for named default database (#2190)

Currently we can not use @DbName with the entities of the default database. With this change the generated code that registers entity classes will support using @DbName with the default database.
---
 .../io/ebean/config/ModuleInfoLoader.java     |  7 +-
 .../server/core/DefaultContainer.java         | 13 ++--
 kotlin-querybean-generator/pom.xml            | 15 +++--
 .../generator/SimpleModuleInfoWriter.java     | 65 ++++++++++++-------
 .../ebean/querybean/generator/AddressTest.kt  | 12 ++--
 .../generator/SimpleModuleInfoWriter.java     | 63 +++++++++++-------
 6 files changed, 99 insertions(+), 76 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java b/ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java
index d32f80630..94d35ab2c 100644
--- a/ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java
+++ b/ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java
@@ -7,13 +7,8 @@ import java.util.List;
  */
 public interface ModuleInfoLoader {
 
-  /**
-   * Return the entity classes to register with the default DB.
-   */
-  List<Class<?>> entityClasses();
-
   /**
    * Return entity classes to register for a named DB (not default DB).
    */
-  List<Class<?>> entityClassesFor(String dbName);
+  List<Class<?>> classesFor(String dbName, boolean defaultServer);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 300acdb2d..cdefcc294 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -135,16 +135,11 @@ public class DefaultContainer implements SpiContainer {
           configProvider.apply((ServerConfig)config);
         }
       }
-      if (config.isAutoLoadModuleInfo()) {
-        // auto register entity classes (default db)
-        for (ModuleInfoLoader loader : ServiceLoader.load(ModuleInfoLoader.class)) {
-          config.addAll(loader.entityClasses());
-        }
-      }
-    } else if (config.isAutoLoadModuleInfo()) {
-      // auto register entity classes (other named db)
+    }
+    if (config.isAutoLoadModuleInfo()) {
+      // auto register entity classes
       for (ModuleInfoLoader loader : ServiceLoader.load(ModuleInfoLoader.class)) {
-        config.addAll(loader.entityClassesFor(config.getName()));
+        config.addAll(loader.classesFor(config.getName(), config.isDefaultServer()));
       }
     }
   }
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 8e4df4f39..9bf33578e 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -102,13 +102,14 @@
               <sourceDirs>
                 <sourceDir>src/test/kotlin</sourceDir>
               </sourceDirs>
-              <annotationProcessorPaths>
-                <annotationProcessorPath>
-                  <groupId>io.ebean</groupId>
-                  <artifactId>kotlin-querybean-generator</artifactId>
-                  <version>12.7.1</version>
-                </annotationProcessorPath>
-              </annotationProcessorPaths>
+<!--              <annotationProcessorPaths>-->
+<!--                <annotationProcessorPath>-->
+<!--                  <groupId>io.ebean</groupId>-->
+<!--                  <artifactId>kotlin-querybean-generator</artifactId>-->
+<!--&lt;!&ndash;                  <version>12.7.1</version>&ndash;&gt;-->
+<!--                  <version>12.7.3-SNAPSHOT</version>-->
+<!--                </annotationProcessorPath>-->
+<!--              </annotationProcessorPaths>-->
             </configuration>
           </execution>
         </executions>
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index 926aad8ae..04d1c270c 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -39,7 +39,6 @@ class SimpleModuleInfoWriter {
   }
 
   private void writeServicesFile() {
-
     try {
       FileObject jfo = processingContext.createMetaInfServicesWriter();
       if (jfo != null) {
@@ -95,7 +94,6 @@ class SimpleModuleInfoWriter {
     writer.append("import io.ebean.config.ModuleInfo;").eol();
     writer.append("import io.ebean.config.ModuleInfoLoader;").eol();
     writer.eol();
-
   }
 
   void buildAtContextModule(Append writer) {
@@ -133,14 +131,15 @@ class SimpleModuleInfoWriter {
     writeMethodEntityClasses(processingContext.getDbEntities(), null);
 
     final Map<String, Set<String>> otherDbEntities = processingContext.getOtherDbEntities();
-    writeMethodEntityClassesFor(otherDbEntities.keySet());
-
     for (Map.Entry<String, Set<String>> otherDb : otherDbEntities.entrySet()) {
       writeMethodEntityClasses(otherDb.getValue(), otherDb.getKey());
     }
+    writeMethodEntityClassesFor(otherDbEntities.keySet());
+    writeMethodEntityClassesFor();
   }
 
   private void writeMethodOtherClasses() {
+    writeMethodComment("Register AttributeConverter etc", "");
     writer.append("  private List<Class<?>> otherClasses() {").eol();
     if (!processingContext.hasOtherClasses()) {
       writer.append("    return Collections.emptyList();").eol();
@@ -155,36 +154,52 @@ class SimpleModuleInfoWriter {
   }
 
   private void writeMethodEntityClasses(Set<String> dbEntities, String dbName) {
-
-    String modifier = "public";
-    String method = "entityClasses";
-
-    if (dbName == null) {
-      writer.append("  @Override").eol();
+    String method = "defaultEntityClasses";
+    if (dbName != null) {
+      method = "entitiesFor_" + dbName;
+      writeMethodComment("Entities for @DbName(name=\"%s\"))", dbName);
     } else {
-      method = dbName + "_entities";
-      modifier = "private";
+      writeMethodComment("Entities with no @DbName", dbName);
     }
-    writer.append("  %s List<Class<?>> %s() {", modifier, method).eol();
-    writer.append("    List<Class<?>> entities = new ArrayList<>();").eol();
-    for (String dbEntity : dbEntities) {
-      writer.append("    entities.add(%s.class);", dbEntity).eol();
+    writer.append("  private List<Class<?>> %s() {", method).eol();
+    if (dbEntities.isEmpty() && !processingContext.hasOtherClasses()) {
+      writer.append("    return Collections.emptyList();").eol();
+    } else {
+      writer.append("    List<Class<?>> entities = new ArrayList<>();").eol();
+      for (String dbEntity : dbEntities) {
+        writer.append("    entities.add(%s.class);", dbEntity).eol();
+      }
+      if (processingContext.hasOtherClasses()) {
+        writer.append("    entities.addAll(otherClasses());").eol();
+      }
+      writer.append("    return entities;").eol();
     }
-    if (processingContext.hasOtherClasses()) {
-      writer.append("    entities.addAll(otherClasses());").eol();
-    }
-    writer.append("    return entities;").eol();
     writer.append("  }").eol().eol();
   }
 
-  private void writeMethodEntityClassesFor(Set<String> otherDbNames) {
+  private void writeMethodComment(String msg, String arg) {
+    writer.append("  /**").eol();
+    writer.append("   * ").append(msg, arg).eol();
+    writer.append("   */").eol();
+  }
 
-    writer.append("  @Override").eol();
-    writer.append("  public List<Class<?>> entityClassesFor(String dbName) {").eol().eol();
+  private void writeMethodEntityClassesFor(Set<String> otherDbNames) {
+    writer.append("  private List<Class<?>> classesFor(String dbName) {").eol();
     for (String dbName : otherDbNames) {
-      writer.append("    if (\"%s\".equals(dbName)) return %s_entities();", dbName, dbName).eol();
+      writer.append("    if (\"%s\".equals(dbName)) return entitiesFor_%s();", dbName, dbName).eol();
     }
-    writer.append("    return Collections.emptyList();").eol();
+    writer.append("    return new ArrayList<>();").eol();
+    writer.append("  }").eol().eol();
+  }
+
+  private void writeMethodEntityClassesFor() {
+    writer.append("  @Override").eol();
+    writer.append("  public List<Class<?>> classesFor(String dbName, boolean defaultServer) {").eol();
+    writer.append("    List<Class<?>> classes = classesFor(dbName);").eol();
+    writer.append("    if (defaultServer) {").eol();
+    writer.append("      classes.addAll(defaultEntityClasses());").eol();
+    writer.append("    }").eol();
+    writer.append("    return classes;").eol();
     writer.append("  }").eol().eol();
   }
 
diff --git a/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt b/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt
index 6d740331e..22865347c 100644
--- a/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt
+++ b/kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt
@@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test
 
 class AddressTest {
 
-  private val fieldsInQueryBean = javaClass.classLoader.loadClass("org.example.domain.query.QAddress")
-    ?.declaredFields
-    ?: fail()
+//  private val fieldsInQueryBean = javaClass.classLoader.loadClass("org.example.domain.query.QAddress")
+//    ?.declaredFields
+//    ?: fail()
   private val fieldsInBean = Address::class.java.declaredFields
 
   @Test
@@ -22,8 +22,8 @@ class AddressTest {
     assertTrue(fieldsInBean.any { it.name == fieldName }) {
       "$fieldName does not exist in Address."
     }
-    assertTrue(fieldsInQueryBean.none { it.name == fieldName}) {
-      "$fieldName does exists in query bean for Address (QAddress)."
-    }
+//    assertTrue(fieldsInQueryBean.none { it.name == fieldName}) {
+//      "$fieldName does exists in query bean for Address (QAddress)."
+//    }
   }
 }
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index b9c1b606e..e7e2826eb 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -131,14 +131,15 @@ class SimpleModuleInfoWriter {
     writeMethodEntityClasses(processingContext.getDbEntities(), null);
 
     final Map<String, Set<String>> otherDbEntities = processingContext.getOtherDbEntities();
-    writeMethodEntityClassesFor(otherDbEntities.keySet());
-
     for (Map.Entry<String, Set<String>> otherDb : otherDbEntities.entrySet()) {
       writeMethodEntityClasses(otherDb.getValue(), otherDb.getKey());
     }
+    writeMethodEntityClassesFor(otherDbEntities.keySet());
+    writeMethodEntityClassesFor();
   }
 
   private void writeMethodOtherClasses() {
+    writeMethodComment("Register AttributeConverter etc", "");
     writer.append("  private List<Class<?>> otherClasses() {").eol();
     if (!processingContext.hasOtherClasses()) {
       writer.append("    return Collections.emptyList();").eol();
@@ -153,36 +154,52 @@ class SimpleModuleInfoWriter {
   }
 
   private void writeMethodEntityClasses(Set<String> dbEntities, String dbName) {
-
-    String modifier = "public";
-    String method = "entityClasses";
-
-    if (dbName == null) {
-      writer.append("  @Override").eol();
+    String method = "defaultEntityClasses";
+    if (dbName != null) {
+      method = "entitiesFor_" + dbName;
+      writeMethodComment("Entities for @DbName(name=\"%s\"))", dbName);
     } else {
-      method = dbName + "_entities";
-      modifier = "private";
+      writeMethodComment("Entities with no @DbName", dbName);
     }
-    writer.append("  %s List<Class<?>> %s() {", modifier, method).eol();
-    writer.append("    List<Class<?>> entities = new ArrayList<>();").eol();
-    for (String dbEntity : dbEntities) {
-      writer.append("    entities.add(%s.class);", dbEntity).eol();
+    writer.append("  private List<Class<?>> %s() {", method).eol();
+    if (dbEntities.isEmpty() && !processingContext.hasOtherClasses()) {
+      writer.append("    return Collections.emptyList();").eol();
+    } else {
+      writer.append("    List<Class<?>> entities = new ArrayList<>();").eol();
+      for (String dbEntity : dbEntities) {
+        writer.append("    entities.add(%s.class);", dbEntity).eol();
+      }
+      if (processingContext.hasOtherClasses()) {
+        writer.append("    entities.addAll(otherClasses());").eol();
+      }
+      writer.append("    return entities;").eol();
     }
-    if (processingContext.hasOtherClasses()) {
-      writer.append("    entities.addAll(otherClasses());").eol();
-    }
-    writer.append("    return entities;").eol();
     writer.append("  }").eol().eol();
   }
 
-  private void writeMethodEntityClassesFor(Set<String> otherDbNames) {
+  private void writeMethodComment(String msg, String arg) {
+    writer.append("  /**").eol();
+    writer.append("   * ").append(msg, arg).eol();
+    writer.append("   */").eol();
+  }
 
-    writer.append("  @Override").eol();
-    writer.append("  public List<Class<?>> entityClassesFor(String dbName) {").eol().eol();
+  private void writeMethodEntityClassesFor(Set<String> otherDbNames) {
+    writer.append("  private List<Class<?>> classesFor(String dbName) {").eol();
     for (String dbName : otherDbNames) {
-      writer.append("    if (\"%s\".equals(dbName)) return %s_entities();", dbName, dbName).eol();
+      writer.append("    if (\"%s\".equals(dbName)) return entitiesFor_%s();", dbName, dbName).eol();
     }
-    writer.append("    return Collections.emptyList();").eol();
+    writer.append("    return new ArrayList<>();").eol();
+    writer.append("  }").eol().eol();
+  }
+
+  private void writeMethodEntityClassesFor() {
+    writer.append("  @Override").eol();
+    writer.append("  public List<Class<?>> classesFor(String dbName, boolean defaultServer) {").eol();
+    writer.append("    List<Class<?>> classes = classesFor(dbName);").eol();
+    writer.append("    if (defaultServer) {").eol();
+    writer.append("      classes.addAll(defaultEntityClasses());").eol();
+    writer.append("    }").eol();
+    writer.append("    return classes;").eol();
     writer.append("  }").eol().eol();
   }
 

From e6faf9efd15697bd88a7f48e5bcb6bf6b59c1c55 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 11 Mar 2021 23:21:44 +1300
Subject: [PATCH 140/447] #2193 - Prevent registration of 2 default servers (2
 Database that have defaultServer=true)

---
 ebean-api/src/main/java/io/ebean/DatabaseFactory.java      | 7 +++++++
 .../src/main/java/io/ebean/config/DatabaseConfig.java      | 1 +
 .../src/test/java/io/ebean/config/ServerConfigTest.java    | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
index 11cdf9068..6ad7b1d89 100644
--- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
+++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
@@ -33,6 +33,7 @@ public class DatabaseFactory {
 
   private static final ReentrantLock lock = new ReentrantLock();
   private static SpiContainer container;
+  private static String defaultServerName;
 
   static {
     EbeanVersion.getVersion();
@@ -76,6 +77,12 @@ public class DatabaseFactory {
       }
       Database server = createInternal(config);
       if (config.isRegister()) {
+        if (config.isDefaultServer()) {
+          if (defaultServerName != null) {
+            throw new IllegalStateException("Registering [" + config.getName() + "] as the default server but [" + defaultServerName + "] is already registered as the default");
+          }
+          defaultServerName = config.getName();
+        }
         DbPrimary.setSkip(true);
         DbContext.getInstance().register(server, config.isDefaultServer());
       }
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 036a39040..8e65f9bb3 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -2795,6 +2795,7 @@ public class DatabaseConfig {
     }
     loadDocStoreSettings(p);
 
+    defaultServer = p.getBoolean("defaultServer", defaultServer);
     loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);
     maxCallStack = p.getInt("maxCallStack", maxCallStack);
     dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
index a81082d16..8fda93985 100644
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -74,9 +74,11 @@ public class ServerConfigTest {
     props.setProperty("loadModuleInfo", "true");
     props.setProperty("collectQueryPlanThresholdMicros", "10000");
     props.setProperty("forUpdateNoKey", "true");
+    props.setProperty("defaultServer", "false");
 
     serverConfig.loadFromProperties(props);
 
+    assertFalse(serverConfig.isDefaultServer());
     assertTrue(serverConfig.isDisableL2Cache());
     assertTrue(serverConfig.isNotifyL2CacheInForeground());
     assertTrue(serverConfig.isDbOffline());
@@ -134,6 +136,7 @@ public class ServerConfigTest {
 
     ServerConfig serverConfig = new ServerConfig();
     assertTrue(serverConfig.isIdGeneratorAutomatic());
+    assertTrue(serverConfig.isDefaultServer());
 
     serverConfig.setIdGeneratorAutomatic(false);
     assertFalse(serverConfig.isIdGeneratorAutomatic());

From 4731ee034e3f5ee6c56f1e0bebb81f51060adbcf Mon Sep 17 00:00:00 2001
From: sebastian-mrozek <sebastian.mrozek@gmail.com>
Date: Mon, 15 Mar 2021 12:51:36 +1300
Subject: [PATCH 141/447] Handle searching for matching elements in an array

Add unit tests.
Refactor internals to allow reusing assertion method for finding matches in an array.
---
 .../java/io/ebean/test/CompareResult.java     |  38 +++++
 .../io/ebean/test/JsonAssertContains.java     | 150 +++++++++++++-----
 .../io/ebean/test/JsonAssertContainsTest.java |  57 +++++--
 .../array-multi-match-duplicate-props.json    |  18 +++
 .../resources/contains/array-multi-match.json |  20 +++
 .../contains/array-objects-shuffled.json      |  14 ++
 .../resources/contains/array-objects.json     |  11 ++
 .../resources/contains/array-shuffled.json    |   1 -
 .../src/test/resources/contains/array.json    |   1 -
 9 files changed, 256 insertions(+), 54 deletions(-)
 create mode 100644 ebean-test/src/main/java/io/ebean/test/CompareResult.java
 create mode 100644 ebean-test/src/test/resources/contains/array-multi-match-duplicate-props.json
 create mode 100644 ebean-test/src/test/resources/contains/array-multi-match.json
 create mode 100644 ebean-test/src/test/resources/contains/array-objects-shuffled.json
 create mode 100644 ebean-test/src/test/resources/contains/array-objects.json
 delete mode 100644 ebean-test/src/test/resources/contains/array-shuffled.json
 delete mode 100644 ebean-test/src/test/resources/contains/array.json

diff --git a/ebean-test/src/main/java/io/ebean/test/CompareResult.java b/ebean-test/src/main/java/io/ebean/test/CompareResult.java
new file mode 100644
index 000000000..1f2602674
--- /dev/null
+++ b/ebean-test/src/main/java/io/ebean/test/CompareResult.java
@@ -0,0 +1,38 @@
+package io.ebean.test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public final class CompareResult {
+    private final boolean applicable;
+    private final List<String> errors;
+
+    public static final CompareResult NO_ERRORS = new CompareResult(true, Collections.emptyList());
+    public static final CompareResult NOT_APPLICABLE = new CompareResult(false, Collections.emptyList());
+
+    public static CompareResult error(String error) {
+        return new CompareResult(true, Collections.singletonList(error));
+    }
+
+    public static CompareResult errors(List<String> errors) {
+        return new CompareResult(true, errors);
+    }
+
+    private CompareResult(boolean applicable, List<String> errors) {
+        this.applicable = applicable;
+        this.errors = new ArrayList<>(errors);
+    }
+
+    public boolean isApplicable() {
+        return applicable;
+    }
+
+    public boolean hasErrors() {
+        return !errors.isEmpty();
+    }
+
+    public List<String> getErrors() {
+        return errors;
+    }
+}
diff --git a/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java b/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
index 25e1e065a..2c3082605 100644
--- a/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
+++ b/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
@@ -3,28 +3,26 @@ package io.ebean.test;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.assertj.core.api.Assertions;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Stack;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Perform traversal of JsonNodes comparing against an expected JsonNode that
  * typically contains a subset of the data (typically excludes any generated properties
  * like when modified timestamps etc).
  */
-class JsonAssertContains {
+public class JsonAssertContains {
 
   private final Stack<String> path = new Stack<>();
-  private final LinkedList<String> errors = new LinkedList<>();
 
   static void assertContains(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
     new JsonAssertContains().contains(actualJsonNode, expectedJsonNode);
   }
 
   private void contains(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
-    checkRecursive(null, actualJsonNode, expectedJsonNode);
-    if (!errors.isEmpty()) {
+    CompareResult result = checkRecursive(null, actualJsonNode, expectedJsonNode);
+    if (result.hasErrors()) {
+      List<String> errors = result.getErrors();
       String errorsString = String.join("\n", errors);
       errorsString += "\nExpected JSON fields: " + expectedJsonNode;
       errorsString += "\nActual JSON: " + actualJsonNode;
@@ -32,55 +30,128 @@ class JsonAssertContains {
     }
   }
 
-  private void checkRecursive(String name, JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+  private CompareResult checkRecursive(String name, JsonNode actualJsonNode, JsonNode expectedJsonNode) {
     if (name != null) {
       path.push(name);
     }
-    if (checkNull(actualJsonNode, expectedJsonNode)) {
-      if (checkType(actualJsonNode, expectedJsonNode)) {
-        if (checkArray(actualJsonNode, expectedJsonNode)) {
-          if (checkObject(actualJsonNode, expectedJsonNode)) {
-            checkValue(actualJsonNode, expectedJsonNode);
-          }
-        }
-      }
+
+    CompareResult result = checkNull(actualJsonNode, expectedJsonNode);
+    if (result.isApplicable()) {
+      return pop(name, result);
     }
+
+    result = checkType(actualJsonNode, expectedJsonNode);
+    if (result.isApplicable()) {
+      return pop(name, result);
+    }
+
+    result = checkArray(actualJsonNode, expectedJsonNode);
+    if (result.isApplicable()) {
+      return pop(name, result);
+    }
+
+    result = checkObject(actualJsonNode, expectedJsonNode);
+    if (result.isApplicable()) {
+      return pop(name, result);
+    }
+
+    result = checkValue(actualJsonNode, expectedJsonNode);
+    if (result.isApplicable()) {
+      return pop(name, result);
+    }
+
+    return CompareResult.NOT_APPLICABLE;
+  }
+
+  private CompareResult pop(String name, CompareResult result) {
     if (name != null) {
       path.pop();
     }
+    return result;
   }
 
-  private boolean checkNull(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+  private CompareResult checkNull(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
     if (actualJsonNode == null) {
-      errors.add(String.format("Expected field '%s' to be '%s' but was null", path(), expectedJsonNode));
-      return false;
+      return CompareResult.error(String.format("Expected field '%s' to be '%s' but was null", path(), expectedJsonNode));
     }
-    return true;
+    return CompareResult.NOT_APPLICABLE;
   }
 
-  private boolean checkType(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+  private CompareResult checkType(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
     if (!expectedJsonNode.getNodeType().equals(actualJsonNode.getNodeType())) {
-      errors.add(String.format("Expected field '%s' to be of type '%s' but was '%s'", path(), expectedJsonNode.getNodeType(), actualJsonNode.getNodeType()));
-      return false;
+      return CompareResult.error(String.format("Expected field '%s' to be of type '%s' but was '%s'", path(), expectedJsonNode.getNodeType(), actualJsonNode.getNodeType()));
     }
-    return true;
+    return CompareResult.NOT_APPLICABLE;
   }
 
-  private boolean checkArray(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+  private CompareResult checkArray(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
     if (!expectedJsonNode.isArray()) {
-      return true;
+      return CompareResult.NOT_APPLICABLE;
     }
-    for (int i = 0; i < expectedJsonNode.size(); i++) {
-      checkRecursive("[" + i + "]", actualJsonNode.get(i), expectedJsonNode.get(i));
+
+    Map<Integer, Set<Integer>> matchingIndexes = findMatchingIndexes(actualJsonNode, expectedJsonNode);
+    List<Integer> unmatchedIndexes = listUnmatchedIndexes(expectedJsonNode.size(), matchingIndexes);
+    List<Map.Entry<Integer, Set<Integer>>> remainingEntries = removeMultipleMatches(matchingIndexes);
+    if (!remainingEntries.isEmpty()) {
+      unmatchedIndexes.addAll(remainingEntries.stream().map(Map.Entry::getKey).collect(Collectors.toList()));
     }
-    // do not continue (object or scalar type check)
-    return false;
+
+    List<String> errors = unmatchedIndexes.stream()
+      .map(index -> String.format("Unable to match expected element '%s[%d]' in the actual array", path(), index))
+      .collect(Collectors.toList());
+
+    return CompareResult.errors(errors);
   }
 
-  private boolean checkObject(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
-    if (!expectedJsonNode.isObject()) {
-      return true;
+  private List<Integer> listUnmatchedIndexes(int size, Map<Integer, Set<Integer>> matchingIndexes) {
+    List<Integer> unmatched = new LinkedList<>();
+    for (int i = 0; i < size; i++) {
+      if (!matchingIndexes.containsKey(i)) {
+        unmatched.add(i);
+      }
     }
+    return unmatched;
+  }
+
+  private List<Map.Entry<Integer, Set<Integer>>> removeMultipleMatches(Map<Integer, Set<Integer>> matchingIndexes) {
+    List<Map.Entry<Integer, Set<Integer>>> entries = new ArrayList<>(matchingIndexes.entrySet());
+    entries.sort(Comparator.comparingInt(entry -> entry.getValue().size()));
+    ListIterator<Map.Entry<Integer, Set<Integer>>> iterator = entries.listIterator();
+
+    while (iterator.hasNext()) {
+      Map.Entry<Integer, Set<Integer>> next = iterator.next();
+      if (!next.getValue().isEmpty()) {
+        iterator.remove();
+        Integer aMatchingIndex = next.getValue().stream().findFirst().get();
+        removeAllMatchingIndexesOf(aMatchingIndex, entries);
+      }
+    }
+
+    return entries;
+  }
+
+  private void removeAllMatchingIndexesOf(Integer aMatchingIndex, List<Map.Entry<Integer, Set<Integer>>> matchingIndexes) {
+    matchingIndexes.forEach(entry -> entry.getValue().remove(aMatchingIndex));
+  }
+
+  private Map<Integer, Set<Integer>> findMatchingIndexes(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    Map<Integer, Set<Integer>> matchingElementsIndexes = new HashMap<>();
+    for (int e = 0; e < expectedJsonNode.size(); e++) {
+      for (int a = 0; a < actualJsonNode.size(); a++) {
+        CompareResult result = checkRecursive("[" + e + "]", actualJsonNode.get(a), expectedJsonNode.get(e));
+        if (result.isApplicable() && !result.hasErrors()) {
+          matchingElementsIndexes.computeIfAbsent(e, key -> new HashSet<>()).add(a);
+        }
+      }
+    }
+    return matchingElementsIndexes;
+  }
+
+  private CompareResult checkObject(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+    if (!expectedJsonNode.isObject()) {
+      return CompareResult.NOT_APPLICABLE;
+    }
+    List<String> errors = new LinkedList<>();
     Iterator<Map.Entry<String, JsonNode>> expectedFields = expectedJsonNode.fields();
     while (expectedFields.hasNext()) {
       Map.Entry<String, JsonNode> expectedField = expectedFields.next();
@@ -89,17 +160,18 @@ class JsonAssertContains {
       if (actualNode == null) {
         errors.add(String.format("Expected field '%s' to be present", path(expectedKey)));
       } else {
-        checkRecursive(expectedKey, actualNode, expectedField.getValue());
+        CompareResult result = checkRecursive(expectedKey, actualNode, expectedField.getValue());
+        errors.addAll(result.getErrors());
       }
     }
-    // do not continue (scalar type check)
-    return false;
+    return CompareResult.errors(errors);
   }
 
-  private void checkValue(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+  private CompareResult checkValue(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
     if (!expectedJsonNode.equals(actualJsonNode)) {
-      errors.add(String.format("Expected field '%s' to be equal to '%s' but was '%s'", path(), expectedJsonNode, actualJsonNode));
+      return CompareResult.error(String.format("Expected field '%s' to be equal to '%s' but was '%s'", path(), expectedJsonNode, actualJsonNode));
     }
+    return CompareResult.NO_ERRORS;
   }
 
   String path(String expectedKey) {
diff --git a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
index 1d5864a6b..579bc2eca 100644
--- a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
+++ b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
@@ -1,10 +1,12 @@
 package io.ebean.test;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.util.stream.Stream;
 
+import static io.ebean.test.Json.readNode;
 import static io.ebean.test.Json.readNodeFromResource;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -31,18 +33,20 @@ public class JsonAssertContainsTest {
     JsonNode expected = readNodeFromResource("/contains/original-subset-modified.json");
     try {
       JsonAssertContains.assertContains(original, expected);
+      Assertions.fail("Expected an exception to be thrown");
     } catch (AssertionError e) {
       String exceptionMessage = e.getMessage();
+      System.out.println(exceptionMessage);
       Stream.of("Expected field 'someString1' to be equal to '\"aaaa\"' but was '\"string1\"",
         "Expected field 'someValue1' to be equal to '99' but was '1'",
-        "Expected field 'someArray1[0]' to be of type 'STRING' but was 'NUMBER",
-        "Expected field 'someArray2[0].value1' to be of type 'ARRAY' but was 'NUMBER'",
-        "Expected field 'someArray2[0].value2' to be of type 'OBJECT' but was 'STRING'",
-        "Expected field 'someArray2[0].array1[0]' to be '\"1\"' but was null",
-        "Expected field 'someArray2[0].object1.val5' to be present",
-        "Expected field 'someArray2[0].object1.val6' to be present",
-        "Expected field 'someArray2[0].object2' to be of type 'NULL' but was 'OBJECT'",
-        "Expected field 'someArray2[0].objectNull' to be of type 'OBJECT' but was 'NULL'")
+        "Unable to match expected element 'someArray1[0]' in the actual array",
+        "Expected field 'someObject1.value1' to be of type 'ARRAY' but was 'NUMBER'",
+        "Expected field 'someObject1.value2' to be of type 'OBJECT' but was 'STRING'",
+        "Unable to match expected element 'someObject1.array1[0]' in the actual array",
+        "Expected field 'someObject1.object1.val5' to be present",
+        "Expected field 'someObject1.object1.val6' to be present",
+        "Expected field 'someObject1.object2' to be of type 'NULL' but was 'OBJECT'",
+        "Expected field 'someObject1.objectNull' to be of type 'OBJECT' but was 'NULL'")
         .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
     }
   }
@@ -54,6 +58,7 @@ public class JsonAssertContainsTest {
     JsonNode expected = readNodeFromResource("/contains/check-null-expected.json");
     try {
       JsonAssertContains.assertContains(original, expected);
+      Assertions.fail("Expected an exception to be thrown");
     } catch (AssertionError e) {
       String exceptionMessage = e.getMessage();
       Stream.of("Expected field 'someNull' to be of type 'NULL' but was 'STRING'",
@@ -68,6 +73,7 @@ public class JsonAssertContainsTest {
     JsonNode expected = readNodeFromResource("/contains/check-type-expected.json");
     try {
       JsonAssertContains.assertContains(original, expected);
+      Assertions.fail("Expected an exception to be thrown");
     } catch (AssertionError e) {
       String exceptionMessage = e.getMessage();
       Stream.of("Expected field 'some' to be of type 'NUMBER' but was 'STRING'")
@@ -84,12 +90,37 @@ public class JsonAssertContainsTest {
     assertThat(contains.path("b")).isEqualTo("b");
   }
 
-  @Test
-  public void assertContainsArrayShuffled() {
-    JsonNode array = readNodeFromResource("/contains/array.json");
-    JsonNode arrayShuffled = readNodeFromResource("/contains/array-shuffled.json");
 
-    JsonAssertContains.assertContains(array, arrayShuffled);
+  @Test
+  public void assertContainsNumbersArrayShuffled() {
+    JsonNode array = readNode("[2, 54, 13, 10]");
+    JsonNode arrayShuffled = readNode("[2, 13, 10, 54]");
+
     JsonAssertContains.assertContains(arrayShuffled, array);
   }
+
+  @Test
+  public void assertContainsObjectsArrayShuffled() {
+    JsonNode array = readNodeFromResource("/contains/array-objects.json");
+    JsonNode arrayShuffled = readNodeFromResource("/contains/array-objects-shuffled.json");
+
+    JsonAssertContains.assertContains(arrayShuffled, array);
+  }
+
+  @Test
+  public void assertArrayElementsNotFound() {
+    JsonNode original = readNodeFromResource("/contains/array-multi-match.json");
+    JsonNode actual = readNodeFromResource("/contains/array-multi-match-duplicate-props.json");
+
+    try {
+      JsonAssertContains.assertContains(actual, original);
+      Assertions.fail("Expected an exception to be thrown");
+    } catch (AssertionError e) {
+      System.out.println(e);
+      String exceptionMessage = e.getMessage();
+      Stream.of("Unable to match expected element '[5]' in the actual array",
+        "Unable to match expected element '[4]' in the actual array")
+        .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+    }
+  }
 }
diff --git a/ebean-test/src/test/resources/contains/array-multi-match-duplicate-props.json b/ebean-test/src/test/resources/contains/array-multi-match-duplicate-props.json
new file mode 100644
index 000000000..4dbcb1c10
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/array-multi-match-duplicate-props.json
@@ -0,0 +1,18 @@
+[
+  {
+    "b": 2,
+    "c": 3
+  },
+  {
+    "d": 4,
+    "e": 5
+  },
+  {
+    "a": 1,
+    "b": 2,
+    "c": 3
+  },
+  {
+    "b": 2
+  }
+]
diff --git a/ebean-test/src/test/resources/contains/array-multi-match.json b/ebean-test/src/test/resources/contains/array-multi-match.json
new file mode 100644
index 000000000..0d106dd88
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/array-multi-match.json
@@ -0,0 +1,20 @@
+[
+  {
+    "a": 1
+  },
+  {
+    "b": 2
+  },
+  {
+    "c": 3
+  },
+  {
+    "d": 4
+  },
+  {
+    "e": 5
+  },
+  {
+    "f": 6
+  }
+]
diff --git a/ebean-test/src/test/resources/contains/array-objects-shuffled.json b/ebean-test/src/test/resources/contains/array-objects-shuffled.json
new file mode 100644
index 000000000..8c28a8e7a
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/array-objects-shuffled.json
@@ -0,0 +1,14 @@
+[
+  {
+    "id": "tyu",
+    "c": 3
+  },
+  {
+    "id": "zxy",
+    "a": 1
+  },
+  {
+    "id": "123",
+    "b": 2
+  }
+]
\ No newline at end of file
diff --git a/ebean-test/src/test/resources/contains/array-objects.json b/ebean-test/src/test/resources/contains/array-objects.json
new file mode 100644
index 000000000..bfc5e4159
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/array-objects.json
@@ -0,0 +1,11 @@
+[
+  {
+    "a": 1
+  },
+  {
+    "b": 2
+  },
+  {
+    "c": 3
+  }
+]
diff --git a/ebean-test/src/test/resources/contains/array-shuffled.json b/ebean-test/src/test/resources/contains/array-shuffled.json
deleted file mode 100644
index 07546c233..000000000
--- a/ebean-test/src/test/resources/contains/array-shuffled.json
+++ /dev/null
@@ -1 +0,0 @@
-[2, 54, 13, 10]
\ No newline at end of file
diff --git a/ebean-test/src/test/resources/contains/array.json b/ebean-test/src/test/resources/contains/array.json
deleted file mode 100644
index 547a670c1..000000000
--- a/ebean-test/src/test/resources/contains/array.json
+++ /dev/null
@@ -1 +0,0 @@
-[10, 2, 13, 54]
\ No newline at end of file

From 899fdca9958913f07cb5bad2ca778e3a11d21abd Mon Sep 17 00:00:00 2001
From: sebastian-mrozek <sebastian.mrozek@gmail.com>
Date: Mon, 15 Mar 2021 13:04:05 +1300
Subject: [PATCH 142/447] Improve assertions in case json compare does not fail
 as expected

Remove sys out print.
---
 .../java/io/ebean/test/JsonAssertContainsTest.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
index 579bc2eca..59d69c00b 100644
--- a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
+++ b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
@@ -33,7 +33,6 @@ public class JsonAssertContainsTest {
     JsonNode expected = readNodeFromResource("/contains/original-subset-modified.json");
     try {
       JsonAssertContains.assertContains(original, expected);
-      Assertions.fail("Expected an exception to be thrown");
     } catch (AssertionError e) {
       String exceptionMessage = e.getMessage();
       System.out.println(exceptionMessage);
@@ -48,7 +47,9 @@ public class JsonAssertContainsTest {
         "Expected field 'someObject1.object2' to be of type 'NULL' but was 'OBJECT'",
         "Expected field 'someObject1.objectNull' to be of type 'OBJECT' but was 'NULL'")
         .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+      return;
     }
+    Assertions.fail("Expected an exception to be thrown");
   }
 
 
@@ -58,13 +59,14 @@ public class JsonAssertContainsTest {
     JsonNode expected = readNodeFromResource("/contains/check-null-expected.json");
     try {
       JsonAssertContains.assertContains(original, expected);
-      Assertions.fail("Expected an exception to be thrown");
     } catch (AssertionError e) {
       String exceptionMessage = e.getMessage();
       Stream.of("Expected field 'someNull' to be of type 'NULL' but was 'STRING'",
         "Expected field 'extra' to be present")
         .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+      return;
     }
+    Assertions.fail("Expected an exception to be thrown");
   }
 
   @Test
@@ -73,12 +75,13 @@ public class JsonAssertContainsTest {
     JsonNode expected = readNodeFromResource("/contains/check-type-expected.json");
     try {
       JsonAssertContains.assertContains(original, expected);
-      Assertions.fail("Expected an exception to be thrown");
     } catch (AssertionError e) {
       String exceptionMessage = e.getMessage();
       Stream.of("Expected field 'some' to be of type 'NUMBER' but was 'STRING'")
         .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+      return;
     }
+    Assertions.fail("Expected an exception to be thrown");
   }
 
   @Test
@@ -114,13 +117,14 @@ public class JsonAssertContainsTest {
 
     try {
       JsonAssertContains.assertContains(actual, original);
-      Assertions.fail("Expected an exception to be thrown");
     } catch (AssertionError e) {
-      System.out.println(e);
       String exceptionMessage = e.getMessage();
       Stream.of("Unable to match expected element '[5]' in the actual array",
         "Unable to match expected element '[4]' in the actual array")
         .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+      return;
     }
+
+    Assertions.fail("Expected an exception to be thrown");
   }
 }

From 733886c70bdce2f9e93b52502614dfb60f9e1aa6 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Mar 2021 22:03:14 +1300
Subject: [PATCH 143/447] #2195 - @Aggregation on OneToMany property not
 mapping to column properly

---
 .../server/deploy/BeanProperty.java            |  2 +-
 .../deploy/meta/DeployBeanDescriptor.java      | 18 ++++++++++++++++--
 .../server/deploy/meta/DeployBeanProperty.java |  3 +--
 .../org/tests/model/tevent/TEventMany.java     | 14 +++++++-------
 .../java/org/tests/model/tevent/TEventOne.java |  4 ++--
 .../aggregation/TestAggregationCount.java      | 14 +++++++-------
 6 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 832cea70c..d3b1f429b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -324,9 +324,9 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     this.generatedProperty = deploy.getGeneratedProperty();
     this.getter = deploy.getGetter();
     this.setter = deploy.getSetter();
+    this.aggregation = deploy.parseAggregation();
     this.dbColumn = tableAliasIntern(descriptor, deploy.getDbColumn(), false, null);
     this.dbComment = deploy.getDbComment();
-    this.aggregation = deploy.parseAggregation();
     this.sqlFormulaJoin = InternString.intern(deploy.getSqlFormulaJoin());
     this.sqlFormulaSelect = InternString.intern(deploy.getSqlFormulaSelect());
     this.formula = sqlFormulaSelect != null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 47b5efdc0..79ca0beb1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -16,6 +16,7 @@ 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.SplitName;
 import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.server.core.CacheOptions;
 import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
@@ -1149,8 +1150,21 @@ public class DeployBeanDescriptor<T> {
       return null;
     }
     // use 'current' table alias - refer BeanProperty appendSelect() for aggregation
-    DeployBeanProperty property = propMap.get(expression);
-    return (property == null) ? null : "${ta}." + property.getDbColumn();
+    String[] split = SplitName.split(expression);
+    if (split[0] == null) {
+      DeployBeanProperty property = propMap.get(expression);
+      return (property == null) ? null : "${ta}." + property.getDbColumn();
+    } else {
+      DeployBeanProperty property = propMap.get(split[0]);
+      if (property instanceof DeployBeanPropertyAssoc) {
+        DeployBeanPropertyAssoc<?> prop = (DeployBeanPropertyAssoc<?>) property;
+        DeployBeanProperty beanProperty = prop.getTargetDeploy().getBeanProperty(split[1]);
+        if (beanProperty != null) {
+          return "u1." + beanProperty.getDbColumn();
+        }
+      }
+      return null;
+    }
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 5b9e8d687..e20c898ce 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -682,7 +682,6 @@ public class DeployBeanProperty {
    */
   public void setAggregationPrefix(String prefix) {
     this.aggregationPrefix = prefix;
-    this.aggregation = (prefix == null) ? aggregation : aggregation.replace(aggregationPrefix, "u1");
   }
 
   public String getElPrefix() {
@@ -715,7 +714,7 @@ public class DeployBeanProperty {
       return sqlFormulaSelect;
     }
     if (aggregation != null) {
-      return aggregation;
+      return aggregationParsed == null ? dbColumn : aggregationParsed;
     }
     return dbColumn;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java b/ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java
index e7ef1020e..a7eabce36 100644
--- a/ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java
+++ b/ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java
@@ -16,16 +16,16 @@ public class TEventMany {
   @ManyToOne
   TEventOne event;
 
-  int units;
+  int myUnits;
 
   double amount;
 
   @Version
   Long version;
 
-  public TEventMany(String description, int units, double amount) {
+  public TEventMany(String description, int myUnits, double amount) {
     this.description = description;
-    this.units = units;
+    this.myUnits = myUnits;
     this.amount = amount;
   }
 
@@ -53,12 +53,12 @@ public class TEventMany {
     this.event = event;
   }
 
-  public int getUnits() {
-    return units;
+  public int getMyUnits() {
+    return myUnits;
   }
 
-  public void setUnits(int units) {
-    this.units = units;
+  public void setMyUnits(int myUnits) {
+    this.myUnits = myUnits;
   }
 
   public double getAmount() {
diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java
index 88bc2e2fd..f69ad23fe 100644
--- a/ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java
+++ b/ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java
@@ -37,10 +37,10 @@ public class TEventOne {
   @Aggregation("count(logs.id)")
   Long count;
 
-  @Aggregation("sum(logs.units)")
+  @Aggregation("sum(logs.myUnits)")
   Double totalUnits;
 
-  @Aggregation("sum(logs.units * logs.amount)")
+  @Aggregation("sum(logs.myUnits * logs.amount)")
   Double totalAmount;
 
   @OneToMany(mappedBy = "event", cascade = CascadeType.ALL)
diff --git a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 15f7c4ddf..a91aef120 100644
--- a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -110,7 +110,7 @@ public class TestAggregationCount extends BaseTestCase {
     assertThat(list).isNotEmpty();
 
     String sql = sqlOf(query2, 5);
-    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("select t0.id, t0.name, count(u1.id), sum(u1.my_units), sum(u1.my_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");
@@ -132,13 +132,13 @@ public class TestAggregationCount extends BaseTestCase {
 
     String sql = sqlOf(query, 5);
     if (isH2()) {
-      assertThat(sql).contains("select distinct t0.id, t0.name, count(u1.id), sum(u1.units), sum(u1.units * u1.amount), sum(u1.units), t0.name from tevent_one t0 ");
+      assertThat(sql).contains("select distinct t0.id, t0.name, count(u1.id), sum(u1.my_units), sum(u1.my_units * u1.amount), sum(u1.my_units), t0.name from tevent_one t0 ");
     } else if (isPostgres()) {
-      assertThat(sql).contains("t0.name, count(u1.id), sum(u1.units), sum(u1.units * u1.amount), sum(u1.units), t0.name from tevent_one t0 ");
+      assertThat(sql).contains("t0.name, count(u1.id), sum(u1.my_units), sum(u1.my_units * u1.amount), sum(u1.my_units), t0.name from tevent_one t0 ");
     }
     assertThat(sql).contains("from tevent_one t0 join tevent_many u1 on u1.event_id = t0.id ");
     assertThat(sql).contains(" group by t0.id, t0.name ");
-    assertThat(sql).contains(" order by sum(u1.units), t0.name");
+    assertThat(sql).contains(" order by sum(u1.my_units), t0.name");
   }
 
   @Test
@@ -149,7 +149,7 @@ public class TestAggregationCount extends BaseTestCase {
 
     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("select t0.id, t0.name, count(u1.id), sum(u1.my_units) from tevent_one t0");
     assertThat(sql).contains("group by t0.id, t0.name");
   }
 
@@ -161,7 +161,7 @@ public class TestAggregationCount extends BaseTestCase {
 
     query0.findList();
     String sql = sqlOf(query0, 5);
-    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("select t0.id, t0.name, count(u1.id), sum(u1.my_units), sum(u1.my_units * u1.amount) from tevent_one t0");
     assertThat(sql).contains("group by t0.id, t0.name");
   }
 
@@ -174,7 +174,7 @@ public class TestAggregationCount extends BaseTestCase {
 
     query0.findList();
     String sql = sqlOf(query0, 5);
-    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("select t0.id, t0.name, count(u1.id), sum(u1.my_units), sum(u1.my_units * u1.amount) from tevent_one t0");
     assertThat(sql).contains("group by t0.id, t0.name");
   }
 

From c2a87a0c884f6be6e87e11aff979ddae48ea9272 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Mar 2021 22:43:25 +1300
Subject: [PATCH 144/447] #2196 - SQLException:Column "T0.ID" must be in the
 GROUP BY list - when findCount with having clause

---
 .../server/query/SqlTreeBuilder.java            |  2 +-
 .../query/aggregation/TestAggregationCount.java | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 065884b54..239e8a58e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -151,7 +151,7 @@ public final class SqlTreeBuilder {
   }
 
   private String buildGroupByClause() {
-    if (rawSql || !rootNode.isAggregation()) {
+    if (rawSql || (!rootNode.isAggregation() && query.getHavingExpressions() == null)) {
       return null;
     }
     ctx.startGroupBy();
diff --git a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index a91aef120..261202696 100644
--- a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -3,6 +3,7 @@ package org.tests.query.aggregation;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import io.ebeantest.LoggedSql;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -91,6 +92,22 @@ public class TestAggregationCount extends BaseTestCase {
     }
   }
 
+  @Test
+  public void findCount_withHaving() {
+    Query<TEventOne> query = Ebean.find(TEventOne.class)
+      //.select("id, totalUnits")
+      .having()
+      .ge("totalUnits", 1)
+      .query();
+
+    LoggedSql.start();
+    int count = query.findCount();
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("group by t0.id");
+    assertThat(count).isGreaterThan(0);
+  }
+
   @Test
   public void testFull() {
 

From f483002e39e3ce5dc8290f15126986e20ef2f180 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 16 Mar 2021 09:13:01 +1300
Subject: [PATCH 145/447] #2197 - [ebean-redis] - Bump jedis dependency to
 3.5.2 (from 3.4.0

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

diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 476ee7c2a..5ea354664 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <version>3.4.0</version>
+      <version>3.5.2</version>
     </dependency>
 
     <dependency>

From e3001e8bdddce41fa97644298a73b9e7368250d7 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 16 Mar 2021 09:30:54 +1300
Subject: [PATCH 146/447] Fix JsonAssertContains testContainsFails with missing
 parts of JSON

Just add missing parts of test/resources/original.json and original-subset-modified.json
---
 .../contains/original-subset-modified.json       | 16 ++++++++++++++++
 .../src/test/resources/contains/original.json    | 13 +++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/ebean-test/src/test/resources/contains/original-subset-modified.json b/ebean-test/src/test/resources/contains/original-subset-modified.json
index 107d557d2..3c3e70f3e 100644
--- a/ebean-test/src/test/resources/contains/original-subset-modified.json
+++ b/ebean-test/src/test/resources/contains/original-subset-modified.json
@@ -3,6 +3,22 @@
   "someString2": "string2",
   "someValue1": 99,
   "someValue2": 2,
+  "someObject1": {
+    "value1": [],
+    "value2": {
+
+    },
+    "array1": [
+      101
+    ],
+    "object1": {
+      "val5": "val5",
+      "val6": "val6"
+    },
+    "object2": null,
+    "objectNull": {
+    }
+  },
   "someArray1": [
     "a"
   ],
diff --git a/ebean-test/src/test/resources/contains/original.json b/ebean-test/src/test/resources/contains/original.json
index 063affac4..8f6fe3624 100644
--- a/ebean-test/src/test/resources/contains/original.json
+++ b/ebean-test/src/test/resources/contains/original.json
@@ -3,6 +3,19 @@
   "someString2": "string2",
   "someValue1": 1,
   "someValue2": 2,
+  "someObject1": {
+    "value1": 42,
+    "value2": "string3",
+    "array1": [
+      99
+    ],
+    "object1": {
+    },
+    "object2": {
+
+    },
+    "objectNull": null
+  },
   "someArray1": [
     1,
     2,

From c9968a96629a1ded327e9a517cab3a0074e9c16e Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 16 Mar 2021 22:03:12 +1300
Subject: [PATCH 147/447] Change JsonAssertContains array matching to match on
 size

---
 .../java/io/ebean/test/CompareResult.java     |  49 +++----
 .../io/ebean/test/JsonAssertContains.java     | 121 +++++++++---------
 .../io/ebean/test/JsonAssertContainsTest.java |  72 ++++++++++-
 .../resources/contains/nested-array-both.json |   8 ++
 .../contains/nested-array-extraExpected.json  |   9 ++
 .../contains/nested-array-missExpected.json   |   7 +
 .../contains/nested-array-ordering.json       |   8 ++
 .../test/resources/contains/nested-array.json |   8 ++
 8 files changed, 195 insertions(+), 87 deletions(-)
 create mode 100644 ebean-test/src/test/resources/contains/nested-array-both.json
 create mode 100644 ebean-test/src/test/resources/contains/nested-array-extraExpected.json
 create mode 100644 ebean-test/src/test/resources/contains/nested-array-missExpected.json
 create mode 100644 ebean-test/src/test/resources/contains/nested-array-ordering.json
 create mode 100644 ebean-test/src/test/resources/contains/nested-array.json

diff --git a/ebean-test/src/main/java/io/ebean/test/CompareResult.java b/ebean-test/src/main/java/io/ebean/test/CompareResult.java
index 1f2602674..b76f872de 100644
--- a/ebean-test/src/main/java/io/ebean/test/CompareResult.java
+++ b/ebean-test/src/main/java/io/ebean/test/CompareResult.java
@@ -4,35 +4,36 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public final class CompareResult {
-    private final boolean applicable;
-    private final List<String> errors;
+final class CompareResult {
 
-    public static final CompareResult NO_ERRORS = new CompareResult(true, Collections.emptyList());
-    public static final CompareResult NOT_APPLICABLE = new CompareResult(false, Collections.emptyList());
+  private final boolean applicable;
+  private final List<String> errors;
 
-    public static CompareResult error(String error) {
-        return new CompareResult(true, Collections.singletonList(error));
-    }
+  static final CompareResult NO_ERRORS = new CompareResult(true, Collections.emptyList());
+  static final CompareResult NOT_APPLICABLE = new CompareResult(false, Collections.emptyList());
 
-    public static CompareResult errors(List<String> errors) {
-        return new CompareResult(true, errors);
-    }
+  static CompareResult error(String error) {
+    return new CompareResult(true, Collections.singletonList(error));
+  }
 
-    private CompareResult(boolean applicable, List<String> errors) {
-        this.applicable = applicable;
-        this.errors = new ArrayList<>(errors);
-    }
+  static CompareResult errors(List<String> errors) {
+    return new CompareResult(true, errors);
+  }
 
-    public boolean isApplicable() {
-        return applicable;
-    }
+  private CompareResult(boolean applicable, List<String> errors) {
+    this.applicable = applicable;
+    this.errors = new ArrayList<>(errors);
+  }
 
-    public boolean hasErrors() {
-        return !errors.isEmpty();
-    }
+  boolean isApplicable() {
+    return applicable;
+  }
 
-    public List<String> getErrors() {
-        return errors;
-    }
+  boolean hasErrors() {
+    return !errors.isEmpty();
+  }
+
+  List<String> getErrors() {
+    return errors;
+  }
 }
diff --git a/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java b/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
index 2c3082605..df89c0b16 100644
--- a/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
+++ b/ebean-test/src/main/java/io/ebean/test/JsonAssertContains.java
@@ -4,14 +4,13 @@ import com.fasterxml.jackson.databind.JsonNode;
 import org.assertj.core.api.Assertions;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Perform traversal of JsonNodes comparing against an expected JsonNode that
  * typically contains a subset of the data (typically excludes any generated properties
  * like when modified timestamps etc).
  */
-public class JsonAssertContains {
+class JsonAssertContains {
 
   private final Stack<String> path = new Stack<>();
 
@@ -88,63 +87,7 @@ public class JsonAssertContains {
     if (!expectedJsonNode.isArray()) {
       return CompareResult.NOT_APPLICABLE;
     }
-
-    Map<Integer, Set<Integer>> matchingIndexes = findMatchingIndexes(actualJsonNode, expectedJsonNode);
-    List<Integer> unmatchedIndexes = listUnmatchedIndexes(expectedJsonNode.size(), matchingIndexes);
-    List<Map.Entry<Integer, Set<Integer>>> remainingEntries = removeMultipleMatches(matchingIndexes);
-    if (!remainingEntries.isEmpty()) {
-      unmatchedIndexes.addAll(remainingEntries.stream().map(Map.Entry::getKey).collect(Collectors.toList()));
-    }
-
-    List<String> errors = unmatchedIndexes.stream()
-      .map(index -> String.format("Unable to match expected element '%s[%d]' in the actual array", path(), index))
-      .collect(Collectors.toList());
-
-    return CompareResult.errors(errors);
-  }
-
-  private List<Integer> listUnmatchedIndexes(int size, Map<Integer, Set<Integer>> matchingIndexes) {
-    List<Integer> unmatched = new LinkedList<>();
-    for (int i = 0; i < size; i++) {
-      if (!matchingIndexes.containsKey(i)) {
-        unmatched.add(i);
-      }
-    }
-    return unmatched;
-  }
-
-  private List<Map.Entry<Integer, Set<Integer>>> removeMultipleMatches(Map<Integer, Set<Integer>> matchingIndexes) {
-    List<Map.Entry<Integer, Set<Integer>>> entries = new ArrayList<>(matchingIndexes.entrySet());
-    entries.sort(Comparator.comparingInt(entry -> entry.getValue().size()));
-    ListIterator<Map.Entry<Integer, Set<Integer>>> iterator = entries.listIterator();
-
-    while (iterator.hasNext()) {
-      Map.Entry<Integer, Set<Integer>> next = iterator.next();
-      if (!next.getValue().isEmpty()) {
-        iterator.remove();
-        Integer aMatchingIndex = next.getValue().stream().findFirst().get();
-        removeAllMatchingIndexesOf(aMatchingIndex, entries);
-      }
-    }
-
-    return entries;
-  }
-
-  private void removeAllMatchingIndexesOf(Integer aMatchingIndex, List<Map.Entry<Integer, Set<Integer>>> matchingIndexes) {
-    matchingIndexes.forEach(entry -> entry.getValue().remove(aMatchingIndex));
-  }
-
-  private Map<Integer, Set<Integer>> findMatchingIndexes(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
-    Map<Integer, Set<Integer>> matchingElementsIndexes = new HashMap<>();
-    for (int e = 0; e < expectedJsonNode.size(); e++) {
-      for (int a = 0; a < actualJsonNode.size(); a++) {
-        CompareResult result = checkRecursive("[" + e + "]", actualJsonNode.get(a), expectedJsonNode.get(e));
-        if (result.isApplicable() && !result.hasErrors()) {
-          matchingElementsIndexes.computeIfAbsent(e, key -> new HashSet<>()).add(a);
-        }
-      }
-    }
-    return matchingElementsIndexes;
+    return new MatchArrayElements(actualJsonNode, expectedJsonNode).match();
   }
 
   private CompareResult checkObject(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
@@ -187,4 +130,64 @@ public class JsonAssertContains {
     }
     return String.join(".", path).replace(".[", "[");
   }
+
+  /**
+   * Match two arrays allowing elements to be in a different order.
+   */
+  private class MatchArrayElements {
+    private final JsonNode actualJsonNode;
+    private final JsonNode expectedJsonNode;
+    private final Map<Integer, JsonNode> expectedMap = new LinkedHashMap<>();
+    private final Map<Integer, JsonNode> actualMap = new LinkedHashMap<>();
+
+    MatchArrayElements(JsonNode actualJsonNode, JsonNode expectedJsonNode) {
+      this.actualJsonNode = actualJsonNode;
+      this.expectedJsonNode = expectedJsonNode;
+      for (int e = 0; e < expectedJsonNode.size(); e++) {
+        expectedMap.put(e, expectedJsonNode.get(e));
+      }
+      for (int a = 0; a < actualJsonNode.size(); a++) {
+        actualMap.put(a, actualJsonNode.get(a));
+      }
+    }
+
+    CompareResult match() {
+      Iterator<Map.Entry<Integer, JsonNode>> iterator = expectedMap.entrySet().iterator();
+      while (iterator.hasNext()) {
+        Map.Entry<Integer, JsonNode> expectedEntry = iterator.next();
+        int matchPos = findFirstMatch(expectedEntry.getKey(), expectedEntry.getValue());
+        if (matchPos > -1) {
+          iterator.remove();
+        }
+      }
+
+      List<String> errors = new ArrayList<>();
+      if (actualJsonNode.size() != expectedJsonNode.size()) {
+        errors.add(String.format("Unmatched array size for '%s', expected %d but got %d elements", path(), expectedJsonNode.size(), actualJsonNode.size()));
+      }
+      // unmatched expected -> actual
+      for (Map.Entry<Integer, JsonNode> entry : expectedMap.entrySet()) {
+        errors.add(String.format("Expected array element '%s[%d]' was not matched to an element in the actual array - element: %s", path(), entry.getKey(), entry.getValue()));
+      }
+      // unmatched actual -> expected
+      for (Map.Entry<Integer, JsonNode> entry : actualMap.entrySet()) {
+        errors.add(String.format("Actual array element '%s[%d]' was not matched to an element in the expected array - element: %s", path(), entry.getKey(), entry.getValue()));
+      }
+      return CompareResult.errors(errors);
+    }
+
+    private int findFirstMatch(int e, JsonNode expectedNode) {
+      Iterator<Map.Entry<Integer, JsonNode>> iterator = actualMap.entrySet().iterator();
+      while (iterator.hasNext()) {
+        Map.Entry<Integer, JsonNode> entry = iterator.next();
+        CompareResult result = checkRecursive("[" + e + "]", entry.getValue(), expectedNode);
+        if (result.isApplicable() && !result.hasErrors()) {
+          iterator.remove();
+          return entry.getKey();
+        }
+      }
+      return -1;
+    }
+  }
+
 }
diff --git a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
index 59d69c00b..7f78c3782 100644
--- a/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
+++ b/ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java
@@ -38,10 +38,10 @@ public class JsonAssertContainsTest {
       System.out.println(exceptionMessage);
       Stream.of("Expected field 'someString1' to be equal to '\"aaaa\"' but was '\"string1\"",
         "Expected field 'someValue1' to be equal to '99' but was '1'",
-        "Unable to match expected element 'someArray1[0]' in the actual array",
         "Expected field 'someObject1.value1' to be of type 'ARRAY' but was 'NUMBER'",
         "Expected field 'someObject1.value2' to be of type 'OBJECT' but was 'STRING'",
-        "Unable to match expected element 'someObject1.array1[0]' in the actual array",
+        "Expected array element 'someObject1.array1[0]' was not matched to an element in the actual array - element: 101",
+        "Actual array element 'someObject1.array1[0]' was not matched to an element in the expected array - element: 99",
         "Expected field 'someObject1.object1.val5' to be present",
         "Expected field 'someObject1.object1.val6' to be present",
         "Expected field 'someObject1.object2' to be of type 'NULL' but was 'OBJECT'",
@@ -119,8 +119,72 @@ public class JsonAssertContainsTest {
       JsonAssertContains.assertContains(actual, original);
     } catch (AssertionError e) {
       String exceptionMessage = e.getMessage();
-      Stream.of("Unable to match expected element '[5]' in the actual array",
-        "Unable to match expected element '[4]' in the actual array")
+      Stream.of("Unmatched array size for '', expected 6 but got 4 elements",
+        "Expected array element '[2]' was not matched to an element in the actual array - element: {\"c\":3}",
+        "Expected array element '[4]' was not matched to an element in the actual array - element: {\"e\":5}",
+        "Expected array element '[5]' was not matched to an element in the actual array - element: {\"f\":6}",
+        "Actual array element '[3]' was not matched to an element in the expected array - element: {\"b\":2}")
+        .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+      return;
+    }
+
+    Assertions.fail("Expected an exception to be thrown");
+  }
+
+  @Test
+  public void assertNestedArray_ordering() {
+    JsonNode original = readNodeFromResource("/contains/nested-array.json");
+    JsonNode actual = readNodeFromResource("/contains/nested-array-ordering.json");
+    JsonAssertContains.assertContains(actual, original);
+  }
+
+  @Test
+  public void assertNestedArray_both() {
+    try {
+      JsonNode original = readNodeFromResource("/contains/nested-array.json");
+      JsonNode actual = readNodeFromResource("/contains/nested-array-both.json");
+      JsonAssertContains.assertContains(actual, original);
+    } catch (AssertionError e) {
+      String exceptionMessage = e.getMessage();
+      Stream.of(
+        "Expected array element 'someArray1[1]' was not matched to an element in the actual array - element: {\"name\":\"b\"}",
+        "Actual array element 'someArray1[0]' was not matched to an element in the expected array - element: {\"name\":\"z\"}")
+        .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+      return;
+    }
+
+    Assertions.fail("Expected an exception to be thrown");
+  }
+
+  @Test
+  public void assertNestedArray_extraExpected() {
+    try {
+      JsonNode original = readNodeFromResource("/contains/nested-array.json");
+      JsonNode actual = readNodeFromResource("/contains/nested-array-extraExpected.json");
+      JsonAssertContains.assertContains(actual, original);
+    } catch (AssertionError e) {
+      String exceptionMessage = e.getMessage();
+      Stream.of(
+        "Unmatched array size for 'someArray1', expected 3 but got 4 elements",
+        "Actual array element 'someArray1[2]' was not matched to an element in the expected array - element: {\"name\":\"d\"}")
+        .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
+      return;
+    }
+
+    Assertions.fail("Expected an exception to be thrown");
+  }
+
+  @Test
+  public void assertNestedArray_missExpected() {
+    try {
+      JsonNode original = readNodeFromResource("/contains/nested-array.json");
+      JsonNode actual = readNodeFromResource("/contains/nested-array-missExpected.json");
+      JsonAssertContains.assertContains(actual, original);
+    } catch (AssertionError e) {
+      String exceptionMessage = e.getMessage();
+      Stream.of(
+        "Unmatched array size for 'someArray1', expected 3 but got 2 elements",
+        "Expected array element 'someArray1[1]' was not matched to an element in the actual array - element: {\"name\":\"b\"}")
         .forEach(assertionError -> assertThat(exceptionMessage).contains(assertionError));
       return;
     }
diff --git a/ebean-test/src/test/resources/contains/nested-array-both.json b/ebean-test/src/test/resources/contains/nested-array-both.json
new file mode 100644
index 000000000..58eca1390
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/nested-array-both.json
@@ -0,0 +1,8 @@
+{
+  "someString1": "string1",
+  "someArray1": [
+    {"name":"z"},
+    {"name":"c"},
+    {"name":"a"}
+  ]
+}
diff --git a/ebean-test/src/test/resources/contains/nested-array-extraExpected.json b/ebean-test/src/test/resources/contains/nested-array-extraExpected.json
new file mode 100644
index 000000000..52d94b44d
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/nested-array-extraExpected.json
@@ -0,0 +1,9 @@
+{
+  "someString1": "string1",
+  "someArray1": [
+    {"name":"c"},
+    {"name":"a"},
+    {"name":"d"},
+    {"name":"b"}
+  ]
+}
diff --git a/ebean-test/src/test/resources/contains/nested-array-missExpected.json b/ebean-test/src/test/resources/contains/nested-array-missExpected.json
new file mode 100644
index 000000000..5958b2801
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/nested-array-missExpected.json
@@ -0,0 +1,7 @@
+{
+  "someString1": "string1",
+  "someArray1": [
+    {"name":"c"},
+    {"name":"a"}
+  ]
+}
diff --git a/ebean-test/src/test/resources/contains/nested-array-ordering.json b/ebean-test/src/test/resources/contains/nested-array-ordering.json
new file mode 100644
index 000000000..543d9b6f1
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/nested-array-ordering.json
@@ -0,0 +1,8 @@
+{
+  "someString1": "string1",
+  "someArray1": [
+    {"name":"c"},
+    {"name":"a"},
+    {"name":"b"}
+  ]
+}
diff --git a/ebean-test/src/test/resources/contains/nested-array.json b/ebean-test/src/test/resources/contains/nested-array.json
new file mode 100644
index 000000000..13e74ace0
--- /dev/null
+++ b/ebean-test/src/test/resources/contains/nested-array.json
@@ -0,0 +1,8 @@
+{
+  "someString1": "string1",
+  "someArray1": [
+    {"name":"a"},
+    {"name":"b"},
+    {"name":"c"}
+  ]
+}

From 1837c3443d3e8a0b0fb8528d7d1168ef1c22d69b Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Mar 2021 21:02:59 +1300
Subject: [PATCH 148/447] #2186 - Invalid generated table and column names of
 @ManyToMany relation with allQuotedIdentifiers=true

---
 .../config/AbstractNamingConvention.java      | 47 ++++++++++++----
 .../config/MatchingNamingConvention.java      |  5 --
 .../io/ebean/config/NamingConvention.java     | 22 ++++----
 .../main/java/io/ebean/config/TableName.java  | 24 +++-----
 .../config/UnderscoreNamingConvention.java    | 12 ----
 .../deploy/parse/AnnotationAssocManys.java    | 29 ++++------
 .../config/MatchingNamingConventionTest.java  | 55 ++++++++++++++++++-
 .../java/org/tests/config/TestTableName.java  | 20 +++++++
 8 files changed, 138 insertions(+), 76 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java
index 9bb65ccce..33d607e97 100644
--- a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java
+++ b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java
@@ -7,6 +7,8 @@ import javax.persistence.DiscriminatorValue;
 import javax.persistence.Inheritance;
 import javax.persistence.Table;
 
+import static io.ebean.util.StringHelper.isNull;
+
 /**
  * Provides some base implementation for NamingConventions.
  *
@@ -78,10 +80,16 @@ public abstract class AbstractNamingConvention implements NamingConvention {
 
   @Override
   public String getSequenceName(String rawTableName, String pkColumn) {
-    final String tableNameUnquoted = databasePlatform.unQuote(rawTableName);
+    TableName tableName = new TableName(rawTableName);
+    String seqName = seqName(pkColumn, tableName.getName());
+    return tableName.withCatalogAndSchema(seqName);
+  }
+
+  private String seqName(String pkColumn, String tableName) {
+    final String tableNameUnquoted = unQuote(tableName);
     String seqName = sequenceFormat.replace("{table}", tableNameUnquoted);
-    pkColumn = (pkColumn == null) ? "" : databasePlatform.unQuote(pkColumn);
-    return seqName.replace("{column}", pkColumn);
+    pkColumn = (pkColumn == null) ? "" : unQuote(pkColumn);
+    return quoteIdentifiers(seqName.replace("{column}", pkColumn));
   }
 
   /**
@@ -216,15 +224,13 @@ public abstract class AbstractNamingConvention implements NamingConvention {
         || AnnotationUtil.has(supCls, DiscriminatorValue.class);
   }
 
-
   @Override
   public TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable) {
-
     StringBuilder buffer = new StringBuilder();
-    buffer.append(lhsTable.getName());
+    buffer.append(unQuote(lhsTable.getName()));
     buffer.append("_");
 
-    String rhsTableName = rhsTable.getName();
+    String rhsTableName = unQuote(rhsTable.getName());
     if (rhsTableName.indexOf('_') < rhsPrefixLength) {
       // trim off a xx_ prefix if there is one
       rhsTableName = rhsTableName.substring(rhsTableName.indexOf('_') + 1);
@@ -238,7 +244,13 @@ public abstract class AbstractNamingConvention implements NamingConvention {
       buffer.setLength(maxTableNameLength);
     }
 
-    return new TableName(lhsTable.getCatalog(), lhsTable.getSchema(), buffer.toString());
+    String tableName = quoteIdentifiers(buffer.toString());
+    return new TableName(lhsTable.getCatalog(), lhsTable.getSchema(), tableName);
+  }
+
+  @Override
+  public String deriveM2MColumn(String tableName, String dbColumn) {
+    return quoteIdentifiers(unQuote(tableName) +"_" + unQuote(dbColumn));
   }
 
   /**
@@ -255,14 +267,29 @@ public abstract class AbstractNamingConvention implements NamingConvention {
     return null;
   }
 
+  @Override
+  public String getTableName(String catalog, String schema, String name) {
+    StringBuilder sb = new StringBuilder();
+    if (!isNull(catalog)) {
+      sb.append(quoteIdentifiers(catalog)).append(".");
+    }
+    if (!isNull(schema)) {
+      sb.append(quoteIdentifiers(schema)).append(".");
+    }
+    return sb.append(quoteIdentifiers(name)).toString();
+  }
+
   /**
-   * Replace back ticks (if they are used) with database platform specific
-   * quoted identifiers.
+   * Replace back ticks (if they are used) with database platform specific quoted identifiers.
    */
   protected String quoteIdentifiers(String s) {
     return databasePlatform.convertQuotedIdentifiers(s);
   }
 
+  private String unQuote(String val) {
+    return databasePlatform.unQuote(val);
+  }
+
   /**
    * Checks string is null or empty .
    */
diff --git a/ebean-api/src/main/java/io/ebean/config/MatchingNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/MatchingNamingConvention.java
index 0b741994a..d12cb2e80 100644
--- a/ebean-api/src/main/java/io/ebean/config/MatchingNamingConvention.java
+++ b/ebean-api/src/main/java/io/ebean/config/MatchingNamingConvention.java
@@ -39,11 +39,6 @@ public class MatchingNamingConvention extends AbstractNamingConvention {
     return new TableName(quoteIdentifiers(getCatalog()), quoteIdentifiers(getSchema()), quoteIdentifiers(beanClass.getSimpleName()));
   }
 
-  @Override
-  public String getPropertyFromColumn(Class<?> beanClass, String dbColumnName) {
-    return dbColumnName;
-  }
-
   @Override
   public String getForeignKey(String prefix, String fkProperty) {
     prefix = databasePlatform.unQuote(prefix);
diff --git a/ebean-api/src/main/java/io/ebean/config/NamingConvention.java b/ebean-api/src/main/java/io/ebean/config/NamingConvention.java
index c5a0a2b86..470822e5b 100644
--- a/ebean-api/src/main/java/io/ebean/config/NamingConvention.java
+++ b/ebean-api/src/main/java/io/ebean/config/NamingConvention.java
@@ -53,6 +53,16 @@ public interface NamingConvention {
    */
   TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable);
 
+  /**
+   * Derive a DB Column from a FK table and column.
+   */
+  String deriveM2MColumn(String tableName, String dbColumn);
+
+  /**
+   * Return the full table name taking into account quoted identifiers.
+   */
+  String getTableName(String catalog, String schema, String name);
+
   /**
    * Return the column name given the property name.
    *
@@ -60,18 +70,6 @@ public interface NamingConvention {
    */
   String getColumnFromProperty(Class<?> beanClass, String propertyName);
 
-  /**
-   * Return the property name from the column name.
-   * <p>
-   * This is used to help mapping of raw SQL queries onto bean properties.
-   * </p>
-   *
-   * @param beanClass    the bean class
-   * @param dbColumnName the db column name
-   * @return the property name from the column name
-   */
-  String getPropertyFromColumn(Class<?> beanClass, String dbColumnName);
-
   /**
    * Return the sequence name given the table name (for DB's that use sequences).
    * <p>
diff --git a/ebean-api/src/main/java/io/ebean/config/TableName.java b/ebean-api/src/main/java/io/ebean/config/TableName.java
index dba8b1d0d..9f55577b3 100644
--- a/ebean-api/src/main/java/io/ebean/config/TableName.java
+++ b/ebean-api/src/main/java/io/ebean/config/TableName.java
@@ -20,7 +20,7 @@ public final class TableName {
   /**
    * The name.
    */
-  private String name;
+  private final String name;
 
   /**
    * Construct with the given catalog schema and table name.
@@ -29,7 +29,6 @@ public final class TableName {
    * </p>
    */
   public TableName(String catalog, String schema, String name) {
-    super();
     this.catalog = catalog != null ? catalog.trim() : null;
     this.schema = schema != null ? schema.trim() : null;
     this.name = name != null ? name.trim() : null;
@@ -110,14 +109,11 @@ public final class TableName {
    * @return the qualified name
    */
   public String getQualifiedName() {
-
     StringBuilder buffer = new StringBuilder();
-
     // Add catalog
     if (catalog != null) {
       buffer.append(catalog);
     }
-
     // Add schema
     if (schema != null) {
       if (buffer.length() > 0) {
@@ -125,31 +121,27 @@ public final class TableName {
       }
       buffer.append(schema);
     }
-
     if (buffer.length() > 0) {
       buffer.append(".");
     }
-    buffer.append(name);
-
-    return buffer.toString();
+    return buffer.append(name).toString();
   }
 
   /**
    * Append a catalog and schema prefix if they exist to the string builder.
    */
-  public void appendCatalogAndSchema(StringBuilder buffer) {
-    if (catalog != null) {
-      buffer.append(catalog).append(".");
-    }
+  public String withCatalogAndSchema(String name) {
     if (schema != null) {
-      buffer.append(schema).append(".");
+      name = schema + "." + name;
     }
+    if (catalog != null) {
+      name = catalog + "." + name;
+    }
+    return name;
   }
 
   /**
    * Checks if is table name is valid i.e. it has at least a name.
-   *
-   * @return true, if is valid
    */
   public boolean isValid() {
     return name != null && !name.isEmpty();
diff --git a/ebean-api/src/main/java/io/ebean/config/UnderscoreNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/UnderscoreNamingConvention.java
index 16b685227..603e4e76c 100644
--- a/ebean-api/src/main/java/io/ebean/config/UnderscoreNamingConvention.java
+++ b/ebean-api/src/main/java/io/ebean/config/UnderscoreNamingConvention.java
@@ -60,18 +60,6 @@ public class UnderscoreNamingConvention extends AbstractNamingConvention {
     return toUnderscoreFromCamel(propertyName);
   }
 
-  /**
-   * Converts underscore based column name to Camel case property name.
-   *
-   * @param beanClass    the bean class
-   * @param dbColumnName the db column name
-   * @return the property from column
-   */
-  @Override
-  public String getPropertyFromColumn(Class<?> beanClass, String dbColumnName) {
-    return toCamelFromUnderscore(dbColumnName);
-  }
-
   /**
    * Return true if the result will be upper case.
    * <p>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index b3346562b..b47612d65 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -38,8 +38,6 @@ 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.
  */
@@ -346,18 +344,6 @@ class AnnotationAssocManys extends AnnotationAssoc {
     return append(joinTable.catalog(), joinTable.schema(), joinTable.name());
   }
 
-  private String append(String catalog, String schema, String name) {
-    StringBuilder sb = new StringBuilder();
-    if (!isNull(catalog)) {
-      sb.append(catalog).append(".");
-    }
-    if (!isNull(schema)) {
-      sb.append(schema).append(".");
-    }
-    sb.append(name);
-    return sb.toString();
-  }
-
   /**
    * Return the full table name
    */
@@ -368,6 +354,13 @@ class AnnotationAssocManys extends AnnotationAssoc {
     return append(collectionTable.catalog(), collectionTable.schema(), collectionTable.name());
   }
 
+  /**
+   * Return the full table name taking into account quoted identifiers.
+   */
+  private String append(String catalog, String schema, String name) {
+    return namingConvention.getTableName(catalog, schema, name);
+  }
+
   /**
    * Define intersection table and foreign key columns for ManyToMany.
    * <p>
@@ -414,8 +407,8 @@ class AnnotationAssocManys extends AnnotationAssoc {
       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)));
+        String fkCol = namingConvention.deriveM2MColumn(localTableName, localId.getDbColumn());
+        intJoin.addJoinColumn(new DeployTableJoinColumn(localId.getDbColumn(), fkCol));
       }
     }
 
@@ -424,8 +417,8 @@ class AnnotationAssocManys extends AnnotationAssoc {
       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()));
+        String fkCol = namingConvention.deriveM2MColumn(otherTableName, otherId.getDbColumn());
+        destJoin.addJoinColumn(new DeployTableJoinColumn(fkCol, otherId.getDbColumn()));
       }
     }
 
diff --git a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
index c9a2fe030..2db6b95ba 100644
--- a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertNull;
 
 public class MatchingNamingConventionTest {
 
-  private MatchingNamingConvention namingConvention;
+  private final MatchingNamingConvention namingConvention;
 
   public MatchingNamingConventionTest() {
     this.namingConvention = new MatchingNamingConvention();
@@ -30,6 +30,50 @@ public class MatchingNamingConventionTest {
     return nc;
   }
 
+  @Test
+  public void getTableName() {
+    assertThat(namingConvention.getTableName("a", "b", "c")).isEqualTo("a.b.c");
+    assertThat(namingConvention.getTableName("", "b", "c")).isEqualTo("b.c");
+    assertThat(namingConvention.getTableName("", "", "c")).isEqualTo("c");
+    assertThat(namingConvention.getTableName("a", "", "c")).isEqualTo("a.c");
+  }
+
+  @Test
+  public void getTableName_when_allQuoted() {
+    MatchingNamingConvention nc = createMatchingNamingConventionAllQuoted();
+
+    assertThat(nc.getTableName("a", "b", "c")).isEqualTo("[a].[b].[c]");
+    assertThat(nc.getTableName("", "b", "c")).isEqualTo("[b].[c]");
+    assertThat(nc.getTableName("", "", "c")).isEqualTo("[c]");
+    assertThat(nc.getTableName("a", "", "c")).isEqualTo("[a].[c]");
+  }
+
+  @Test
+  public void getM2MJoinTableName() {
+    TableName t0 = new TableName("One");
+    TableName t1 = new TableName("Two");
+    assertThat(namingConvention.getM2MJoinTableName(t0, t1).toString()).isEqualTo("One_Two");
+  }
+
+  @Test
+  public void getM2MJoinTableName_when_allQuoted() {
+    MatchingNamingConvention nc = createMatchingNamingConventionAllQuoted();
+    TableName t0 = new TableName("[One]");
+    TableName t1 = new TableName("[Two]");
+    assertThat(nc.getM2MJoinTableName(t0, t1).toString()).isEqualTo("[One_Two]");
+  }
+
+  @Test
+  public void deriveM2MColumn() {
+    assertThat(namingConvention.deriveM2MColumn("One", "Two")).isEqualTo("One_Two");
+  }
+
+  @Test
+  public void deriveM2MColumn_when_allQuoted() {
+    MatchingNamingConvention nc = createMatchingNamingConventionAllQuoted();
+    assertThat(nc.deriveM2MColumn("[One]", "[Two]")).isEqualTo("[One_Two]");
+  }
+
   @Test
   public void getColumnFromProperty_when_allQuoted() {
 
@@ -50,11 +94,16 @@ public class MatchingNamingConventionTest {
     assertNull(tableName.getSchema());
   }
 
-
   @Test
   public void getSequenceName() {
     MatchingNamingConvention nc = createMatchingNamingConventionAllQuoted();
-    assertEquals("Customer_seq", nc.getSequenceName("[Customer]", null));
+    assertThat(nc.getSequenceName("[Customer]", null)).isEqualTo("[Customer_seq]");
+  }
+
+  @Test
+  public void getSequenceName_when_quotedSchema() {
+    MatchingNamingConvention nc = createMatchingNamingConventionAllQuoted();
+    assertThat(nc.getSequenceName("[dbo].[Customer]", null)).isEqualTo("[dbo].[Customer_seq]");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/config/TestTableName.java b/ebean-core/src/test/java/org/tests/config/TestTableName.java
index f42e98c09..83fefa08b 100644
--- a/ebean-core/src/test/java/org/tests/config/TestTableName.java
+++ b/ebean-core/src/test/java/org/tests/config/TestTableName.java
@@ -5,8 +5,28 @@ import io.ebean.config.TableName;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestTableName extends BaseTestCase {
 
+  @Test
+  public void withCatalogAndSchema() {
+    TableName t = new TableName("a.b.c");
+    assertThat(t.withCatalogAndSchema("foo")).isEqualTo("a.b.foo");
+  }
+
+  @Test
+  public void withCatalogAndSchema_when_quoted() {
+    TableName t = new TableName("[a].[b].[c]");
+    assertThat(t.withCatalogAndSchema("foo")).isEqualTo("[a].[b].foo");
+
+    TableName noCat = new TableName("[b].[c]");
+    assertThat(noCat.withCatalogAndSchema("foo")).isEqualTo("[b].foo");
+
+    TableName tabOnly = new TableName("[c]");
+    assertThat(tabOnly.withCatalogAndSchema("foo")).isEqualTo("foo");
+  }
+
   @Test
   public void test() {
 

From 2e16f05a701ce6c1ea378d345dbe63eb05902fb5 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 10:03:35 +1300
Subject: [PATCH 149/447] #2199 - ScalarTypeWrapper doesn't handle "nullValue"
 correctly

Handles the case for ScalarTypeConverter with custom null value and binding the custom null value (via query parameter, CallableSql parameter etc)
---
 .../server/type/ScalarTypeWrapper.java        |  3 --
 .../server/type/ScalarTypeWrapperOidTest.java | 29 +++++++++++++++++++
 .../model/ivo/converter/OidTypeConverter.java |  9 +++---
 3 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index 8adee19d3..1ef378e03 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -177,9 +177,6 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
   @SuppressWarnings("unchecked")
   public Object toJdbcType(Object value) {
     Object sv = converter.unwrapValue((B) value);
-    if (sv == null) {
-      return nullValue;
-    }
     return scalarType.toJdbcType(sv);
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java
new file mode 100644
index 000000000..cb602e7f2
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java
@@ -0,0 +1,29 @@
+package io.ebeaninternal.server.type;
+
+import org.junit.Test;
+import org.tests.model.ivo.Oid;
+import org.tests.model.ivo.converter.OidTypeConverter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ScalarTypeWrapperOidTest {
+
+  private final OidTypeConverter oidTypeConverter = new OidTypeConverter();
+  private final ScalarTypeLong longType = new ScalarTypeLong();
+  private final ScalarTypeWrapper<Oid<?>,Long> wrapper = new ScalarTypeWrapper(Oid.class, longType, oidTypeConverter);
+
+  @Test
+  public void toJdbcType() {
+
+    assertThat(wrapper.toJdbcType(new Oid<String>(42))).isEqualTo(42L);
+    assertThat(wrapper.toJdbcType(new Oid<String>(98))).isEqualTo(98L);
+  }
+
+  @Test
+  public void toJdbcType_when_nullValue() {
+    assertThat(wrapper.toJdbcType(OidTypeConverter.NULL_VALUE)).isNull();
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java
index a4f7fd782..73e67e206 100644
--- a/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java
+++ b/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java
@@ -5,22 +5,21 @@ import org.tests.model.ivo.Oid;
 
 public class OidTypeConverter implements ScalarTypeConverter<Oid<?>,Long> {
 
+  public static final Oid<?> NULL_VALUE = new Oid<>(0);
+
   @Override
   public Oid<?> getNullValue() {
-    return null;
+    return NULL_VALUE;
   }
 
   @Override
   public Oid<?> wrapValue(Long scalarType) {
-    if (scalarType == null) {
-      return null;
-    }
     return new Oid<>(scalarType);
   }
 
   @Override
   public Long unwrapValue(Oid<?> beanType) {
-    if (beanType == null) {
+    if (NULL_VALUE.equals(beanType)) {
       return null;
     }
     return beanType.getValue();

From bb73c30bb77e6e1c548c91747e6a033d82f3b7cf Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 16:14:46 +1300
Subject: [PATCH 150/447] #2199 - ScalarTypeWrapper doesn't handle "nullValue"
 correctly

Fix for - standard JPA AttributeConverter which doesn't have the getNullValue method, he/she can't convert null to a custom null object

AttributeConverterAdapter probes the AttributeConverter for the nullValue rather than just assuming it is null.
---
 .../type/AttributeConverterAdapter.java       | 12 +++-
 .../type/ScalarTypeWrapperAdapterTest.java    | 62 +++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java
index d72dd6f9c..e358dd891 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java
@@ -10,14 +10,24 @@ import javax.persistence.AttributeConverter;
 class AttributeConverterAdapter<B,S> implements ScalarTypeConverter<B, S> {
 
   private final AttributeConverter<B,S> converter;
+  private final B nullValue;
 
   AttributeConverterAdapter(AttributeConverter<B, S> converter) {
     this.converter = converter;
+    this.nullValue = probeNullValue();
+  }
+
+  private B probeNullValue() {
+    try {
+      return converter.convertToEntityAttribute(null);
+    } catch (Exception e) {
+      return null;
+    }
   }
 
   @Override
   public B getNullValue() {
-    return null;
+    return nullValue;
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java
new file mode 100644
index 000000000..1f79db003
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java
@@ -0,0 +1,62 @@
+package io.ebeaninternal.server.type;
+
+import org.junit.Test;
+
+import javax.persistence.AttributeConverter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ScalarTypeWrapperAdapterTest {
+
+  private final ScalarTypeString stringType = ScalarTypeString.INSTANCE;
+  private final MyAdapter myAdapter = new MyAdapter();
+  private final AttributeConverterAdapter converterAdapter = new AttributeConverterAdapter(myAdapter);
+  private final ScalarTypeWrapper<Long, String> wrapper = new ScalarTypeWrapper(Long.class, stringType, converterAdapter);
+
+  @Test
+  public void toJdbcType() {
+    assertThat(wrapper.toJdbcType(42L)).isEqualTo("L42");
+    assertThat(wrapper.toJdbcType(93L)).isEqualTo("L93");
+  }
+
+  @Test
+  public void toJdbcType_when_nullValue() {
+    assertThat(wrapper.toJdbcType(MyAdapter.NULL_VAL)).isNull();
+  }
+
+  @Test
+  public void toBeanType_when_null_expect_customNullValue() {
+    assertThat(wrapper.toBeanType(null)).isEqualTo(MyAdapter.NULL_VAL);
+  }
+
+  @Test
+  public void toBeanType() {
+    assertThat(wrapper.toBeanType("L34")).isEqualTo(34L);
+  }
+
+  /**
+   * An AttributeConverter with a custom null value (of -1L).
+   */
+  private static class MyAdapter implements AttributeConverter<Long, String> {
+
+    private static final Long NULL_VAL = -1L;
+
+    @Override
+    public String convertToDatabaseColumn(Long val) {
+      if (val == null || val.equals(NULL_VAL)) {
+        return null;
+      }
+      return "L" + val;
+    }
+
+    @Override
+    public Long convertToEntityAttribute(String dbData) {
+      if (dbData == null) {
+        return NULL_VAL;
+      }
+      return Long.parseLong(dbData.substring(1));
+    }
+  }
+}

From e40a53940653062ff5d4c164c4033c9b8d88bc69 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 17:02:41 +1300
Subject: [PATCH 151/447] #2200 - ENH: Add DtoQuery findEach with batch
 consumer - findEach(int batchSize, Consumer<List<T>> consumer)

---
 .../src/main/java/io/ebean/DtoQuery.java      | 11 ++++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  5 ++
 .../server/core/DefaultServer.java            | 11 ++++
 .../server/core/DtoQueryRequest.java          |  5 ++
 .../server/query/DtoQueryEngine.java          | 21 +++++++
 .../server/querydefn/DefaultDtoQuery.java     |  5 ++
 .../src/test/java/io/ebean/DtoQueryTest.java  | 62 +++++++++++++++++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  4 ++
 .../java/org/tests/model/basic/EBasicLog.java |  4 ++
 .../org/tests/model/basic/EBasicWithLog.java  |  2 +-
 10 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/ebean-api/src/main/java/io/ebean/DtoQuery.java b/ebean-api/src/main/java/io/ebean/DtoQuery.java
index bb2fa43ab..33f439b93 100644
--- a/ebean-api/src/main/java/io/ebean/DtoQuery.java
+++ b/ebean-api/src/main/java/io/ebean/DtoQuery.java
@@ -53,6 +53,17 @@ public interface DtoQuery<T> {
    */
   void findEach(Consumer<T> consumer);
 
+  /**
+   * Execute the query iterating the results and batching them for the consumer.
+   * <p>
+   * This runs like findEach streaming results from the database but just collects the results
+   * into batches to pass to the consumer.
+   *
+   * @param batch    The number of dto beans to collect before given them to the consumer
+   * @param consumer The consumer to process the batch of DTO beans
+   */
+  void findEach(int batch, Consumer<List<T>> consumer);
+
   /**
    * Execute the query iterating a row at a time with the ability to stop consuming part way through.
    * <p>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index e9f26b2b2..deb9c281c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -264,6 +264,11 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
    */
   <T> void findDtoEach(SpiDtoQuery<T> query, Consumer<T> consumer);
 
+  /**
+   * DTO findEach batch query.
+   */
+  <T> void findDtoEach(SpiDtoQuery<T> query, int batch, Consumer<List<T>> consumer);
+
   /**
    * DTO findEachWhile query.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index a51bff04d..34a094301 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1597,6 +1597,17 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public <T> void findDtoEach(SpiDtoQuery<T> query, int batch, Consumer<List<T>> consumer) {
+    DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
+    try {
+      request.initTransIfRequired();
+      request.findEach(batch, consumer);
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
   @Override
   public <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer) {
     DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 0dd1857c3..120e98a27 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -92,6 +92,11 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
     queryEngine.findEach(this, consumer);
   }
 
+  public void findEach(int batch, Consumer<List<T>> consumer) {
+    flushJdbcBatchOnQuery();
+    queryEngine.findEach(this, batch, consumer);
+  }
+
   public void findEachWhile(Predicate<T> consumer) {
     flushJdbcBatchOnQuery();
     queryEngine.findEachWhile(this, consumer);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
index 911bcd511..bbd111f1c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
@@ -42,7 +42,28 @@ public class DtoQueryEngine {
       }
     } catch (Exception e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
+    } finally {
+      request.close();
+    }
+  }
 
+  public <T> void findEach(DtoQueryRequest<T> request, int batchSize, Consumer<List<T>> consumer) {
+    try {
+      List<T> buffer = new ArrayList<>();
+      request.executeSql(binder, SpiQuery.Type.ITERATE);
+      while (request.next()) {
+        buffer.add(request.readNextBean());
+        if (buffer.size() >= batchSize) {
+          consumer.accept(buffer);
+          buffer.clear();
+        }
+      }
+      if (!buffer.isEmpty()) {
+        // consume the remainder
+        consumer.accept(buffer);
+      }
+    } catch (Exception e) {
+      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
     } finally {
       request.close();
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index 12d5545e0..d5877572a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -102,6 +102,11 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
     server.findDtoEach(this, consumer);
   }
 
+  @Override
+  public void findEach(int batch, Consumer<List<T>> consumer) {
+    server.findDtoEach(this, batch, consumer);
+  }
+
   @Override
   public void findEachWhile(Predicate<T> consumer) {
     server.findDtoEachWhile(this, consumer);
diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java
index 3a2c8e35e..eea1c6da3 100644
--- a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java
+++ b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java
@@ -10,11 +10,13 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.EBasicLog;
 import org.tests.model.basic.ResetBasicData;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,6 +24,9 @@ public class DtoQueryTest extends BaseTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(DtoQueryTest.class);
 
+  private final AtomicInteger batchCount = new AtomicInteger();
+  private final AtomicInteger rowCount = new AtomicInteger();
+
   @Test
   public void dto_findList_constructorMatch() {
 
@@ -78,6 +83,63 @@ public class DtoQueryTest extends BaseTestCase {
     assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
   }
 
+  private void resetFindEachCounts() {
+    batchCount.set(0);
+    rowCount.set(0);
+  }
+
+  @Test
+  public void dto_findEachBatch() {
+    seedData(); // 15 rows inserted to fetch
+
+    resetFindEachCounts();
+    findEachWithBatch(5);
+    assertThat(batchCount.get()).isEqualTo(3);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(10);
+    assertThat(batchCount.get()).isEqualTo(2);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(14);
+    assertThat(batchCount.get()).isEqualTo(2);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(15);
+    assertThat(batchCount.get()).isEqualTo(1);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(16);
+    assertThat(batchCount.get()).isEqualTo(1);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(20);
+    assertThat(batchCount.get()).isEqualTo(1);
+    assertThat(rowCount.get()).isEqualTo(15);
+  }
+
+  private void findEachWithBatch(int batchSize) {
+    server().findDto(DCust.class, "select id, name from e_basic_log where name like ?")
+      .setParameter("dtoFindEachBatch%")
+      .findEach(batchSize, batch -> {
+        int batchId = batchCount.incrementAndGet();
+        int rows = rowCount.addAndGet(batch.size());
+        log.info("batch {} rows {}", batchId, rows);
+      });
+  }
+
+  private void seedData() {
+    for (int i = 0; i < 15; i++) {
+      EBasicLog log = new EBasicLog("dtoFindEachBatch "+i);
+      DB.save(log);
+    }
+  }
+
   @Test
   public void dto_findOneEmpty() {
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 09e75825b..03ed3362f 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -445,6 +445,10 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   public <T> void findDtoEach(SpiDtoQuery<T> query, Consumer<T> consumer) {
   }
 
+  @Override
+  public <T> void findDtoEach(SpiDtoQuery<T> query, int batch, Consumer<List<T>> consumer) {
+  }
+
   @Override
   public <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer) {
   }
diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java b/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java
index e0de4ce92..160fff74a 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java
@@ -13,6 +13,10 @@ public class EBasicLog {
 
   String name;
 
+  public EBasicLog(String name) {
+    this.name = name;
+  }
+
   public Long getId() {
     return id;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
index 743796e52..3ff7634f0 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java
@@ -116,7 +116,7 @@ public class EBasicWithLog {
   }
 
   private void writeLog(String title) {
-    EBasicLog log = new EBasicLog();
+    EBasicLog log = new EBasicLog(name);
     log.setName(title);
     DB.save(log);
   }

From e1f9d106f070d465d73fdfadfb6268b32ec717b9 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 17:12:21 +1300
Subject: [PATCH 152/447] Additional tests for #2191 query findEach batch
 consumer

---
 .../org/tests/query/TestQueryFindEach.java    | 68 +++++++++++++++++--
 1 file changed, 64 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
index f0f959428..1a2c16bab 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
@@ -2,7 +2,6 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.FetchConfig;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.Transactional;
@@ -10,8 +9,11 @@ import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.api.SpiTransaction;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.EBasicLog;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.o2m.OmBasicChild;
 import org.tests.o2m.OmBasicParent;
@@ -21,13 +23,14 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
 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.fail;
+import static org.junit.Assert.*;
 
 public class TestQueryFindEach extends BaseTestCase {
 
+  private static final Logger log = LoggerFactory.getLogger(TestQueryFindEach.class);
   private final Random random = new Random();
+  private final AtomicInteger batchCount = new AtomicInteger();
+  private final AtomicInteger rowCount = new AtomicInteger();
 
   @Test
   public void test() {
@@ -49,6 +52,63 @@ public class TestQueryFindEach extends BaseTestCase {
     assertEquals(2, counter.get());
   }
 
+  private void resetFindEachCounts() {
+    batchCount.set(0);
+    rowCount.set(0);
+  }
+
+  private void seedData() {
+    for (int i = 0; i < 15; i++) {
+      EBasicLog log = new EBasicLog("findEachBatch "+i);
+      DB.save(log);
+    }
+  }
+
+  @Test
+  public void findEachBatch() {
+    seedData();
+
+    resetFindEachCounts();
+    findEachWithBatch(5);
+    assertThat(batchCount.get()).isEqualTo(3);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(10);
+    assertThat(batchCount.get()).isEqualTo(2);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(14);
+    assertThat(batchCount.get()).isEqualTo(2);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(15);
+    assertThat(batchCount.get()).isEqualTo(1);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(16);
+    assertThat(batchCount.get()).isEqualTo(1);
+    assertThat(rowCount.get()).isEqualTo(15);
+
+    resetFindEachCounts();
+    findEachWithBatch(20);
+    assertThat(batchCount.get()).isEqualTo(1);
+    assertThat(rowCount.get()).isEqualTo(15);
+  }
+
+  private void findEachWithBatch(int batchSize) {
+    DB.find(EBasicLog.class)
+      .where().startsWith("name","findEachBatch")
+      .findEach(batchSize, batch -> {
+        int batchId = batchCount.incrementAndGet();
+        int rows = rowCount.addAndGet(batch.size());
+        log.info("batch id:{} size:{} total rows:{}", batchId, batch.size(), rows);
+      });
+  }
+
   @Test
   public void persistenceContext_scope() {
 

From 9b066e4eac14bc1057d6f12c4362e39789b90501 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 21:26:50 +1300
Subject: [PATCH 153/447] Bump version to 12.8.0-SNAPSHOT

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  4 ++--
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 |  8 ++++----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  |  8 ++++----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml | 10 +++++-----
 pom.xml                            |  2 +-
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index c073c2699..852f49586 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 4ced5a224..572584041 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 2293b2db9..cbb2fe5f4 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.7.3-SNAPSHOT</version>
+        <version>12.8.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 9e7a3c6eb..569ba1fd1 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index b493318d1..91fffa399 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 571f4e090..8e56bffc8 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 4c33334e1..ae74fc720 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 0ae68425e..43e580912 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 99fe84dca..1114e25d2 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 132ef56e2..2245f8288 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 5ea354664..56808f776 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 4b5e47899..066be5f9f 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 7356b26ff..6176a570c 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 9bf33578e..5d87a6533 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.7.3-SNAPSHOT</version>
+      <version>12.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -107,7 +107,7 @@
 <!--                  <groupId>io.ebean</groupId>-->
 <!--                  <artifactId>kotlin-querybean-generator</artifactId>-->
 <!--&lt;!&ndash;                  <version>12.7.1</version>&ndash;&gt;-->
-<!--                  <version>12.7.3-SNAPSHOT</version>-->
+<!--                  <version>12.8.0-SNAPSHOT</version>-->
 <!--                </annotationProcessorPath>-->
 <!--              </annotationProcessorPaths>-->
             </configuration>
diff --git a/pom.xml b/pom.xml
index 8e06ae121..1b27fe76d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.7.3-SNAPSHOT</version>
+  <version>12.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index bc6fc7019..4abbf7db8 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.7.3-SNAPSHOT</version>
+    <version>12.8.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From ce1d2803ce77da7cc935e1fd83ba6944c5f4c998 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 22:18:34 +1300
Subject: [PATCH 154/447] Bump test wait time for redis

---
 ebean-redis/src/test/java/org/integration/ClusterTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java
index 0bb546526..a6d9515c8 100644
--- a/ebean-redis/src/test/java/org/integration/ClusterTest.java
+++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java
@@ -118,6 +118,6 @@ public class ClusterTest {
   }
 
   private void allowAsyncMessaging() throws InterruptedException {
-    Thread.sleep(20);
+    Thread.sleep(50);
   }
 }

From 7ab7b612f64305ead12df7aad017328b0db63e08 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 22:23:34 +1300
Subject: [PATCH 155/447] [maven-release-plugin] prepare release
 ebean-parent-12.8.0

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 852f49586..b14da4897 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 572584041..2f2195bae 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index cbb2fe5f4..a1ff72303 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.0-SNAPSHOT</version>
+        <version>12.8.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 569ba1fd1..7261bb679 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 91fffa399..9541f5126 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 8e56bffc8..102246313 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index ae74fc720..a0c1e9a82 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 43e580912..f1017d3cf 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 1114e25d2..a5e3c1514 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 2245f8288..5ec002181 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 56808f776..86c4572b5 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 066be5f9f..5f9131316 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 6176a570c..42f88d25b 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 5d87a6533..339bee3af 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0-SNAPSHOT</version>
+      <version>12.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 1b27fe76d..a8c358a93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.0-SNAPSHOT</version>
+  <version>12.8.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.6.5</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 4abbf7db8..5bde1c208 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0-SNAPSHOT</version>
+    <version>12.8.0</version>
   </parent>
 
   <name>querybean generator</name>

From f7905c8e949323829f55be3125160885984fff5a Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Mar 2021 22:30:17 +1300
Subject: [PATCH 156/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  4 ++--
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 |  8 ++++----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  |  8 ++++----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  2 +-
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index b14da4897..ce3ba3688 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 2f2195bae..5c081a9df 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index a1ff72303..e96c248d7 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.0</version>
+        <version>12.8.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 7261bb679..386d6d511 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 9541f5126..9d7f1e236 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 102246313..1ef8c0725 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index a0c1e9a82..4efce3a65 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index f1017d3cf..cd885187e 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index a5e3c1514..5b4bceec8 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 5ec002181..51f490b3b 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 86c4572b5..2a346b178 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 5f9131316..c32dab0c2 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 42f88d25b..33c8aeb60 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 339bee3af..7016e2aa4 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.0</version>
+      <version>12.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index a8c358a93..dbd383225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.0</version>
+  <version>12.8.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 5bde1c208..6e7bf295f 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.0</version>
+    <version>12.8.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 00b0fcaeb3e81417a8f211b3094f2e052136bbc4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 22 Mar 2021 23:24:16 +1300
Subject: [PATCH 157/447] #2202 - kotlin-maven-plugin issue with JDK 16

Temporary modify tests to not invoke the kotlin-maven-plugin while adding JDK 16 specific tests.

Hitting error InaccessibleObjectException: Unable to make protected void java.util.ResourceBundle.setParent(java.util.ResourceBundle) accessible: module java.base does not "opens java.util" to unnamed module @62732be7
---
 kotlin-querybean-generator/pom.xml | 77 +++++++++++++++---------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 7016e2aa4..cf3dca074 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>kotlin-querybean-generator</artifactId>
 
   <properties>
-    <kotlin.version>1.4.21</kotlin.version>
+    <kotlin.version>1.4.31</kotlin.version>
   </properties>
 
   <dependencies>
@@ -81,46 +81,47 @@
   <build>
     <testSourceDirectory>src/test/kotlin</testSourceDirectory>
     <plugins>
-      <plugin>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <version>${kotlin.version}</version>
-        <executions>
-          <execution>
-            <id>test-compile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-kapt</id>
-            <goals>
-              <goal>test-kapt</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>src/test/kotlin</sourceDir>
-              </sourceDirs>
-<!--              <annotationProcessorPaths>-->
-<!--                <annotationProcessorPath>-->
-<!--                  <groupId>io.ebean</groupId>-->
-<!--                  <artifactId>kotlin-querybean-generator</artifactId>-->
-<!--&lt;!&ndash;                  <version>12.7.1</version>&ndash;&gt;-->
-<!--                  <version>12.8.0-SNAPSHOT</version>-->
-<!--                </annotationProcessorPath>-->
-<!--              </annotationProcessorPaths>-->
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <jvmTarget>1.8</jvmTarget>
-        </configuration>
-      </plugin>
+<!--      <plugin>-->
+<!--        <groupId>org.jetbrains.kotlin</groupId>-->
+<!--        <artifactId>kotlin-maven-plugin</artifactId>-->
+<!--        <version>${kotlin.version}</version>-->
+<!--        <executions>-->
+<!--          <execution>-->
+<!--            <id>test-compile</id>-->
+<!--            <phase>test-compile</phase>-->
+<!--            <goals>-->
+<!--              <goal>test-compile</goal>-->
+<!--            </goals>-->
+<!--          </execution>-->
+<!--          <execution>-->
+<!--            <id>test-kapt</id>-->
+<!--            <goals>-->
+<!--              <goal>test-kapt</goal>-->
+<!--            </goals>-->
+<!--            <configuration>-->
+<!--              <sourceDirs>-->
+<!--                <sourceDir>src/test/kotlin</sourceDir>-->
+<!--              </sourceDirs>-->
+<!--&lt;!&ndash;              <annotationProcessorPaths>&ndash;&gt;-->
+<!--&lt;!&ndash;                <annotationProcessorPath>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <groupId>io.ebean</groupId>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <artifactId>kotlin-querybean-generator</artifactId>&ndash;&gt;-->
+<!--&lt;!&ndash;&lt;!&ndash;                  <version>12.7.1</version>&ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;                  <version>12.8.0-SNAPSHOT</version>&ndash;&gt;-->
+<!--&lt;!&ndash;                </annotationProcessorPath>&ndash;&gt;-->
+<!--&lt;!&ndash;              </annotationProcessorPaths>&ndash;&gt;-->
+<!--            </configuration>-->
+<!--          </execution>-->
+<!--        </executions>-->
+<!--        <configuration>-->
+<!--          <jvmTarget>1.8</jvmTarget>-->
+<!--&lt;!&ndash;          <args></args>&ndash;&gt;-->
+<!--        </configuration>-->
+<!--      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.8.1</version>
         <executions>
           <execution>
             <id>default-testCompile</id>

From 78965c1ac4476ea3f6fc03b945f9b8582cbc52f6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 22 Mar 2021 23:43:35 +1300
Subject: [PATCH 158/447] #2203 - Support use of Java Record type with @Entity,
 @Embeddable @IdClass

Allow java.lang.Record to be a root level parent for entity beans etc
---
 .../ebeaninternal/server/deploy/BeanDescriptorManager.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 0cb5deeaa..dca6b2b09 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -93,6 +93,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   private static final Logger logger = LoggerFactory.getLogger(BeanDescriptorManager.class);
 
   private static final BeanDescComparator beanDescComparator = new BeanDescComparator();
+  public static final String JAVA_LANG_RECORD = "java.lang.Record";
 
   private final ReadAnnotations readAnnotations;
   private final TransientProperties transientProperties;
@@ -1418,14 +1419,10 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   private void checkInheritedClasses(Class<?> beanClass) {
     Class<?> superclass = beanClass.getSuperclass();
-    if (Object.class.equals(superclass)) {
+    if (Object.class.equals(superclass) || Model.class.equals(superclass) || JAVA_LANG_RECORD.equals(superclass.getName())) {
       // we got to the top of the inheritance
       return;
     }
-    if (Model.class.equals(superclass)) {
-      // top of the inheritance. Not enhancing Model at this stage
-      return;
-    }
     if (!EntityBean.class.isAssignableFrom(superclass)) {
       if (isMappedSuperWithNoProperties(superclass)) {
         // ok to stop and treat just the same as Object.class

From 94bab5f83b7e0b959dc2e63e7a3e4c7609450bf0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 22 Mar 2021 23:44:10 +1300
Subject: [PATCH 159/447] #2203 - Support use of Java Record type with @Entity,
 @Embeddable @IdClass

Add tests for entity use of record type
---
 tests/pom.xml                                 | 23 +++++++
 tests/test-java16/pom.xml                     | 69 +++++++++++++++++++
 .../java/org/example/records/BaseModel.java   | 35 ++++++++++
 .../main/java/org/example/records/Course.java | 33 +++++++++
 .../example/records/CourseRecordEntity.java   | 13 ++++
 .../records/CourseRecordEntityTest.java       | 40 +++++++++++
 .../records/DtoQueryUsingRecordsTest.java     | 59 ++++++++++++++++
 .../src/test/resources/application-test.yaml  |  6 ++
 .../src/test/resources/logback-test.xml       | 22 ++++++
 9 files changed, 300 insertions(+)
 create mode 100644 tests/pom.xml
 create mode 100644 tests/test-java16/pom.xml
 create mode 100644 tests/test-java16/src/main/java/org/example/records/BaseModel.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/Course.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java
 create mode 100644 tests/test-java16/src/test/resources/application-test.yaml
 create mode 100644 tests/test-java16/src/test/resources/logback-test.xml

diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 000000000..2c79d71fa
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.avaje</groupId>
+    <artifactId>java8-oss</artifactId>
+    <version>2.3</version>
+  </parent>
+
+  <groupId>io.ebean</groupId>
+  <artifactId>tests</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>tests</name>
+  <description>test modules</description>
+
+  <modules>
+    <module>test-java16</module>
+  </modules>
+
+</project>
+
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
new file mode 100644
index 000000000..21dfa7852
--- /dev/null
+++ b/tests/test-java16/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+<!--  <parent>-->
+<!--    <groupId>org.avaje</groupId>-->
+<!--    <artifactId>java11-oss</artifactId>-->
+<!--    <version>2.3</version>-->
+<!--  </parent>-->
+
+  <groupId>io.ebean</groupId>
+  <artifactId>test-java16</artifactId>
+  <version>1.0</version>
+
+  <properties>
+    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean</artifactId>
+      <version>12.8.1-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-test</artifactId>
+      <version>12.8.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>junit</artifactId>
+      <version>5.0</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <release>16</release>
+          <source>16</source>
+          <target>16</target>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>io.ebean</groupId>
+              <artifactId>querybean-generator</artifactId>
+              <version>12.8.1-SNAPSHOT</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
+
diff --git a/tests/test-java16/src/main/java/org/example/records/BaseModel.java b/tests/test-java16/src/main/java/org/example/records/BaseModel.java
new file mode 100644
index 000000000..b5116e638
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/BaseModel.java
@@ -0,0 +1,35 @@
+package org.example.records;
+
+import io.ebean.Model;
+import io.ebean.annotation.Identity;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+
+@Identity(start = 1000, cache = 100)
+@MappedSuperclass
+public class BaseModel extends Model {
+
+  @Id
+  long id;
+
+  @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;
+  }
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/Course.java b/tests/test-java16/src/main/java/org/example/records/Course.java
new file mode 100644
index 000000000..19e8d09fe
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/Course.java
@@ -0,0 +1,33 @@
+package org.example.records;
+
+import io.ebean.annotation.Length;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "course")
+public class Course extends BaseModel {
+
+  @Length(200)
+  final String name;
+
+  @Length(400)
+  String summary;
+
+  public Course(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getSummary() {
+    return summary;
+  }
+
+  public void setSummary(String summary) {
+    this.summary = summary;
+  }
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java
new file mode 100644
index 000000000..dc95a8723
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java
@@ -0,0 +1,13 @@
+package org.example.records;
+
+import io.ebean.annotation.Identity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Identity(start = 1000)
+@Entity
+@Table(name="course_rec")
+public record CourseRecordEntity(@Id long id, String name, String notes) {
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java b/tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java
new file mode 100644
index 000000000..63e0c7d84
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java
@@ -0,0 +1,40 @@
+package org.example.records;
+
+import io.ebean.DB;
+import org.example.records.query.QCourseRecordEntity;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CourseRecordEntityTest {
+
+  @Test
+  void record_insert_withGivenIdValue() {
+    var course = new CourseRecordEntity(42, "SuppliedId", "Record");
+    DB.save(course);
+    assertThat(course.id()).isEqualTo(42);
+
+    var found = new QCourseRecordEntity()
+      .name.startsWith("SuppliedId")
+      .findOneOrEmpty();
+
+    assertThat(found).isPresent();
+    assertThat(found.get().id()).isEqualTo(42L);
+    assertThat(found.get().notes()).isEqualTo("Record");
+  }
+
+  @Test
+  void record_insert_usingGeneratedId() {
+    var course2 = new CourseRecordEntity(0, "Second", "Record with generated id");
+    DB.save(course2);
+    // as using @Identity(start = 1000)
+    assertThat(course2.id()).isEqualTo(1000);
+
+    var second = new QCourseRecordEntity()
+      .name.startsWith("Second")
+      .findOneOrEmpty();
+
+    assertThat(second).isPresent();
+    assertThat(second.get().notes()).isEqualTo("Record with generated id");
+  }
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java b/tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java
new file mode 100644
index 000000000..e64c15b1c
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/DtoQueryUsingRecordsTest.java
@@ -0,0 +1,59 @@
+package org.example.records;
+
+import io.ebean.DB;
+import org.example.records.query.QCourse;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.example.records.query.QCourse.Alias.id;
+import static org.example.records.query.QCourse.Alias.name;
+
+class DtoQueryUsingRecordsTest {
+
+  @Test
+  void dtoQuery_projectRecords() {
+
+    var course = new Course("Calculus");
+    course.setSummary("Something here");
+    course.save();
+
+    performOrmQuery();
+
+    records_via_SqlDtoQuery(course);
+    records_via_OrmQueryToDtoQuery(course);
+
+    course.delete();
+  }
+
+  private void performOrmQuery() {
+    List<Course> courses = new QCourse()
+      .name.startsWith("Calc")
+      .findList();
+
+    assertThat(courses).hasSize(1);
+  }
+
+  private void records_via_SqlDtoQuery(Course course) {
+    List<Foo> records = DB.findDto(Foo.class, "select id, name from course where name like ?")
+      .setParameter("Calc%")
+      .findList();
+
+    assertThat(records).hasSize(1);
+    assertThat(records.get(0).name()).isEqualTo(course.getName());
+  }
+
+  private void records_via_OrmQueryToDtoQuery(Course course) {
+    List<Foo> records2 = new QCourse()
+      .select(id, name )
+      .name.startsWith("Calc")
+      .asDto(Foo.class)
+      .findList();
+
+    assertThat(records2).hasSize(1);
+    assertThat(records2.get(0).name()).isEqualTo(course.getName());
+  }
+
+  public record Foo(long id, String name){}
+}
diff --git a/tests/test-java16/src/test/resources/application-test.yaml b/tests/test-java16/src/test/resources/application-test.yaml
new file mode 100644
index 000000000..029b11023
--- /dev/null
+++ b/tests/test-java16/src/test/resources/application-test.yaml
@@ -0,0 +1,6 @@
+ebean:
+  test:
+    platform: h2
+    ddlMode: dropCreate
+    dbName: foo
+
diff --git a/tests/test-java16/src/test/resources/logback-test.xml b/tests/test-java16/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..ce7ad5968
--- /dev/null
+++ b/tests/test-java16/src/test/resources/logback-test.xml
@@ -0,0 +1,22 @@
+<configuration scan="true" scanPeriod="10 seconds">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+  <logger name="org.avaje" level="TRACE"/>
+  <logger name="io.ebean" level="INFO"/>
+
+  <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"/>
+
+</configuration>

From 548454c90d7d920efb6e9b217d084924b2f6b6f1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 22 Mar 2021 23:57:14 +1300
Subject: [PATCH 160/447] #2203 - Support use of Java Record type with @Entity,
 @Embeddable @IdClass

Add tests for embedded use of record type
---
 .../java/org/example/records/Address.java     |  7 +++
 .../java/org/example/records/Contact.java     | 58 +++++++++++++++++++
 .../example/records/RecordAsEmbeddedTest.java | 48 +++++++++++++++
 3 files changed, 113 insertions(+)
 create mode 100644 tests/test-java16/src/main/java/org/example/records/Address.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/Contact.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java

diff --git a/tests/test-java16/src/main/java/org/example/records/Address.java b/tests/test-java16/src/main/java/org/example/records/Address.java
new file mode 100644
index 000000000..2ac531402
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/Address.java
@@ -0,0 +1,7 @@
+package org.example.records;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public record Address (String line1, String line2, String city) {
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/Contact.java b/tests/test-java16/src/main/java/org/example/records/Contact.java
new file mode 100644
index 000000000..871862f21
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/Contact.java
@@ -0,0 +1,58 @@
+package org.example.records;
+
+import io.ebean.Model;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class Contact extends Model {
+
+  @Id
+  private long id;
+
+  @Version
+  private long version;
+
+  private final String name;
+
+  @Embedded(prefix = "home_")
+  private Address homeAddress;
+
+  @Embedded(prefix = "work_")
+  private Address workAddress;
+
+  public Contact(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public Address getHomeAddress() {
+    return homeAddress;
+  }
+
+  public void setHomeAddress(Address homeAddress) {
+    this.homeAddress = homeAddress;
+  }
+
+  public Address getWorkAddress() {
+    return workAddress;
+  }
+
+  public void setWorkAddress(Address workAddress) {
+    this.workAddress = workAddress;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java b/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java
new file mode 100644
index 000000000..271481468
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java
@@ -0,0 +1,48 @@
+package org.example.records;
+
+import org.example.records.query.QContact;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.example.records.query.QContact.Alias.homeAddress;
+import static org.example.records.query.QContact.Alias.name;
+
+public class RecordAsEmbeddedTest {
+
+  @Test
+  void insert_query() {
+
+    var contact = new Contact("Rob");
+    contact.setWorkAddress(new Address("45 work", "workling", "wo"));
+    contact.setHomeAddress(new Address("94 home st", "homeline", "wo"));
+
+    contact.save();
+
+    Contact found = new QContact()
+      .id.eq(contact.getId())
+      .findOne();
+
+    assertThat(found.getWorkAddress().toString()).isEqualTo("Address[line1=45 work, line2=workling, city=wo]");
+    assertThat(found.getHomeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]");
+
+    Contact foundPartial = new QContact()
+      .select(name, homeAddress)
+      .id.eq(contact.getId())
+      .findOne();
+
+    // invoke lazy loading on getWorkAddress
+    assertThat(foundPartial.getWorkAddress().toString()).isEqualTo("Address[line1=45 work, line2=workling, city=wo]");
+    assertThat(foundPartial.getHomeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]");
+
+    Contact foundNoLazyLoading = new QContact()
+      .select(name, homeAddress)
+      .setDisableLazyLoading(true)
+      .id.eq(contact.getId())
+      .findOne();
+
+    // no lazy loading on getWorkAddress this time
+    assertThat(foundNoLazyLoading.getWorkAddress()).isNull();
+    assertThat(foundNoLazyLoading.getHomeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]");
+
+  }
+}

From 53c903fa4815ddda4aa07079790a247cbab9cecd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Mar 2021 00:10:28 +1300
Subject: [PATCH 161/447] #2203 - Support use of Java Record type with @Entity,
 @Embeddable @IdClass

Add tests for EmbeddedId use of record type
---
 .../java/org/example/records/UserRole.java    | 36 ++++++++++++++++++
 .../java/org/example/records/UserRoleId.java  |  7 ++++
 .../org/example/records/UserRoleTest.java     | 38 +++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 tests/test-java16/src/main/java/org/example/records/UserRole.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/UserRoleId.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/UserRoleTest.java

diff --git a/tests/test-java16/src/main/java/org/example/records/UserRole.java b/tests/test-java16/src/main/java/org/example/records/UserRole.java
new file mode 100644
index 000000000..682e61f4a
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/UserRole.java
@@ -0,0 +1,36 @@
+package org.example.records;
+
+import io.ebean.Model;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Version;
+
+@Entity
+public class UserRole extends Model {
+
+  @EmbeddedId
+  final UserRoleId id;
+
+  String note;
+
+  @Version
+  long version;
+
+  public UserRole(UserRoleId id, String note) {
+    this.id = id;
+    this.note = note;
+  }
+
+  public UserRoleId getId() {
+    return id;
+  }
+
+  public String getNote() {
+    return note;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/UserRoleId.java b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java
new file mode 100644
index 000000000..a0807de0a
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java
@@ -0,0 +1,7 @@
+package org.example.records;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public record UserRoleId(Integer userId, String roleId) {
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/UserRoleTest.java b/tests/test-java16/src/test/java/org/example/records/UserRoleTest.java
new file mode 100644
index 000000000..1b4231b58
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/UserRoleTest.java
@@ -0,0 +1,38 @@
+package org.example.records;
+
+import org.example.records.query.QUserRole;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class UserRoleTest {
+
+  final UserRoleId id = new UserRoleId(42, "R7");
+
+  @Test
+  void id_equals() {
+    assertThat(id).isEqualTo(new UserRoleId(42, "R7"));
+  }
+
+  @Test
+  void id_notEquals() {
+    assertThat(id).isNotEqualTo(new UserRoleId(43, "R7"));
+    assertThat(id).isNotEqualTo(new UserRoleId(42, "R8"));
+  }
+
+  @Test
+  void insert_query() {
+
+    var userRole = new UserRole(id, "hello");
+    userRole.save();
+
+    UserRole found = new QUserRole()
+      .id.eq(new UserRoleId(42, "R7"))
+      .findOne();
+
+    UserRoleId id1 = found.getId();
+    assertThat(id1).isEqualTo(id);
+    assertThat(id1.userId()).isEqualTo(42);
+    assertThat(id1.roleId()).isEqualTo("R7");
+  }
+}

From 09a887aeb7df25466286bf7a8eaf7f388b8187d8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Mar 2021 00:19:52 +1300
Subject: [PATCH 162/447] #2203 - Support use of Java Record type with @Entity,
 @Embeddable @IdClass

Add tests for IdClass use of record type
---
 .../java/org/example/records/UserSite.java    | 51 +++++++++++++++++++
 .../java/org/example/records/UserSiteId.java  |  8 +++
 .../example/records/RecordIdClassTest.java    | 34 +++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 tests/test-java16/src/main/java/org/example/records/UserSite.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/UserSiteId.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java

diff --git a/tests/test-java16/src/main/java/org/example/records/UserSite.java b/tests/test-java16/src/main/java/org/example/records/UserSite.java
new file mode 100644
index 000000000..a8cf46449
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/UserSite.java
@@ -0,0 +1,51 @@
+package org.example.records;
+
+import io.ebean.Model;
+
+import javax.persistence.*;
+import java.util.UUID;
+
+@IdClass(UserSiteId.class)
+@Entity
+public class UserSite extends Model {
+
+  @Id
+  final UUID userId;
+
+  @Id
+  final UUID siteId;
+
+  String note;
+
+  @Version
+  long version;
+
+  public UserSite(UUID userId, UUID siteId) {
+    this.userId = userId;
+    this.siteId = siteId;
+  }
+
+  public UUID getUserId() {
+    return userId;
+  }
+
+  public UUID getSiteId() {
+    return siteId;
+  }
+
+  public void setNote(String note) {
+    this.note = note;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public String getNote() {
+    return note;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/UserSiteId.java b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java
new file mode 100644
index 000000000..36c4dd599
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java
@@ -0,0 +1,8 @@
+package org.example.records;
+
+import javax.persistence.Embeddable;
+import java.util.UUID;
+
+@Embeddable
+public record UserSiteId(UUID userId, UUID siteId) {
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java b/tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java
new file mode 100644
index 000000000..47008c544
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/RecordIdClassTest.java
@@ -0,0 +1,34 @@
+package org.example.records;
+
+import org.example.records.query.QUserSite;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class RecordIdClassTest {
+
+  @Test
+  void insert_query() {
+
+    UUID userId = UUID.randomUUID();
+    UUID siteId = UUID.randomUUID();
+
+    var userSite = new UserSite(userId, siteId);
+    userSite.setNote("HelloIdClass");
+    userSite.save();
+
+    var id = new UserSiteId(userId, siteId);
+
+    UserSite found = new QUserSite()
+      .setId(id)
+      .findOne();
+
+    assertThat(found.getUserId()).isEqualTo(userId);
+    assertThat(found.getSiteId()).isEqualTo(siteId);
+    assertThat(found.getNote()).isEqualTo("HelloIdClass");
+
+
+  }
+}

From dd6a473008be0ee2c14c08f2012cd687cf68fa25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler=20=28JPo=29?= <jonas.poehler@foconis.de>
Date: Mon, 22 Mar 2021 15:59:59 +0100
Subject: [PATCH 163/447] ADD: Test and possible fix for (C)LOBs being handed
 out of connnection-context
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Pöhler (JPo) <jonas.poehler@foconis.de>
---
 .../server/rawsql/DRawSqlService.java         | 21 ++++++
 .../server/rawsql/TestRawSqlBuilder.java      | 64 +++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index 0b5eb4ad6..7c27264a8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.server.query.DefaultSqlRow;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.Types;
 
 public class DRawSqlService implements SpiRawSqlService {
 
@@ -49,6 +50,26 @@ public class DRawSqlService implements SpiRawSqlService {
         name = combine(meta.getSchemaName(i), meta.getTableName(i), name);
       }
       ret.put(name, resultSet.getObject(i));
+
+      // convert (C/B)LOBs to java objects.
+      // A java.sql.Clob depends on an open connection, so storing this object in a map
+      // that is accessed later, when the connection is closed, will result in a "connection is closed" exception.
+      // From the java.sql.Clob documentation: "... which means that a Clob object contains a logical pointer to the SQL CLOB
+      // data rather than the data itself."
+      switch (meta.getColumnType(i)) {
+        case Types.CLOB:
+        case Types.NCLOB:
+          ret.put(name, resultSet.getString(i));
+          break;
+
+        case Types.BLOB:
+          ret.put(name, resultSet.getBytes(i));
+          break;
+
+        default:
+          ret.put(name, resultSet.getObject(i));
+          break;
+      }
     }
     return ret;
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
index 4e0a32e24..0fa4c746e 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
@@ -9,17 +9,26 @@ import io.ebean.RawSqlBuilder;
 import io.ebean.SqlRow;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebeaninternal.server.core.DefaultServer;
 import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.EBasicClob;
+import org.tests.model.basic.PersistentFileContent;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.rawsql.ERawSqlAggBean;
 
 import javax.sql.DataSource;
+import java.nio.charset.StandardCharsets;
+import java.sql.Blob;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -283,4 +292,59 @@ public class TestRawSqlBuilder extends BaseTestCase {
     }
   }
 
+  @Test
+  public void testCLobClosedConnection() throws Exception {
+    final EBasicClob eBasicClob = new EBasicClob();
+    eBasicClob.setName("eBasicClob");
+    final String description = "This is the CLob description";
+    eBasicClob.setDescription(description);
+    DB.save(eBasicClob);
+
+    final String sql = "select description from ebasic_clob where id = ?";
+
+    List<SqlRow> rows = new ArrayList<>();
+    final DataSourceConfig config = ((DefaultServer) DB.getDefault()).getServerConfig().getDataSourceConfig();
+
+    try (Connection connection = DriverManager.getConnection(config.getUrl(), config.getUsername(), config.getPassword());
+         PreparedStatement stmt = connection.prepareStatement(sql)) {
+      stmt.setLong(1, eBasicClob.getId());
+
+      try (ResultSet resultSet = stmt.executeQuery()) {
+        while (resultSet.next()) {
+          rows.add(RawSqlBuilder.sqlRow(resultSet, "true", false));
+        }
+      }
+    }
+
+    assertThat(rows).hasSize(1);
+    assertThat(rows.get(0).getString("description")).isEqualTo(description);
+  }
+
+  @Test
+  public void testBLobClosedConnection() throws Exception {
+    final PersistentFileContent pfc = new PersistentFileContent();
+    final byte[] bytes = "This is the blob as String".getBytes(StandardCharsets.UTF_8);
+    pfc.setContent(bytes);
+    DB.save(pfc);
+
+    final String sql = "select content from persistent_file_content where id = ?";
+
+    List<SqlRow> rows = new ArrayList<>();
+    final DataSourceConfig config = ((DefaultServer) DB.getDefault()).getServerConfig().getDataSourceConfig();
+
+    try (Connection connection = DriverManager.getConnection(config.getUrl(), config.getUsername(), config.getPassword());
+         PreparedStatement stmt = connection.prepareStatement(sql)) {
+      stmt.setLong(1, pfc.getId());
+
+      try (ResultSet resultSet = stmt.executeQuery()) {
+        while (resultSet.next()) {
+          rows.add(RawSqlBuilder.sqlRow(resultSet, "true", false));
+        }
+      }
+    }
+
+    assertThat(rows).hasSize(1);
+    assertThat(((Blob) rows.get(0).get("content")).getBytes(0, bytes.length)).isEqualTo(bytes);
+  }
+
 }

From b5cef354ad39ad70b07dca042e2f9f26b829ad02 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Mar 2021 14:53:30 +1300
Subject: [PATCH 164/447] Refactor simplify
 LoadContext.getSecondaryQueriesMinBatchSize()

No functional change here. Just move the constant into DLoadContext.
---
 .../src/main/java/io/ebeaninternal/api/LoadContext.java       | 2 +-
 .../java/io/ebeaninternal/server/core/OrmQueryRequest.java    | 4 ++--
 .../io/ebeaninternal/server/loadcontext/DLoadContext.java     | 4 ++--
 .../main/java/io/ebeaninternal/server/query/CQueryEngine.java | 4 +---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadContext.java
index 4ba56604f..51f02826c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadContext.java
@@ -16,7 +16,7 @@ public interface LoadContext {
   /**
    * Return the minimum batch size when using QueryIterator with query joins.
    */
-  int getSecondaryQueriesMinBatchSize(int defaultQueryBatch);
+  int getSecondaryQueriesMinBatchSize();
 
   /**
    * Execute any secondary (+query) queries if there are any defined.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 9b0e1235e..3ec5deac7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -173,8 +173,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    * iteration is fine.
    * </p>
    */
-  public int getSecondaryQueriesMinBatchSize(int defaultQueryBatch) {
-    return loadContext.getSecondaryQueriesMinBatchSize(defaultQueryBatch);
+  public int getSecondaryQueriesMinBatchSize() {
+    return loadContext.getSecondaryQueriesMinBatchSize();
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index b5aa6f873..912b8fc0c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -182,7 +182,7 @@ public class DLoadContext implements LoadContext {
    * Return the minimum batch size when using QueryIterator with query joins.
    */
   @Override
-  public int getSecondaryQueriesMinBatchSize(int defaultQueryBatch) {
+  public int getSecondaryQueriesMinBatchSize() {
     if (secQuery == null) {
       return -1;
     }
@@ -190,7 +190,7 @@ public class DLoadContext implements LoadContext {
     for (OrmQueryProperties aSecQuery : secQuery) {
       int batchSize = aSecQuery.getBatchSize();
       if (batchSize == 0) {
-        batchSize = defaultQueryBatch;
+        batchSize = 100;
       }
       maxBatch = Math.max(maxBatch, batchSize);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 945b343ca..6e4804ca6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -37,8 +37,6 @@ public class CQueryEngine {
 
   private static final Logger logger = LoggerFactory.getLogger(CQueryEngine.class);
 
-  private static final int defaultSecondaryQueryBatchSize = 100;
-
   private static final String T0 = "t0";
 
   private final int defaultFetchSizeFindList;
@@ -214,7 +212,7 @@ public class CQueryEngine {
         logSql(cquery);
       }
       // first check batch sizes set on query joins
-      int iterateBufferSize = request.getSecondaryQueriesMinBatchSize(defaultSecondaryQueryBatchSize);
+      int iterateBufferSize = request.getSecondaryQueriesMinBatchSize();
       if (iterateBufferSize < 1) {
         // not set on query joins so check if batch size set on query itself
         int queryBatch = request.getQuery().getLazyLoadBatchSize();

From 562d175de1f4435d623f2c4abeec82b38b609f41 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Mar 2021 23:17:07 +1300
Subject: [PATCH 165/447] With FetchConfig.ofLazy() honor
 query.setLazyLoadBatchSize()

Use 0 for default lazy batch such that it honors a value set via query.setLazyLoadBatchSize()
---
 .../src/main/java/io/ebean/FetchConfig.java   | 21 ++++------
 .../server/loadcontext/DLoadBaseContext.java  |  8 +---
 .../server/loadcontext/DLoadBeanContext.java  |  4 +-
 .../server/loadcontext/DLoadContext.java      | 42 ++++++++++---------
 .../server/loadcontext/DLoadManyContext.java  |  7 +---
 .../test/java/io/ebean/FetchConfigTest.java   |  3 +-
 .../server/grammer/ParseFetchConfigTest.java  |  2 +-
 .../org/tests/query/TestQueryFindEach.java    | 38 ++++++++++++-----
 8 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/FetchConfig.java b/ebean-api/src/main/java/io/ebean/FetchConfig.java
index 64f4c3daa..e2d4fbe35 100644
--- a/ebean-api/src/main/java/io/ebean/FetchConfig.java
+++ b/ebean-api/src/main/java/io/ebean/FetchConfig.java
@@ -46,7 +46,7 @@ public class FetchConfig implements Serializable {
 
   /**
    * Deprecated - migrate to one of the static factory methods like {@link FetchConfig#ofQuery()}
-   *
+   * <p>
    * Construct using default JOIN mode.
    */
   @Deprecated
@@ -89,7 +89,7 @@ public class FetchConfig implements Serializable {
    * Return FetchConfig to lazily load the relationship.
    */
   public static FetchConfig ofLazy() {
-    return new FetchConfig(LAZY_MODE, 10);
+    return new FetchConfig(LAZY_MODE, 0);
   }
 
   /**
@@ -110,8 +110,8 @@ public class FetchConfig implements Serializable {
    * We want to migrate away from mutating FetchConfig to a fully immutable FetchConfig.
    */
   private FetchConfig mutate(int mode, int batchSize) {
-    if (batchSize < 1) {
-      throw new IllegalArgumentException("batch size "+batchSize+" must be > 0");
+    if (batchSize < 0) {
+      throw new IllegalArgumentException("batch size " + batchSize + " must be > 0");
     }
     this.mode = mode;
     this.batchSize = batchSize;
@@ -124,7 +124,7 @@ public class FetchConfig implements Serializable {
    */
   @Deprecated
   public FetchConfig lazy() {
-    return mutate(LAZY_MODE, 10);
+    return mutate(LAZY_MODE, 0);
   }
 
   /**
@@ -137,7 +137,7 @@ public class FetchConfig implements Serializable {
 
   /**
    * Deprecated - migrate to FetchConfig.ofQuery().
-   *
+   * <p>
    * Eagerly fetch the beans in this path as a separate query (rather than as
    * part of the main query).
    * <p>
@@ -150,17 +150,15 @@ public class FetchConfig implements Serializable {
 
   /**
    * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
-   *
+   * <p>
    * Eagerly fetch the beans in this path as a separate query (rather than as
    * part of the main query).
    * <p>
    * The queryBatchSize is the number of parent id's that this separate query
    * will load per batch.
-   * </p>
    * <p>
    * This will load all beans on this path eagerly unless a {@link #lazy(int)}
    * is also used.
-   * </p>
    *
    * @param batchSize the batch size used to load beans on this path
    */
@@ -171,13 +169,12 @@ public class FetchConfig implements Serializable {
 
   /**
    * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
-   *
+   * <p>
    * Eagerly fetch the first batch of beans on this path.
    * This is similar to {@link #query(int)} but only fetches the first batch.
    * <p>
    * If there are more parent beans than the batch size then they will not be
    * loaded eagerly but instead use lazy loading.
-   * </p>
    *
    * @param batchSize the number of parent beans this path is populated for
    */
@@ -188,7 +185,7 @@ public class FetchConfig implements Serializable {
 
   /**
    * Deprecated - migrate to FetchConfig.ofCache().
-   *
+   * <p>
    * Eagerly fetch the beans fetching the beans from the L2 bean cache
    * and using the DB for beans not in the cache.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
index 1be4717e9..24233cf87 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
@@ -33,7 +33,7 @@ abstract class DLoadBaseContext {
 
   final boolean queryFetch;
 
-  DLoadBaseContext(DLoadContext parent, BeanDescriptor<?> desc, String path, int defaultBatchSize, OrmQueryProperties queryProps) {
+  DLoadBaseContext(DLoadContext parent, BeanDescriptor<?> desc, String path, OrmQueryProperties queryProps) {
     this.parent = parent;
     this.serverName = parent.getEbeanServer().getName();
     this.desc = desc;
@@ -42,11 +42,7 @@ abstract class DLoadBaseContext {
     this.hitCache = parent.isBeanCacheGet() && desc.isBeanCaching();
     this.objectGraphNode = parent.getObjectGraphNode(path);
     this.queryFetch = queryProps != null && queryProps.isQueryFetch();
-    this.batchSize = initBatchSize(defaultBatchSize, queryProps);
-  }
-
-  private int initBatchSize(int batchSize, OrmQueryProperties queryProps) {
-    return queryProps == null ? batchSize : queryProps.getBatchSize();
+    this.batchSize = parent.batchSize(queryProps);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index d24a24532..25fffe5b7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -31,8 +31,8 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
   private LoadBuffer currentBuffer;
 
-  DLoadBeanContext(DLoadContext parent, BeanDescriptor<?> desc, String path, int defaultBatchSize, OrmQueryProperties queryProps) {
-    super(parent, desc, path, defaultBatchSize, queryProps);
+  DLoadBeanContext(DLoadContext parent, BeanDescriptor<?> desc, String path, OrmQueryProperties queryProps) {
+    super(parent, desc, path, queryProps);
     // bufferList only required when using query joins (queryFetch)
     this.bufferList = (!queryFetch) ? null : new ArrayList<>();
     this.currentBuffer = createBuffer(batchSize);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index 912b8fc0c..060633073 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -90,7 +90,7 @@ public class DLoadContext implements LoadContext {
     this.planLabel = null;
     this.profileLocation = null;
     this.profilingListener = null;
-    this.rootBeanContext = new DLoadBeanContext(this, rootDescriptor, null, defaultBatchSize, null);
+    this.rootBeanContext = new DLoadBeanContext(this, rootDescriptor, null, null);
   }
 
   private ObjectGraphOrigin initOrigin() {
@@ -128,7 +128,7 @@ public class DLoadContext implements LoadContext {
     }
 
     // initialise rootBeanContext after origin and relativePath have been set
-    this.rootBeanContext = new DLoadBeanContext(this, rootDescriptor, null, defaultBatchSize, null);
+    this.rootBeanContext = new DLoadBeanContext(this, rootDescriptor, null, null);
     registerSecondaryQueries(secondaryQueries);
   }
 
@@ -287,51 +287,55 @@ public class DLoadContext implements LoadContext {
     getManyContext(path, many).register(bc);
   }
 
+  int batchSize(OrmQueryProperties props) {
+    if (props == null) {
+      return defaultBatchSize;
+    }
+    int batchSize = props.getBatchSize();
+    return batchSize == 0 ? defaultBatchSize : batchSize;
+  }
+
   DLoadBeanContext getBeanContext(String path) {
     if (path == null) {
       return rootBeanContext;
     }
-    return beanMap.computeIfAbsent(path, p -> createBeanContext(p, defaultBatchSize, null));
+    return beanMap.computeIfAbsent(path, p -> createBeanContext(p, null));
   }
 
   DLoadBeanContext getBeanContextWithInherit(String path, BeanPropertyAssocOne<?> property) {
     String key = path + ":" + property.getTargetDescriptor().getName();
-    return beanMap.computeIfAbsent(key, p -> createBeanContext(property, path, defaultBatchSize, null));
+    return beanMap.computeIfAbsent(key, p -> createBeanContext(property, path, null));
   }
 
   private void registerSecondaryNode(boolean many, OrmQueryProperties props) {
-    int batchSize = props.getBatchSize();
-    if (batchSize == 0) {
-      batchSize = defaultBatchSize;
-    }
     String path = props.getPath();
     if (many) {
-      manyMap.put(path, createManyContext(path, batchSize, props));
+      manyMap.put(path, createManyContext(path, props));
     } else {
-      beanMap.put(path, createBeanContext(path, batchSize, props));
+      beanMap.put(path, createBeanContext(path, props));
     }
   }
 
   DLoadManyContext getManyContext(String path, BeanPropertyAssocMany<?> many) {
-    return manyMap.computeIfAbsent(path, p -> createManyContext(p, many, defaultBatchSize));
+    return manyMap.computeIfAbsent(path, p -> createManyContext(p, many));
   }
 
-  private DLoadManyContext createManyContext(String path, BeanPropertyAssocMany<?> many, int batchSize) {
-    return new DLoadManyContext(this, many, path, batchSize, null);
+  private DLoadManyContext createManyContext(String path, BeanPropertyAssocMany<?> many) {
+    return new DLoadManyContext(this, many, path, null);
   }
 
-  private DLoadManyContext createManyContext(String path, int batchSize, OrmQueryProperties queryProps) {
+  private DLoadManyContext createManyContext(String path, OrmQueryProperties queryProps) {
     BeanPropertyAssocMany<?> p = (BeanPropertyAssocMany<?>) getBeanProperty(rootDescriptor, path);
-    return new DLoadManyContext(this, p, path, batchSize, queryProps);
+    return new DLoadManyContext(this, p, path, queryProps);
   }
 
-  private DLoadBeanContext createBeanContext(String path, int batchSize, OrmQueryProperties queryProps) {
+  private DLoadBeanContext createBeanContext(String path, OrmQueryProperties queryProps) {
     BeanPropertyAssoc<?> p = (BeanPropertyAssoc<?>) getBeanProperty(rootDescriptor, path);
-    return new DLoadBeanContext(this, p.getTargetDescriptor(), path, batchSize, queryProps);
+    return new DLoadBeanContext(this, p.getTargetDescriptor(), path, queryProps);
   }
 
-  private DLoadBeanContext createBeanContext(BeanPropertyAssoc<?> property, String path, int batchSize, OrmQueryProperties queryProps) {
-    return new DLoadBeanContext(this, property.getTargetDescriptor(), path, batchSize, queryProps);
+  private DLoadBeanContext createBeanContext(BeanPropertyAssoc<?> property, String path, OrmQueryProperties queryProps) {
+    return new DLoadBeanContext(this, property.getTargetDescriptor(), path, queryProps);
   }
 
   private BeanProperty getBeanProperty(BeanDescriptor<?> desc, String path) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index 7a51127d8..5035f0802 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -31,11 +31,8 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
 
   private LoadBuffer currentBuffer;
 
-  DLoadManyContext(DLoadContext parent, BeanPropertyAssocMany<?> property,
-                          String path, int defaultBatchSize, OrmQueryProperties queryProps) {
-
-    super(parent, property.getBeanDescriptor(), path, defaultBatchSize, queryProps);
-
+  DLoadManyContext(DLoadContext parent, BeanPropertyAssocMany<?> property, String path, OrmQueryProperties queryProps) {
+    super(parent, property.getBeanDescriptor(), path, queryProps);
     this.property = property;
     this.docStoreMapped = property.isTargetDocStoreMapped();
     // bufferList only required when using query joins (queryFetch)
diff --git a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java b/ebean-core/src/test/java/io/ebean/FetchConfigTest.java
index abd09d692..f85808f6c 100644
--- a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/FetchConfigTest.java
@@ -1,6 +1,5 @@
 package io.ebean;
 
-import io.ebean.FetchConfig;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -10,7 +9,7 @@ public class FetchConfigTest {
   @Test
   public void testLazy() {
     FetchConfig config = new FetchConfig().lazy();
-    assertThat(config.getBatchSize()).isEqualTo(10);
+    assertThat(config.getBatchSize()).isEqualTo(0);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java
index a940cd26b..c4976f56d 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java
@@ -19,7 +19,7 @@ public class ParseFetchConfigTest {
   @Test
   public void parseLazy() {
     FetchConfig lazy = ParseFetchConfig.parse("lazy");
-    assertThat(lazy.getBatchSize()).isEqualTo(10);
+    assertThat(lazy.getBatchSize()).isEqualTo(0);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
index 1a2c16bab..b37f67279 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java
@@ -169,22 +169,40 @@ public class TestQueryFindEach extends BaseTestCase {
     DB.find(OmBasicParent.class).delete();
     insertData();
 
+    test_setLazyLoadBatchSize_withFetchLazy();
+
     LoggedSqlCollector.start();
-    try (final Transaction transaction = DB.beginTransaction()) {
-      // DB.find(OmBasicParent.class).findList();
-      DB.find(OmBasicChild.class)
-        .setLazyLoadBatchSize(100)
-        //.fetchQuery("parent","name")
-        //.fetch("parent","name")
-        .findEach(child -> {
-          assertNotNull(child.getParent().getName());
-        });
-    }
+
+    DB.find(OmBasicChild.class)
+      .setLazyLoadBatchSize(100)
+      .findEach(child -> {
+        assertNotNull(child.getParent().getName());
+      });
 
     final List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql.size()).isLessThan(50);
   }
 
+  private void test_setLazyLoadBatchSize_withFetchLazy() {
+
+    LoggedSqlCollector.start();
+
+    DB.find(OmBasicParent.class)
+      .setLazyLoadBatchSize(5)
+      .fetchLazy("children")
+      .setMaxRows(50)
+      .findEach(it -> {
+        it.getChildren().size();
+      });
+
+    final List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(11);
+    assertThat(sql.get(0)).contains(" from om_basic_parent ");
+    for (int i = 1; i < 11; i++) {
+      assertThat(sql.get(i)).contains(" --bind(Array[5]");
+    }
+  }
+
   @Transactional(batchSize = 40)
   private void insertData() {
     for (int i = 0; i < 150; i++) {

From abfa841ed787f332b637b9d7c16081b0bd92783f Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Mar 2021 23:51:07 +1300
Subject: [PATCH 166/447] #2205 - [oracle] Incorrect DDL generated for alter
 table add column

---
 .../ddlgeneration/platform/OracleDdl.java     |  1 +
 .../platform/PlatformDdl_AlterColumnTest.java | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java
index ea7d50d62..740870b09 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java
@@ -15,6 +15,7 @@ public class OracleDdl extends PlatformDdl {
     this.dropConstraintIfExists = "drop constraint";
     this.dropIndexIfExists = "drop index ";
     this.dropTableCascade = " cascade constraints purge";
+    this.addColumn = "add";
     this.alterColumn = "modify";
     this.columnSetNotnull = "not null";
     this.columnSetNull = "null";
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index 3a0a8d727..a696c4e62 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -9,11 +9,15 @@ 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.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
 import io.ebeaninternal.dbmigration.migration.AlterForeignKey;
+import io.ebeaninternal.dbmigration.migration.Column;
 import org.junit.Test;
 
+import java.io.IOException;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -238,6 +242,22 @@ public class PlatformDdl_AlterColumnTest {
     assertTrue(exceptionCaught);
   }
 
+  @Test
+  public void oracle_alterTableAddColumn() throws IOException {
+    DdlWrite write = new DdlWrite();
+    oraDdl.alterTableAddColumn(write.apply(), "my_table", simpleColumn(), false, "1");
+    assertThat(write.apply().getBuffer()).isEqualTo("alter table my_table add my_column int default 1 not null;\n");
+  }
+
+  private Column simpleColumn() {
+    Column column = new Column();
+    column.setName("my_column");
+    column.setType("int");
+    column.setNotnull(true);
+    column.setDefaultValue("1");
+    return column;
+  }
+
   @Test
   public void useIdentityType_h2() {
     assertEquals(h2Ddl.useIdentityType(null), IdType.IDENTITY);

From f341ff0167cd6838b27039267c05558952d03723 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Mar 2021 23:58:28 +1300
Subject: [PATCH 167/447] #2205 - [oracle] Incorrect DDL generated for alter
 table add column

---
 .../platform/BaseTableDdlTest.java            |  2 +-
 .../dbmigration/migrationtest/oracle/1.1.sql  | 28 +++++++++----------
 .../dbmigration/migrationtest/oracle/1.3.sql  | 10 +++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
index c0bbd4df6..c32d6ad80 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
@@ -61,7 +61,7 @@ public class BaseTableDdlTest {
     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)");
+    assertThat(ddl).contains("alter table mytable add col_name varchar2(20)");
   }
 
   @Test
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
index a7ebf50ef..7e6c98a90 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
@@ -17,11 +17,11 @@ 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(10);
-alter table migtest_ckey_detail add column two_key varchar2(127);
+alter table migtest_ckey_detail add one_key number(10);
+alter table migtest_ckey_detail add 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_ckey_parent add 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);
@@ -46,14 +46,14 @@ alter table migtest_e_basic modify status2 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) default 'foo''bar' not null;
-alter table migtest_e_basic add column new_boolean_field number(1) default 1 not null;
+alter table migtest_e_basic add new_string_field varchar2(255) default 'foo''bar' not null;
+alter table migtest_e_basic add 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 1 not null;
-alter table migtest_e_basic add column progress number(10) default 0 not null;
+alter table migtest_e_basic add new_boolean_field2 number(1) default 1 not null;
+alter table migtest_e_basic add 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) default 42 not null;
+alter table migtest_e_basic add 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;
@@ -70,12 +70,12 @@ comment on table migtest_e_history is 'We have history now';
 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_history2 add column new_column varchar2(20);
+alter table migtest_e_history2 add test_string2 varchar2(255);
+alter table migtest_e_history2 add test_string3 varchar2(255) default 'unknown' not null;
+alter table migtest_e_history2 add 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;
+alter table migtest_e_history5 add test_boolean number(1) default 0 not null;
 
 
 -- NOTE: table has @History - special migration may be necessary
@@ -83,9 +83,9 @@ 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_e_softdelete add deleted number(1) default 0 not null;
 
-alter table migtest_oto_child add column master_id number(19);
+alter table migtest_oto_child add 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);
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
index 47a095e4e..ceafdbcff 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
@@ -31,9 +31,9 @@ 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 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);
-alter table migtest_e_basic add column eref_id number(10);
+alter table migtest_e_basic add old_boolean number(1) default 0 not null;
+alter table migtest_e_basic add old_boolean2 number(1);
+alter table migtest_e_basic add eref_id number(10);
 
 alter table migtest_e_basic drop constraint uq_mgtst__bsc_stts_ndxtst1;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
@@ -47,8 +47,8 @@ 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_history2 add obsolete_string1 varchar2(255);
+alter table migtest_e_history2 add obsolete_string2 varchar2(255);
 
 alter table migtest_e_history4 modify test_number number(10);
 alter table migtest_e_history6 modify test_number1 drop default;

From 8992980689d2fe7936acfe4d0fbeadf72bb676a8 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Mar 2021 16:45:44 +1300
Subject: [PATCH 168/447] #2206 - Postgres DDL generation - for create index
 use "if not exists" clause

---
 .../ddlgeneration/platform/PlatformDdl.java   |  5 +-
 .../ddlgeneration/platform/PostgresDdl.java   |  1 +
 .../platform/WriteCreateIndex.java            | 13 +++
 .../platform/PlatformDdl_CreateIndexTest.java | 98 +++++++++++++++++++
 4 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 648cfac83..59cf38e0d 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 import io.ebean.annotation.ConstraintMode;
 import io.ebean.config.DatabaseConfig;
 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;
@@ -113,6 +112,7 @@ public class PlatformDdl {
 
   protected String uniqueIndex = "unique";
   protected String indexConcurrent = "";
+  protected String createIndexIfNotExists = "";
 
   /**
    * Set false for MsSqlServer to allow multiple nulls for OneToOne mapping.
@@ -414,6 +414,9 @@ public class PlatformDdl {
     if (create.isConcurrent()) {
       buffer.append(indexConcurrent);
     }
+    if (create.isNotExistsCheck()) {
+      buffer.append(createIndexIfNotExists);
+    }
     buffer.append(maxConstraintName(create.getIndexName())).append(" on ").append(create.getTableName());
     appendColumns(create.getColumns(), buffer);
     return buffer.toString();
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
index daeaf57fb..807bec456 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
@@ -18,6 +18,7 @@ public class PostgresDdl extends PlatformDdl {
     this.dropTableCascade = " cascade";
     this.columnSetType = "type ";
     this.alterTableIfExists = "if exists ";
+    this.createIndexIfNotExists = "if not exists ";
     this.columnSetNull = "drop not null";
     this.addForeignKeySkipCheck = " not valid";
     this.indexConcurrent = "concurrently ";
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java
index c743c979c..fbb7b72ce 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java
@@ -12,7 +12,11 @@ class WriteCreateIndex {
   private final boolean unique;
   private final boolean concurrent;
   private final String definition;
+  private final boolean notExistsCheck;
 
+  /**
+   * Create index for foreign key.
+   */
   WriteCreateIndex(String indexName, String tableName, String[] columns, boolean unique) {
     this.indexName = indexName;
     this.tableName = tableName;
@@ -20,8 +24,12 @@ class WriteCreateIndex {
     this.unique = unique;
     this.concurrent = false;
     this.definition = null;
+    this.notExistsCheck = false;
   }
 
+  /**
+   * Create non-foreign key index.
+   */
   public WriteCreateIndex(CreateIndex index) {
     this.indexName = index.getIndexName();
     this.tableName = index.getTableName();
@@ -29,6 +37,7 @@ class WriteCreateIndex {
     this.unique = Boolean.TRUE.equals(index.isUnique());
     this.concurrent = Boolean.TRUE.equals(index.isConcurrent());
     this.definition = index.getDefinition();
+    this.notExistsCheck = true;
   }
 
   public String getIndexName() {
@@ -58,4 +67,8 @@ class WriteCreateIndex {
   public boolean useDefinition() {
     return definition != null && !definition.isEmpty();
   }
+
+  public boolean isNotExistsCheck() {
+    return notExistsCheck;
+  }
 }
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java
new file mode 100644
index 000000000..d7d33feae
--- /dev/null
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java
@@ -0,0 +1,98 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.DB;
+import io.ebean.config.DatabaseConfig;
+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;
+import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
+import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
+public class PlatformDdl_CreateIndexTest {
+
+  private final PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform());
+  private final PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform());
+  private final PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform());
+  private final PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform());
+  private final PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform());
+  private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
+
+  {
+    DatabaseConfig config = DB.getDefault().getPluginApi().getServerConfig();
+    h2Ddl.configure(config);
+    pgDdl.configure(config);
+    mysqlDdl.configure(config);
+    oraDdl.configure(config);
+    sqlServerDdl.configure(config);
+    hanaDdl.configure(config);
+  }
+
+  WriteCreateIndex writeCreateIndex() {
+
+    return writeCreateIndex(true, true);
+  }
+
+  WriteCreateIndex writeCreateIndex(boolean unique, boolean concurrent) {
+    CreateIndex createIndex = new CreateIndex();
+    createIndex.setIndexName("ix_mytab_acol");
+    createIndex.setTableName("mytab");
+    createIndex.setColumns("acol");
+    createIndex.setUnique(unique);
+    createIndex.setConcurrent(concurrent);
+    return new WriteCreateIndex(createIndex);
+  }
+
+  WriteCreateIndex fkeyCreateIndex(boolean unique) {
+    return new WriteCreateIndex("ix_mytab_acol", "mytab", new String[]{"acol"}, unique);
+  }
+
+
+  @Test
+  public void createUniqueIndex() {
+
+    WriteCreateIndex createIndex = writeCreateIndex();
+
+    String sql = h2Ddl.createIndex(createIndex);
+    assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql);
+    sql = pgDdl.createIndex(createIndex);
+    assertEquals("create unique index concurrently if not exists ix_mytab_acol on mytab (acol)", sql);
+    sql = mysqlDdl.createIndex(createIndex);
+    assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql);
+    sql = sqlServerDdl.createIndex(createIndex);
+    assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql);
+    sql = oraDdl.createIndex(createIndex);
+    assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql);
+    sql = hanaDdl.createIndex(createIndex);
+    assertThat(sql).isEqualTo("-- explicit index \"ix_mytab_acol\" for single column \"acol\" of table \"mytab\" is not necessary");
+  }
+
+  @Test
+  public void postgres_createIndex() {
+
+    String sql = pgDdl.createIndex(writeCreateIndex(true, true));
+    assertEquals("create unique index concurrently if not exists ix_mytab_acol on mytab (acol)", sql);
+    sql = pgDdl.createIndex(writeCreateIndex(false, false));
+    assertEquals("create index if not exists ix_mytab_acol on mytab (acol)", sql);
+    sql = pgDdl.createIndex(writeCreateIndex(true, false));
+    assertEquals("create unique index if not exists ix_mytab_acol on mytab (acol)", sql);
+    sql = pgDdl.createIndex(writeCreateIndex(false, true));
+    assertEquals("create index concurrently if not exists ix_mytab_acol on mytab (acol)", sql);
+  }
+
+  @Test
+  public void postgres_fkeyCreateIndex() {
+    String sql = pgDdl.createIndex(fkeyCreateIndex(true));
+    assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql);
+
+    sql = pgDdl.createIndex(fkeyCreateIndex(false));
+    assertEquals("create index ix_mytab_acol on mytab (acol)", sql);
+  }
+
+}

From 57736185d0489b41e4dfdff4898e0ab9f950db2e Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Mar 2021 23:13:15 +1300
Subject: [PATCH 169/447] #2206 - Postgres DDL generation - for create index
 use "if not exists" clause

---
 .../migrationtest/postgres/1.0__initial.sql            |  8 ++++----
 .../dbmigration/migrationtest/postgres/1.1.sql         |  6 +++---
 .../dbmigration/migrationtest/postgres/1.3.sql         | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
index 5229ed032..af08de6d3 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
@@ -161,11 +161,11 @@ create table migtest_oto_master (
   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);
+create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 create index idxd_migtest_0 on migtest_oto_child using hash (upper(name)) where upper(name) = 'JIM';
-create index concurrently ix_migtest_oto_child_lowername_id on migtest_oto_child (lower(name),id);
-create index ix_migtest_oto_child_lowername on migtest_oto_child (lower(name));
+create index concurrently if not exists ix_migtest_oto_child_lowername_id on migtest_oto_child (lower(name),id);
+create index if not exists ix_migtest_oto_child_lowername on migtest_oto_child (lower(name));
 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 restrict;
 
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
index 6c97d734e..1c0ef5385 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
@@ -100,9 +100,9 @@ alter table migtest_e_softdelete add column deleted boolean default false not nu
 
 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);
-create index ix_migtest_oto_child_name on migtest_oto_child (name);
+create index if not exists ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index if not exists ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index if not exists ix_migtest_oto_child_name on migtest_oto_child (name);
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists idxd_migtest_0;
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
index a57b95ae2..dbcb50aac 100644
--- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
@@ -66,11 +66,11 @@ alter table migtest_e_history6 alter column test_number1 drop not null;
 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);
-create index ix_m12_otoc71 on migtest_oto_child (name);
-create unique index uq_m12_otoc71 on migtest_oto_child (lower(name));
-create unique index ix_migtest_oto_master_lowername on migtest_oto_master (lower(name));
+create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+create index if not exists ix_m12_otoc71 on migtest_oto_child (name);
+create unique index if not exists uq_m12_otoc71 on migtest_oto_child (lower(name));
+create unique index if not exists ix_migtest_oto_master_lowername on migtest_oto_master (lower(name));
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);

From 91044d0a757c4586e07212b6bdf717f20dcbe3b4 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Mar 2021 23:13:51 +1300
Subject: [PATCH 170/447] javadoc only - improve javadoc for
 DatabaseConfig.loadFromProperties()

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

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 8e65f9bb3..49c458743 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -2693,7 +2693,10 @@ public class DatabaseConfig {
   }
 
   /**
-   * Load settings from ebean.properties.
+   * Load settings from application.properties, application.yaml and other sources.
+   * <p>
+   * Uses <code>avaje-config</code> to load configuration properties.  Goto https://avaje.io/config
+   * for detail on how and where properties are loaded from.
    */
   public void loadFromProperties() {
     this.properties = Config.asProperties();

From 1f0ed629a7a11413cbb81b504df976fc250930f5 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Mar 2021 20:31:03 +1300
Subject: [PATCH 171/447] Bump java8-oss to 3.1 with removal of
 --illegal-access=permit argLine

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

diff --git a/pom.xml b/pom.xml
index dbd383225..297d5ab0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.3</version>
+    <version>3.1</version>
   </parent>
 
   <groupId>io.ebean</groupId>

From 819d391495166faec2b54e60a382e1c35bc11910 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Mar 2021 20:31:57 +1300
Subject: [PATCH 172/447] Bump agent maven plugin to 12.8.1

---
 ebean-bom/pom.xml                  | 4 ++--
 ebean-core/pom.xml                 | 2 +-
 ebean-ddl-generator/pom.xml        | 3 +--
 kotlin-querybean-generator/pom.xml | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index e96c248d7..665ea80be 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,8 +18,8 @@
     <ebean-migration.version>12.4.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.6.6</ebean-agent.version>
-    <ebean-maven-plugin.version>12.6.6</ebean-maven-plugin.version>
+    <ebean-agent.version>12.8.1</ebean-agent.version>
+    <ebean-maven-plugin.version>12.8.1</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 9d7f1e236..e8ecd9616 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.6.6</version>
+        <version>12.8.1</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 1ef8c0725..60300f7ce 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -10,7 +10,6 @@
   <name>ebean ddl generation</name>
   <description>DDL and DB Migration generation</description>
   <artifactId>ebean-ddl-generator</artifactId>
-<!--  <version>12.6.1.PreRelease.0</version>-->
 
   <dependencies>
 
@@ -77,7 +76,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.6.6</version>
+        <version>12.8.1</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index cf3dca074..588872181 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -146,7 +146,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.6.6</version>
+        <version>12.8.1</version>
         <executions>
           <execution>
             <id>test</id>

From 5cb9b9b2372a4a8349837f6b70a43267fd61ab6d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Mon, 29 Mar 2021 23:21:07 +1300
Subject: [PATCH 173/447] #2208 - When using fetchCache() with a single id /
 findOne ... doesn't hit L2 cache

Plus #2207 ENH: Query beans add support for nested FetchGroup
---
 .../io/ebeaninternal/api/CacheIdLookup.java   |  47 ++------
 .../ebeaninternal/api/CacheIdLookupMany.java  |  55 +++++++++
 .../api/CacheIdLookupSingle.java              |  38 ++++++
 .../io/ebeaninternal/api/SpiQueryFetch.java   |   5 +
 .../server/query/DefaultFetchGroupQuery.java  |   5 +
 .../server/querydefn/DefaultOrmQuery.java     |  15 ++-
 .../server/querydefn/OrmQueryProperties.java  |   2 +-
 .../java/io/ebean/typequery/TQAssocBean.java  |  32 ++++-
 .../test/java/org/querytest/QOrderTest.java   | 112 ++++++++++++++++++
 9 files changed, 270 insertions(+), 41 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookup.java b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookup.java
index 0ae791747..cf29cf6d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookup.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookup.java
@@ -1,52 +1,25 @@
 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.
+ * Process Cache lookup by Id(s).
  */
-public class CacheIdLookup<T> {
-
-  private final IdInExpression idInExpression;
-
-  private int remaining;
-
-  public CacheIdLookup(IdInExpression idInExpression) {
-    this.idInExpression = idInExpression;
-  }
+public interface CacheIdLookup<T> {
 
   /**
-   * Return the Id values for the in expression.
+   * Return the Id values to lookup against the L2 cache.
    */
-  public Collection<?> idValues() {
-    return idInExpression.idValues();
-  }
+  Collection<?> idValues();
 
   /**
-   * Process the hits returning the beans fetched from cache and
-   * adjusting the in expression (to not fetch the hits).
+   * Remove the hits returning the beans fetched from L2 cache.
    */
-  public List<T> removeHits(BeanCacheResult<T> cacheResult) {
+  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;
-  }
+  /**
+   * Return true if all beans where found in L2 cache.
+   */
+  boolean allHits();
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java
new file mode 100644
index 000000000..bfe9d5b84
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java
@@ -0,0 +1,55 @@
+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 CacheIdLookupMany<T> implements CacheIdLookup<T> {
+
+  private final IdInExpression idInExpression;
+
+  private int remaining;
+
+  public CacheIdLookupMany(IdInExpression idInExpression) {
+    this.idInExpression = idInExpression;
+  }
+
+  /**
+   * Return the Id values for the in expression.
+   */
+  @Override
+  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).
+   */
+  @Override
+  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;
+  }
+
+  @Override
+  public boolean allHits() {
+    return remaining == 0;
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java
new file mode 100644
index 000000000..47ee89c4b
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java
@@ -0,0 +1,38 @@
+package io.ebeaninternal.api;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Used for bean cache lookup with a single id value.
+ */
+public class CacheIdLookupSingle<T> implements CacheIdLookup<T> {
+
+  private final Object idValue;
+  private boolean found;
+
+  public CacheIdLookupSingle(Object idValue) {
+    this.idValue = idValue;
+  }
+
+  @Override
+  public Collection<?> idValues() {
+    return Collections.singleton(idValue);
+  }
+
+  @Override
+  public List<T> removeHits(BeanCacheResult<T> cacheResult) {
+    final List<BeanCacheResult.Entry<T>> hits = cacheResult.hits();
+    if (hits.size() == 1) {
+      found = true;
+      return Collections.singletonList(hits.get(0).getBean());
+    }
+    return Collections.emptyList();
+  }
+
+  @Override
+  public boolean allHits() {
+    return found;
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java
index 396827978..716dbc076 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryFetch.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.FetchConfig;
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 
 import java.util.Set;
 
@@ -19,4 +20,8 @@ public interface SpiQueryFetch {
    */
   void fetchProperties(String name, Set<String> properties, FetchConfig config);
 
+  /**
+   * Add a nested fetch graph.
+   */
+  void addNested(String name, OrmQueryDetail nestedDetail, FetchConfig config);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 5b2ed841a..9f7cb9b7e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -644,4 +644,9 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch
   public void fetchProperties(String property, Set<String> columns, FetchConfig config) {
     detail.fetchProperties(property, columns, config);
   }
+
+  @Override
+  public void addNested(String name, OrmQueryDetail nestedDetail, FetchConfig config) {
+    detail.addNested(name, nestedDetail, config);
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 074f364bc..867e16dfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -35,6 +35,8 @@ import io.ebean.plugin.BeanType;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.CacheIdLookup;
+import io.ebeaninternal.api.CacheIdLookupMany;
+import io.ebeaninternal.api.CacheIdLookupSingle;
 import io.ebeaninternal.api.HashQuery;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
@@ -740,10 +742,14 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
       return null;
     }
     List<SpiExpression> underlyingList = whereExpressions.getUnderlyingList();
-    if (underlyingList.size() == 1) {
+    if (underlyingList.isEmpty()) {
+      if (id != null) {
+        return new CacheIdLookupSingle<>(id);
+      }
+    } else if (underlyingList.size() == 1) {
       SpiExpression singleExpression = underlyingList.get(0);
       if (singleExpression instanceof IdInExpression) {
-        return new CacheIdLookup<>((IdInExpression) singleExpression);
+        return new CacheIdLookupMany<>((IdInExpression) singleExpression);
       }
     }
     return null;
@@ -1412,6 +1418,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     detail.fetchProperties(path, other);
   }
 
+  @Override
+  public void addNested(String name, OrmQueryDetail nestedDetail, FetchConfig config) {
+    detail.addNested(name, nestedDetail, config);
+  }
+
   @Override
   public Query<T> select(String columns) {
     detail.select(columns);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index d1a3aeafc..466bb3eb9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -120,8 +120,8 @@ public class OrmQueryProperties implements Serializable {
     this.parentPath = SplitName.parent(path);
     this.allProperties = other.allProperties;
     this.included = other.included;
-    this.cache = other.cache;
     this.fetchConfig = fetchConfig;
+    this.cache = fetchConfig.isCache();
   }
 
   /**
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
index c54862151..d5843a612 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
@@ -2,7 +2,10 @@ package io.ebean.typequery;
 
 import io.ebean.ExpressionList;
 import io.ebean.FetchConfig;
+import io.ebean.FetchGroup;
 import io.ebeaninternal.api.SpiQueryFetch;
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -142,7 +145,34 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
     return _root;
   }
 
-  private final SpiQueryFetch spiQuery() {
+  /**
+   * Fetch using the nested FetchGroup.
+   */
+  public R fetch(FetchGroup<T> nestedGroup) {
+    return fetchNested(nestedGroup, FETCH_DEFAULT);
+  }
+
+  /**
+   * Fetch query using the nested FetchGroup.
+   */
+  public R fetchQuery(FetchGroup<T> nestedGroup) {
+    return fetchNested(nestedGroup, FETCH_QUERY);
+  }
+
+  /**
+   * Fetch cache using the nested FetchGroup.
+   */
+  public R fetchCache(FetchGroup<T> nestedGroup) {
+    return fetchNested(nestedGroup, FETCH_CACHE);
+  }
+
+  private R fetchNested(FetchGroup<T> nestedGroup, FetchConfig fetchConfig) {
+    OrmQueryDetail nestedDetail = ((SpiFetchGroup) nestedGroup).underlying();
+    spiQuery().addNested(_name, nestedDetail, fetchConfig);
+    return _root;
+  }
+
+  private SpiQueryFetch spiQuery() {
     return (SpiQueryFetch)((TQRootBean) _root).query();
   }
 
diff --git a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
index 2f470fdb5..db899549c 100644
--- a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
+++ b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
@@ -3,9 +3,13 @@ package org.querytest;
 import io.ebean.DB;
 import io.ebean.FetchGroup;
 import io.ebean.test.LoggedSql;
+import org.example.domain.Customer;
 import org.example.domain.Order;
+import org.example.domain.otherpackage.PhoneNumber;
 import org.example.domain.query.QCustomer;
 import org.example.domain.query.QOrder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.List;
@@ -18,6 +22,26 @@ public class QOrderTest {
 
   private static final QOrder or = QOrder.alias();
 
+  private static final FetchGroup<Customer> fgC = QCustomer.forFetchGroup()
+    .select(cu.name, cu.phoneNumber)
+    .buildFetchGroup();
+
+  private static final FetchGroup<Order> fgNested1 = QOrder.forFetchGroup()
+    .select(or.status, or.shipDate)
+    .customer.fetch(fgC)
+    .buildFetchGroup();
+
+  private static final FetchGroup<Order> fgNested_fetchQuery = QOrder.forFetchGroup()
+    .select(or.status)
+    .customer.fetchQuery(fgC)
+    .buildFetchGroup();
+
+  private static final FetchGroup<Order> fgNested_fetchCache = QOrder.forFetchGroup()
+    .select(or.status)
+    .customer.fetchCache(fgC)
+    .buildFetchGroup();
+
+
   private static final FetchGroup<Order> fg = QOrder.forFetchGroup()
     .select(or.status, or.shipDate)
     .customer.fetchCache(cu.name, cu.status, cu.registered, cu.comments)
@@ -28,6 +52,20 @@ public class QOrderTest {
     .customer.fetch(cu.name)
     .buildFetchGroup();
 
+  private static Order order;
+  private static Customer customer;
+
+  @BeforeClass
+  public static void before() {
+    setupData();
+  }
+
+  @AfterClass
+  public static void after() {
+    DB.delete(order);
+    DB.delete(customer);
+  }
+
   @Test
   public void fetchCache() {
 
@@ -76,6 +114,69 @@ public class QOrderTest {
     assertThat(sql.get(0)).contains("select t0.id, t0.status, t1.id, t1.name from o_order t0 join be_customer t1 on t1.id = t0.customer_id where");
   }
 
+  @Test
+  public void viaFetchGraph_withNested() {
+
+    DB.getDefault();
+    LoggedSql.start();
+
+    new QOrder()
+      .status.eq(Order.Status.NEW)
+      .select(fgNested1)
+      .findList();
+
+    final List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.ship_date, t1.id, t1.name, t1.phone_number from o_order t0 join be_customer t1 on t1.id = t0.customer_id where");
+  }
+
+  @Test
+  public void viaFetchGraph_withNested_fetchQuery() {
+
+    DB.getDefault();
+    LoggedSql.start();
+
+    final Order found = new QOrder()
+      .id.eq(order.getId())
+      .select(fgNested_fetchQuery)
+      .findOne();
+
+    final List<String> sql = LoggedSql.stop();
+
+    // assert fetching customer via fetchQuery
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
+    assertThat(sql.get(1)).contains("select t0.id, t0.name, t0.phone_number from be_customer t0 where t0.id = ?");
+
+    assertThat(found.getCustomer().getPhoneNumber().getMsisdn()).isEqualTo("Ph1");
+  }
+
+
+  @Test
+  public void viaFetchGraph_withNested_fetchCache() {
+
+    DB.getDefault();
+
+    // ensure the customer is loaded in the L2 cache
+    new QCustomer().id.eq(customer.getId()).findOne();
+
+    LoggedSql.start();
+
+    final Order found = new QOrder()
+      .id.eq(order.getId())
+      .select(fgNested_fetchCache) // cache hit for customer
+      .findOne();
+
+    final String msisdn = found.getCustomer().getPhoneNumber().getMsisdn();
+    assertThat(msisdn).isEqualTo("Ph1");
+
+    final List<String> sql = LoggedSql.stop();
+
+    // assert we only hit DB for order
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.customer_id from o_order t0 where t0.id = ?");
+  }
+
   @Test
   public void select_partial() {
 
@@ -113,4 +214,15 @@ public class QOrderTest {
 
   }
 
+  private static void setupData() {
+
+    customer = new Customer();
+    customer.setName("Fred");
+    customer.setPhoneNumber(new PhoneNumber("Ph1"));
+    customer.save();
+
+    order = new Order();
+    order.setCustomer(customer);
+    order.save();
+  }
 }

From bd7499a5054564119b6609e1be94f8c43c87f181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler=20=28JPo=29?= <jonas.poehler@foconis.de>
Date: Mon, 29 Mar 2021 13:23:56 +0200
Subject: [PATCH 174/447] Use SoftReference in Cache, so it can be gc'ed if the
 jvm runs out of memory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Pöhler (JPo) <jonas.poehler@foconis.de>
---
 .../server/cache/DefaultServerCache.java      | 45 +++++++++++--------
 .../cache/DefaultServerCacheConfig.java       |  8 ++--
 .../server/cache/DefaultServerQueryCache.java |  5 ++-
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index 41ec3e2c9..334a0838a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
+import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -37,7 +38,7 @@ public class DefaultServerCache implements ServerCache {
   /**
    * The underlying map (ConcurrentHashMap or similar)
    */
-  protected final Map<Object, CacheEntry> map;
+  protected final Map<Object, SoftReference<CacheEntry>> map;
 
   protected final CountMetric hitCount;
   protected final CountMetric missCount;
@@ -199,7 +200,8 @@ public class DefaultServerCache implements ServerCache {
    * Get the cache entry - override for query cache to validate dependent tables.
    */
   protected CacheEntry getCacheEntry(Object id) {
-    return map.get(key(id));
+    final SoftReference<CacheEntry> ref = map.get(key(id));
+    return ref != null ? ref.get() : null;
   }
 
   @Override
@@ -213,7 +215,7 @@ public class DefaultServerCache implements ServerCache {
   @Override
   public void put(Object id, Object value) {
     Object key = key(id);
-    map.put(key, new CacheEntry(key, value));
+    map.put(key, new SoftReference<>(new CacheEntry(key, value)));
     putCount.increment();
   }
 
@@ -222,8 +224,8 @@ public class DefaultServerCache implements ServerCache {
    */
   @Override
   public void remove(Object id) {
-    CacheEntry entry = map.remove(key(id));
-    if (entry != null) {
+    SoftReference<CacheEntry> entry = map.remove(key(id));
+    if (entry != null && entry.get() != null) {
       removeCount.increment();
     }
   }
@@ -266,6 +268,7 @@ public class DefaultServerCache implements ServerCache {
     long startNanos = System.nanoTime();
 
     long trimmedByIdle = 0;
+    long trimmedByGC = 0;
     long trimmedByTTL = 0;
     long trimmedByLRU = 0;
 
@@ -274,10 +277,14 @@ public class DefaultServerCache implements ServerCache {
     long idleExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxIdleSecs);
     long ttlExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxSecsToLive);
 
-    Iterator<CacheEntry> it = map.values().iterator();
+    Iterator<SoftReference<CacheEntry>> it = map.values().iterator();
     while (it.hasNext()) {
-      CacheEntry cacheEntry = it.next();
-      if (maxIdleSecs > 0 && idleExpireNano > cacheEntry.getLastAccessTime()) {
+      SoftReference<CacheEntry> ref = it.next();
+      final CacheEntry cacheEntry = ref.get();
+      if (cacheEntry == null) {
+        it.remove();
+        trimmedByGC++;
+      } else if (maxIdleSecs > 0 && idleExpireNano > cacheEntry.getLastAccessTime()) {
         it.remove();
         trimmedByIdle++;
 
@@ -290,27 +297,27 @@ public class DefaultServerCache implements ServerCache {
       }
     }
 
-    if (trimForMaxSize > 0) {
-      trimmedByLRU = activeList.size() - maxSize;
-      if (trimmedByLRU > 0) {
-        // sort into last access time ascending
-        activeList.sort(BY_LAST_ACCESS);
-        int trimSize = getTrimSize();
-        for (int i = trimSize; i < activeList.size(); i++) {
-          // remove if still in the cache
-          map.remove(activeList.get(i).getKey());
+    if (trimForMaxSize > 0 && activeList.size() > maxSize) {
+      // sort into last access time ascending
+      activeList.sort(BY_LAST_ACCESS);
+      int trimSize = getTrimSize();
+      for (int i = trimSize; i < activeList.size(); i++) {
+        // remove if still in the cache
+        if (map.remove(activeList.get(i).getKey()) != null) {
+          trimmedByLRU++;
         }
       }
     }
 
     evictCount.add(trimmedByIdle);
+    evictCount.add(trimmedByGC);
     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);
+      logger.trace("Executed trim of cache {} in [{}]millis idle[{}] timeToLive[{}] accessTime[{}] gc[{}]",
+        name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU, trimmedByGC);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
index 638f237a2..5f8ed1d5d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
@@ -4,7 +4,9 @@ import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.config.CurrentTenantProvider;
+import io.ebeaninternal.server.cache.DefaultServerCache.CacheEntry;
 
+import java.lang.ref.SoftReference;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -17,13 +19,13 @@ public class DefaultServerCacheConfig {
   private int maxSecsToLive;
   private int trimFrequency;
 
-  private Map<Object, DefaultServerCache.CacheEntry> map;
+  private Map<Object, SoftReference<CacheEntry>> map;
 
   public DefaultServerCacheConfig(ServerCacheConfig config) {
     this(config,  new ConcurrentHashMap<>());
   }
 
-  public DefaultServerCacheConfig(ServerCacheConfig config, Map<Object, DefaultServerCache.CacheEntry> map) {
+  public DefaultServerCacheConfig(ServerCacheConfig config, Map<Object, SoftReference<CacheEntry>> map) {
     this.config = config;
     this.map = map;
 
@@ -50,7 +52,7 @@ public class DefaultServerCacheConfig {
     return config.getShortName();
   }
 
-  public Map<Object, DefaultServerCache.CacheEntry> getMap() {
+  public Map<Object, SoftReference<CacheEntry>> getMap() {
     return map;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
index afbdb37f7..4f437eafc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java
@@ -3,6 +3,8 @@ package io.ebeaninternal.server.cache;
 import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.QueryCacheEntryValidate;
 
+import java.lang.ref.SoftReference;
+
 /**
  * Server cache for query caching.
  * <p>
@@ -27,7 +29,8 @@ public class DefaultServerQueryCache extends DefaultServerCache {
   @Override
   protected CacheEntry getCacheEntry(Object id) {
     Object key = key(id);
-    CacheEntry entry = map.get(key);
+    final SoftReference<CacheEntry> ref = map.get(key);
+    CacheEntry entry = ref != null ? ref.get() : null;
     if (entry == null) {
       return null;
     }

From d988dbe69def32b5bdb3f185e9470df8bab3047a Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Mar 2021 09:56:48 +1300
Subject: [PATCH 175/447] #2209 - Registering [default] as the default server
 but [default] is already registered as the default exception with hot-reload

---
 ebean-api/src/main/java/io/ebean/DatabaseFactory.java | 2 +-
 ebean-core/src/test/java/org/MainMemoryLeak.java      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
index 6ad7b1d89..4aace866a 100644
--- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
+++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
@@ -78,7 +78,7 @@ public class DatabaseFactory {
       Database server = createInternal(config);
       if (config.isRegister()) {
         if (config.isDefaultServer()) {
-          if (defaultServerName != null) {
+          if (defaultServerName != null && !defaultServerName.equals(config.getName())) {
             throw new IllegalStateException("Registering [" + config.getName() + "] as the default server but [" + defaultServerName + "] is already registered as the default");
           }
           defaultServerName = config.getName();
diff --git a/ebean-core/src/test/java/org/MainMemoryLeak.java b/ebean-core/src/test/java/org/MainMemoryLeak.java
index d3f085ef3..b659297b4 100644
--- a/ebean-core/src/test/java/org/MainMemoryLeak.java
+++ b/ebean-core/src/test/java/org/MainMemoryLeak.java
@@ -46,7 +46,12 @@ public class MainMemoryLeak {
     config.addClass(ECachedBean.class);
     config.loadFromProperties();
 
+    Database server1 = DatabaseFactory.create(config);
+    assert server1 != null;
+
+    // create again for #2193
     Database server = DatabaseFactory.create(config);
+    assert server != null;
 
     // create a string with 10k chars
     char[] c = new char[10_000];

From f8c37772d4bc518c89a3ff26d3cc00ea7905466c Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Mar 2021 10:23:28 +1300
Subject: [PATCH 176/447] Tidy internals of DefaultServer with @Nonnull, <>,
 Collections.singleton(), remove unused queryBatchSize

---
 .../server/core/DefaultServer.java            | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 34a094301..5e8db9c1c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -125,6 +125,7 @@ import io.ebeanservice.docstore.api.DocStoreIntegration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
@@ -137,7 +138,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -196,7 +196,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   private final SpiLogManager logManager;
   private final PersistenceContextScope defaultPersistenceContextScope;
   private final int lazyLoadBatchSize;
-  private final int queryBatchSize;
   private final boolean updateAllPropertiesInBatch;
   private final long slowQueryMicros;
   private final SlowQueryListener slowQueryListener;
@@ -217,7 +216,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.extraMetrics = config.getExtraMetrics();
     this.serverName = this.config.getName();
     this.lazyLoadBatchSize = this.config.getLazyLoadBatchSize();
-    this.queryBatchSize = this.config.getQueryBatchSize();
     this.cqueryEngine = config.getCQueryEngine();
     this.expressionFactory = config.getExpressionFactory();
     this.encryptKeyManager = this.config.getEncryptKeyManager();
@@ -305,10 +303,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return lazyLoadBatchSize;
   }
 
-  public int getQueryBatchSize() {
-    return queryBatchSize;
-  }
-
   @Override
   public Object currentTenantId() {
     return currentTenantProvider == null ? null : currentTenantProvider.currentId();
@@ -1150,6 +1144,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   public <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction) {
     return Optional.ofNullable(findOne(query, transaction));
@@ -1180,6 +1175,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
   public <T> Set<T> findSet(Query<T> query, Transaction t) {
@@ -1196,6 +1192,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
   public <K, T> Map<K, T> findMap(Query<T> query, Transaction t) {
@@ -1217,6 +1214,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   @SuppressWarnings("unchecked")
   public <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction t) {
@@ -1227,7 +1225,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
     try {
       request.initTransIfRequired();
-      return (List<A>) request.findSingleAttributeList();
+      return request.findSingleAttributeList();
     } finally {
       request.endTransIfRequired();
     }
@@ -1277,6 +1275,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   public <A, T> List<A> findIds(Query<T> query, Transaction t) {
     return findIdsWithCopy(((SpiQuery<T>) query).copy(), t);
@@ -1337,26 +1336,29 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   public <T> FutureRowCount<T> findFutureCount(Query<T> q, Transaction t) {
     SpiQuery<T> copy = ((SpiQuery<T>) q).copy();
     copy.setFutureFetch(true);
     Transaction newTxn = createTransaction();
-    QueryFutureRowCount<T> queryFuture = new QueryFutureRowCount<>(new CallableQueryCount<T>(this, copy, newTxn));
+    QueryFutureRowCount<T> queryFuture = new QueryFutureRowCount<>(new CallableQueryCount<>(this, copy, newTxn));
     backgroundExecutor.execute(queryFuture.getFutureTask());
     return queryFuture;
   }
 
+  @Nonnull
   @Override
   public <T> FutureIds<T> findFutureIds(Query<T> query, Transaction t) {
     SpiQuery<T> copy = ((SpiQuery<T>) query).copy();
     copy.setFutureFetch(true);
     Transaction newTxn = createTransaction();
-    QueryFutureIds<T> queryFuture = new QueryFutureIds<>(new CallableQueryIds<T>(this, copy, newTxn));
+    QueryFutureIds<T> queryFuture = new QueryFutureIds<>(new CallableQueryIds<>(this, copy, newTxn));
     backgroundExecutor.execute(queryFuture.getFutureTask());
     return queryFuture;
   }
 
+  @Nonnull
   @Override
   public <T> FutureList<T> findFutureList(Query<T> query, Transaction t) {
     SpiQuery<T> spiQuery = (SpiQuery<T>) query;
@@ -1369,11 +1371,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
     // Create a new transaction solely to execute the findList() at some future time
     Transaction newTxn = createTransaction();
-    QueryFutureList<T> queryFuture = new QueryFutureList<>(new CallableQueryList<T>(this, spiQuery, newTxn));
+    QueryFutureList<T> queryFuture = new QueryFutureList<>(new CallableQueryList<>(this, spiQuery, newTxn));
     backgroundExecutor.execute(queryFuture.getFutureTask());
     return queryFuture;
   }
 
+  @Nonnull
   @Override
   public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction) {
     SpiQuery<T> spiQuery = (SpiQuery<T>) query;
@@ -1387,6 +1390,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new LimitOffsetPagedList<>(this, spiQuery);
   }
 
+  @Nonnull
   @Override
   public <T> QueryIterator<T> findIterate(Query<T> query, Transaction t) {
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
@@ -1399,11 +1403,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   public <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction) {
     return findStream(query, transaction);
   }
 
+  @Nonnull
   @Override
   public <T> Stream<T> findStream(Query<T> query, Transaction transaction) {
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, transaction);
@@ -1470,6 +1476,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     // no try finally - findEachWhile guarantee's cleanup of the transaction if required
   }
 
+  @Nonnull
   @Override
   public <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction) {
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.LIST, query, transaction);
@@ -1481,6 +1488,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   public <T> List<T> findList(Query<T> query, Transaction t) {
     return findList(query, t, false);
@@ -1540,6 +1548,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Nonnull
   @Override
   public List<SqlRow> findList(SqlQuery query, Transaction t) {
     RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, t);
@@ -2241,6 +2250,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return checkUniqueness(bean, null);
   }
 
+  @Nonnull
   @Override
   public Set<Property> checkUniqueness(Object bean, Transaction transaction) {
     EntityBean entityBean = checkEntityBean(bean);
@@ -2252,14 +2262,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
     Object id = idProperty.getVal(entityBean);
     if (entityBean._ebean_getIntercept().isNew() && id != null) {
-      // Primary Key is changeable only on new models - so skip check if we are not
-      // new.
+      // 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;
+        return Collections.singleton(idProperty);
       }
     }
     for (BeanProperty[] props : beanDesc.getUniqueProps()) {

From 2a5fd7f3a993909cf9a2a8c53a3b8d302a71d582 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Mar 2021 16:02:27 +1300
Subject: [PATCH 177/447] #2210 - Improve query plan capture - ability to
 change default threshold micros

---
 .../java/io/ebean/meta/QueryPlanRequest.java  |  7 +++++-
 .../api/NoopQueryPlanManager.java             |  5 ++++
 .../ebeaninternal/api/QueryPlanManager.java   |  5 ++++
 .../server/core/DefaultServer.java            |  3 +++
 .../server/query/CQueryPlanManager.java       |  9 +++++--
 .../query/finder/TestCustomerFinder.java      | 24 +++++++++++++++----
 6 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java b/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java
index 3510b30cc..c4a69b1aa 100644
--- a/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java
+++ b/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java
@@ -41,6 +41,9 @@ public class QueryPlanRequest {
 
   /**
    * Set the maximum number of plans to capture.
+   * <p>
+   * Use this to limit how much query plan capturing is done as query
+   * plan capture is actual database load.
    */
   public void setMaxCount(int maxCount) {
     this.maxCount = maxCount;
@@ -58,7 +61,9 @@ public class QueryPlanRequest {
   /**
    * Set the maximum amount of time we want to use to capture plans.
    * <p>
-   * Query plan collection will stop once this time is exceeded.
+   * Query plan collection will stop once this time is exceeded. We use
+   * this to ensure the query plan capture does not use excessive amount
+   * of time - put too much load on the database.
    */
   public void setMaxTimeMillis(long maxTimeMillis) {
     this.maxTimeMillis = maxTimeMillis;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java
index e00ad57f1..813121f92 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java
@@ -8,6 +8,11 @@ import java.util.List;
 
 class NoopQueryPlanManager implements QueryPlanManager {
 
+  @Override
+  public void setDefaultThreshold(long thresholdMicros) {
+    // do nothing
+  }
+
   @Override
   public SpiQueryBindCapture createBindCapture(SpiQueryPlan queryPlan) {
     return SpiQueryBindCapture.NOOP;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/QueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/api/QueryPlanManager.java
index f9750c47a..da7ce2b43 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/QueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/QueryPlanManager.java
@@ -12,6 +12,11 @@ public interface QueryPlanManager {
 
   QueryPlanManager NOOP = new NoopQueryPlanManager();
 
+  /**
+   * Update the global default threshold used when new query plans are created.
+   */
+  void setDefaultThreshold(long thresholdMicros);
+
   /**
    * Create the bind capture for the given query plan.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 5e8db9c1c..0e4d22768 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2329,6 +2329,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   List<MetaQueryPlan> queryPlanInit(QueryPlanInit initRequest) {
+    if (initRequest.isAll()) {
+      queryPlanManager.setDefaultThreshold(initRequest.getThresholdMicros());
+    }
     return beanDescriptorManager.queryPlanInit(initRequest);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
index c2e6aa358..4ff62f44d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
@@ -30,14 +30,14 @@ public class CQueryPlanManager implements QueryPlanManager {
 
   private final TransactionManager transactionManager;
 
-  private final long defaultThreshold;
-
   private final QueryPlanLogger planLogger;
 
   private final TimedMetric timeCollection;
 
   private final TimedMetric timeBindCapture;
 
+  private long defaultThreshold;
+
   public CQueryPlanManager(TransactionManager transactionManager, long defaultThreshold, QueryPlanLogger planLogger, ExtraMetrics extraMetrics) {
     this.transactionManager = transactionManager;
     this.defaultThreshold = defaultThreshold;
@@ -46,6 +46,11 @@ public class CQueryPlanManager implements QueryPlanManager {
     this.timeBindCapture = extraMetrics.getBindCapture();
   }
 
+  @Override
+  public void setDefaultThreshold(long thresholdMicros) {
+    this.defaultThreshold = thresholdMicros;
+  }
+
   @Override
   public SpiQueryBindCapture createBindCapture(SpiQueryPlan queryPlan) {
     return new CQueryBindCapture(this, queryPlan, defaultThreshold);
diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 48cc264c6..8446f9d5b 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -175,17 +175,24 @@ public class TestCustomerFinder extends BaseTestCase {
 
     ResetBasicData.reset();
 
+    // change default collect query plan threshold to 200 micros
+    QueryPlanInit init0 = new QueryPlanInit();
+    init0.setAll(true);
+    init0.setThresholdMicros(200);
+    final List<MetaQueryPlan> plans = server().getMetaInfoManager().queryPlanInit(init0);
+    assertThat(plans.size()).isGreaterThan(1);
+
     // the server has some plans
     runQueries();
 
-    // enable query plan bind capture on all plans threshold 100 micros
+    // change query plan threshold to 100 micros
     QueryPlanInit init = new QueryPlanInit();
     init.setAll(true);
     init.setThresholdMicros(100);
     final List<MetaQueryPlan> appliedToPlans = server().getMetaInfoManager().queryPlanInit(init);
     assertThat(appliedToPlans.size()).isGreaterThan(4);
 
-    // will collect bind captures
+    // run queries again
     runQueries();
 
     ServerMetrics metrics = server().getMetaInfoManager().collectMetrics();
@@ -203,12 +210,21 @@ public class TestCustomerFinder extends BaseTestCase {
 
     // obtains db query plans ...
     QueryPlanRequest request = new QueryPlanRequest();
-    List<MetaQueryPlan> plans = server().getMetaInfoManager().queryPlanCollectNow(request);
-    assertThat(plans).isNotEmpty();
+    // collect max 1000 plans (use something more like 10)
+    request.setMaxCount(1_000);
+    // don't collect any more plans if used 10 secs
+    request.setMaxTimeMillis(10_000);
+    List<MetaQueryPlan> plans0 = server().getMetaInfoManager().queryPlanCollectNow(request);
+    assertThat(plans0).isNotEmpty();
 
     for (MetaQueryPlan plan : plans) {
+      logger.info("queryplan label:{}, queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
+        plan.getLabel(), plan.getQueryTimeMicros(), plan.getProfileLocation(),
+        plan.getSql(), plan.getBind(), plan.getPlan());
       System.out.println(plan);
     }
+
+    //DB.getBackgroundExecutor().scheduleWithFixedDelay(...)
   }
 
   @Test

From bcfd9cab1db0a5b81b9e71b2c07adc9bdfa2ed52 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Mar 2021 16:05:42 +1300
Subject: [PATCH 178/447] #2210 - Improve query plan capture - bump threshold
 multiplier to 1.5

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

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index 713169640..e3a1a5e54 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -9,7 +9,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 class CQueryBindCapture implements SpiQueryBindCapture {
 
-  private static final double multiplier = 1.3d;
+  private static final double multiplier = 1.5d;
 
   private final ReentrantLock lock = new ReentrantLock();
   private final CQueryPlanManager manager;

From ee8bb5ef751ccbc9cd9b1d6fdd0b561ec8e781a7 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Mar 2021 23:19:21 +1300
Subject: [PATCH 179/447] #2211 - Improve query plan capture - Add default
 mechanism to log captured query plans

---
 .../java/io/ebean/config/DatabaseConfig.java  | 94 ++++++++++++++++++-
 .../io/ebean/config/QueryPlanCapture.java     | 34 +++++++
 .../io/ebean/config/QueryPlanListener.java    | 13 +++
 .../server/core/DefaultQueryPlanListener.java | 25 +++++
 .../server/core/DefaultServer.java            | 33 +++++--
 .../io/ebean/config/ServerConfigTest.java     | 15 +++
 6 files changed, 206 insertions(+), 8 deletions(-)
 create mode 100644 ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java
 create mode 100644 ebean-api/src/main/java/io/ebean/config/QueryPlanListener.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 49c458743..1cbfa9d3e 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -498,7 +498,7 @@ public class DatabaseConfig {
   private boolean notifyL2CacheInForeground;
 
   /**
-   * Set to true to support query plan capture.
+   * Set to true to enable bind capture required for query plan capture.
    */
   private boolean collectQueryPlans;
 
@@ -507,6 +507,15 @@ public class DatabaseConfig {
    */
   private long collectQueryPlanThresholdMicros = Long.MAX_VALUE;
 
+  /**
+   * Set to true to enable automatic query plan capture.
+   */
+  private boolean queryPlanCapture;
+  private long queryPlanCapturePeriodSecs = 60 * 10; // 10 minutes
+  private long queryPlanCaptureMaxTimeMillis = 10_000; // 10 seconds
+  private int queryPlanCaptureMaxCount = 10;
+  private QueryPlanListener queryPlanListener;
+
   /**
    * The time in millis used to determine when a query is alerted for being slow.
    */
@@ -1045,7 +1054,6 @@ public class DatabaseConfig {
    * This is a performance optimisation to reduce the number times Ebean
    * requests a sequence to be used as an Id for a bean (aka reduce network
    * chatter).
-
    */
   public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
     platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
@@ -2807,6 +2815,10 @@ public class DatabaseConfig {
     slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
     collectQueryPlans = p.getBoolean("collectQueryPlans", collectQueryPlans);
     collectQueryPlanThresholdMicros = p.getLong("collectQueryPlanThresholdMicros", collectQueryPlanThresholdMicros);
+    queryPlanCapture = p.getBoolean("queryPlan.capture", queryPlanCapture);
+    queryPlanCapturePeriodSecs = p.getLong("queryPlan.capturePeriodSecs", queryPlanCapturePeriodSecs);
+    queryPlanCaptureMaxTimeMillis = p.getLong("queryPlan.captureMaxTimeMillis", queryPlanCaptureMaxTimeMillis);
+    queryPlanCaptureMaxCount = p.getInt("queryPlan.captureMaxCount", queryPlanCaptureMaxCount);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
     localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
@@ -3201,6 +3213,84 @@ public class DatabaseConfig {
     this.collectQueryPlanThresholdMicros = collectQueryPlanThresholdMicros;
   }
 
+  /**
+   * Return true if periodic capture of query plans is enabled.
+   */
+  public boolean isQueryPlanCapture() {
+    return queryPlanCapture;
+  }
+
+  /**
+   * Set to true to turn on periodic capture of query plans.
+   */
+  public void setQueryPlanCapture(boolean queryPlanCapture) {
+    this.queryPlanCapture = queryPlanCapture;
+  }
+
+  /**
+   * Return the frequency to capture query plans.
+   */
+  public long getQueryPlanCapturePeriodSecs() {
+    return queryPlanCapturePeriodSecs;
+  }
+
+  /**
+   * Set the frequency in seconds to capture query plans.
+   */
+  public void setQueryPlanCapturePeriodSecs(long queryPlanCapturePeriodSecs) {
+    this.queryPlanCapturePeriodSecs = queryPlanCapturePeriodSecs;
+  }
+
+  /**
+   * Return the time after which a capture query plans request will
+   * stop capturing more query plans.
+   * <p>
+   * Effectively this controls the amount of load/time we want to
+   * allow for query plan capture.
+   */
+  public long getQueryPlanCaptureMaxTimeMillis() {
+    return queryPlanCaptureMaxTimeMillis;
+  }
+
+  /**
+   * Set the time after which a capture query plans request will
+   * stop capturing more query plans.
+   * <p>
+   * Effectively this controls the amount of load/time we want to
+   * allow for query plan capture.
+   */
+  public void setQueryPlanCaptureMaxTimeMillis(long queryPlanCaptureMaxTimeMillis) {
+    this.queryPlanCaptureMaxTimeMillis = queryPlanCaptureMaxTimeMillis;
+  }
+
+  /**
+   * Return the max number of query plans captured per request.
+   */
+  public int getQueryPlanCaptureMaxCount() {
+    return queryPlanCaptureMaxCount;
+  }
+
+  /**
+   * Set the max number of query plans captured per request.
+   */
+  public void setQueryPlanCaptureMaxCount(int queryPlanCaptureMaxCount) {
+    this.queryPlanCaptureMaxCount = queryPlanCaptureMaxCount;
+  }
+
+  /**
+   * Return the listener used to process captured query plans.
+   */
+  public QueryPlanListener getQueryPlanListener() {
+    return queryPlanListener;
+  }
+
+  /**
+   * Set the listener used to process captured query plans.
+   */
+  public void setQueryPlanListener(QueryPlanListener queryPlanListener) {
+    this.queryPlanListener = queryPlanListener;
+  }
+
   /**
    * Return true if metrics should be dumped when the server is shutdown.
    */
diff --git a/ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java b/ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java
new file mode 100644
index 000000000..6f34097fe
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java
@@ -0,0 +1,34 @@
+package io.ebean.config;
+
+import io.ebean.Database;
+import io.ebean.meta.MetaQueryPlan;
+
+import java.util.List;
+
+/**
+ * The captured query plans.
+ */
+public class QueryPlanCapture {
+
+  private final Database database;
+  private final List<MetaQueryPlan> plans;
+
+  public QueryPlanCapture(Database database, List<MetaQueryPlan> plans) {
+    this.database = database;
+    this.plans = plans;
+  }
+
+  /**
+   * Return the database the plans were captured for.
+   */
+  public Database getDatabase() {
+    return database;
+  }
+
+  /**
+   * Return the captured query plans.
+   */
+  public List<MetaQueryPlan> getPlans() {
+    return plans;
+  }
+}
diff --git a/ebean-api/src/main/java/io/ebean/config/QueryPlanListener.java b/ebean-api/src/main/java/io/ebean/config/QueryPlanListener.java
new file mode 100644
index 000000000..8368186cf
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/config/QueryPlanListener.java
@@ -0,0 +1,13 @@
+package io.ebean.config;
+
+/**
+ * EXPERIMENTAL: Listener for captured query plans.
+ */
+@FunctionalInterface
+public interface QueryPlanListener {
+
+  /**
+   * Process the captured query plans.
+   */
+  void process(QueryPlanCapture capture);
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
new file mode 100644
index 000000000..051d331ba
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
@@ -0,0 +1,25 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.config.QueryPlanCapture;
+import io.ebean.config.QueryPlanListener;
+import io.ebean.meta.MetaQueryPlan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class DefaultQueryPlanListener implements QueryPlanListener {
+
+  static final QueryPlanListener INSTANT = new DefaultQueryPlanListener();
+
+  private static final Logger log = LoggerFactory.getLogger("io.ebean.QUERYPLAN");
+
+  @Override
+  public void process(QueryPlanCapture capture) {
+    // better to log this in JSON form?
+    String dbName = capture.getDatabase().getName();
+    for (MetaQueryPlan plan : capture.getPlans()) {
+      log.info("queryPlan  db:{} label:{} queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
+        dbName, plan.getLabel(), plan.getQueryTimeMicros(), plan.getProfileLocation(),
+        plan.getSql(), plan.getBind(), plan.getPlan());
+    }
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 0e4d22768..52b94bfb6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -45,12 +45,7 @@ import io.ebean.bean.PersistenceContext.WithOption;
 import io.ebean.bean.SingleBeanLoader;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.common.CopyOnFirstWriteList;
-import io.ebean.config.CurrentTenantProvider;
-import io.ebean.config.DatabaseConfig;
-import io.ebean.config.EncryptKeyManager;
-import io.ebean.config.SlowQueryEvent;
-import io.ebean.config.SlowQueryListener;
-import io.ebean.config.TenantMode;
+import io.ebean.config.*;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.ShutdownManager;
@@ -145,6 +140,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.Spliterator;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -404,6 +400,31 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       migrationRunner.loadProperties(config.getProperties());
       migrationRunner.run(config.getDataSource());
     }
+    startQueryPlanCapture();
+  }
+
+  private void startQueryPlanCapture() {
+    if (config.isQueryPlanCapture()) {
+      long secs = config.getQueryPlanCapturePeriodSecs();
+      if (secs > 10) {
+        logger.info("capture query plan enabled, every {}secs", secs);
+        backgroundExecutor.scheduleWithFixedDelay(this::collectQueryPlans, secs, secs, TimeUnit.SECONDS);
+      }
+    }
+  }
+
+  private void collectQueryPlans() {
+    QueryPlanRequest request = new QueryPlanRequest();
+    request.setMaxCount(config.getQueryPlanCaptureMaxCount());
+    request.setMaxTimeMillis(config.getQueryPlanCaptureMaxTimeMillis());
+
+    // obtains query explain plans ...
+    List<MetaQueryPlan> plans = metaInfoManager.queryPlanCollectNow(request);
+    QueryPlanListener listener = config.getQueryPlanListener();
+    if (listener == null) {
+      listener = DefaultQueryPlanListener.INSTANT;
+    }
+    listener.process(new QueryPlanCapture(this, plans));
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
index 8fda93985..b23ccdbb6 100644
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -76,6 +76,11 @@ public class ServerConfigTest {
     props.setProperty("forUpdateNoKey", "true");
     props.setProperty("defaultServer", "false");
 
+    props.setProperty("queryPlan.capture", "true");
+    props.setProperty("queryPlan.capturePeriodSecs", "42");
+    props.setProperty("queryPlan.captureMaxTimeMillis", "560");
+    props.setProperty("queryPlan.captureMaxCount", "7");
+
     serverConfig.loadFromProperties(props);
 
     assertFalse(serverConfig.isDefaultServer());
@@ -106,6 +111,11 @@ public class ServerConfigTest {
     assertEquals(4, serverConfig.getBackgroundExecutorSchedulePoolSize());
     assertEquals(98, serverConfig.getBackgroundExecutorShutdownSecs());
 
+    assertTrue(serverConfig.isQueryPlanCapture());
+    assertEquals(42, serverConfig.getQueryPlanCapturePeriodSecs());
+    assertEquals(560, serverConfig.getQueryPlanCaptureMaxTimeMillis());
+    assertEquals(7, serverConfig.getQueryPlanCaptureMaxCount());
+
     assertThat(serverConfig.getMappingLocations()).containsExactly("classpath:/foo","bar");
 
     serverConfig.setPersistBatch(PersistBatch.NONE);
@@ -146,6 +156,11 @@ public class ServerConfigTest {
     assertTrue(serverConfig.isAutoLoadModuleInfo());
     assertEquals(Long.MAX_VALUE, serverConfig.getCollectQueryPlanThresholdMicros());
 
+    assertFalse(serverConfig.isQueryPlanCapture());
+    assertEquals(600, serverConfig.getQueryPlanCapturePeriodSecs());
+    assertEquals(10000L, serverConfig.getQueryPlanCaptureMaxTimeMillis());
+    assertEquals(10, serverConfig.getQueryPlanCaptureMaxCount());
+
     serverConfig.setLoadModuleInfo(false);
     assertFalse(serverConfig.isAutoLoadModuleInfo());
   }

From a8bf27da550e9438e8195c3162c91ed840c5cfc1 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Mar 2021 23:44:30 +1300
Subject: [PATCH 180/447] #2211 - Improve query plan capture - Align config
 property names

collectQueryPlans -> queryPlanEnable
collectQueryPlanThresholdMicros -> queryPlanThresholdMicros

properties keys:
ebean.collectQueryPlans -> ebean.queryPlan.enable
ebean.collectQueryPlanThresholdMicros -> ebean.queryPlan.thresholdMicros

This then aligns all the queryPlan related properties together which is important in order to avoid confusion.
---
 .../java/io/ebean/config/DatabaseConfig.java  | 29 ++++++++++---------
 .../server/core/InternalConfiguration.java    |  4 +--
 .../io/ebean/config/ServerConfigTest.java     |  9 ++++--
 .../src/test/resources/ebean.properties       |  4 +--
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 1cbfa9d3e..c4195f0be 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -500,15 +500,15 @@ public class DatabaseConfig {
   /**
    * Set to true to enable bind capture required for query plan capture.
    */
-  private boolean collectQueryPlans;
+  private boolean queryPlanEnable;
 
   /**
    * The default threshold in micros for collecting query plans.
    */
-  private long collectQueryPlanThresholdMicros = Long.MAX_VALUE;
+  private long queryPlanThresholdMicros = Long.MAX_VALUE;
 
   /**
-   * Set to true to enable automatic query plan capture.
+   * Set to true to enable automatic periodic query plan capture.
    */
   private boolean queryPlanCapture;
   private long queryPlanCapturePeriodSecs = 60 * 10; // 10 minutes
@@ -2813,8 +2813,8 @@ public class DatabaseConfig {
     dumpMetricsOptions = p.get("dumpMetricsOptions", dumpMetricsOptions);
     queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
     slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
-    collectQueryPlans = p.getBoolean("collectQueryPlans", collectQueryPlans);
-    collectQueryPlanThresholdMicros = p.getLong("collectQueryPlanThresholdMicros", collectQueryPlanThresholdMicros);
+    queryPlanEnable = p.getBoolean("queryPlan.enable", queryPlanEnable);
+    queryPlanThresholdMicros = p.getLong("queryPlan.thresholdMicros", queryPlanThresholdMicros);
     queryPlanCapture = p.getBoolean("queryPlan.capture", queryPlanCapture);
     queryPlanCapturePeriodSecs = p.getLong("queryPlan.capturePeriodSecs", queryPlanCapturePeriodSecs);
     queryPlanCaptureMaxTimeMillis = p.getLong("queryPlan.captureMaxTimeMillis", queryPlanCaptureMaxTimeMillis);
@@ -3188,29 +3188,32 @@ public class DatabaseConfig {
   /**
    * Return true if query plan capture is enabled.
    */
-  public boolean isCollectQueryPlans() {
-    return collectQueryPlans;
+  public boolean isQueryPlanEnable() {
+    return queryPlanEnable;
   }
 
   /**
    * Set to true to enable query plan capture.
    */
-  public void setCollectQueryPlans(boolean collectQueryPlans) {
-    this.collectQueryPlans = collectQueryPlans;
+  public void setQueryPlanEnable(boolean queryPlanEnable) {
+    this.queryPlanEnable = queryPlanEnable;
   }
 
   /**
    * Return the query plan collection threshold in microseconds.
    */
-  public long getCollectQueryPlanThresholdMicros() {
-    return collectQueryPlanThresholdMicros;
+  public long getQueryPlanThresholdMicros() {
+    return queryPlanThresholdMicros;
   }
 
   /**
    * Set the query plan collection threshold in microseconds.
+   * <p>
+   * Queries executing slower than this will have bind values captured such that later
+   * the query plan can be captured and reported.
    */
-  public void setCollectQueryPlanThresholdMicros(long collectQueryPlanThresholdMicros) {
-    this.collectQueryPlanThresholdMicros = collectQueryPlanThresholdMicros;
+  public void setQueryPlanThresholdMicros(long queryPlanThresholdMicros) {
+    this.queryPlanThresholdMicros = queryPlanThresholdMicros;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 56ea7589a..8cbbbfa4b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -617,10 +617,10 @@ public class InternalConfiguration {
   }
 
   public QueryPlanManager initQueryPlanManager(TransactionManager transactionManager) {
-    if (!config.isCollectQueryPlans()) {
+    if (!config.isQueryPlanEnable()) {
       return QueryPlanManager.NOOP;
     }
-    long threshold = config.getCollectQueryPlanThresholdMicros();
+    long threshold = config.getQueryPlanThresholdMicros();
     return new CQueryPlanManager(transactionManager, threshold, queryPlanLogger(databasePlatform.getPlatform()), extraMetrics);
   }
 
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
index b23ccdbb6..f93c18d26 100644
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -72,10 +72,11 @@ public class ServerConfigTest {
     props.setProperty("enabledL2Regions", "r0,users,orgs");
     props.setProperty("caseSensitiveCollation", "false");
     props.setProperty("loadModuleInfo", "true");
-    props.setProperty("collectQueryPlanThresholdMicros", "10000");
     props.setProperty("forUpdateNoKey", "true");
     props.setProperty("defaultServer", "false");
 
+    props.setProperty("queryPlan.enable", "true");
+    props.setProperty("queryPlan.thresholdMicros", "10000");
     props.setProperty("queryPlan.capture", "true");
     props.setProperty("queryPlan.capturePeriodSecs", "42");
     props.setProperty("queryPlan.captureMaxTimeMillis", "560");
@@ -102,7 +103,6 @@ public class ServerConfigTest {
     assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
     assertEquals(JsonConfig.DateTime.MILLIS, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.MILLIS, serverConfig.getJsonDate());
-    assertEquals(10000, serverConfig.getCollectQueryPlanThresholdMicros());
 
     assertEquals("r0,users,orgs", serverConfig.getEnabledL2Regions());
 
@@ -111,6 +111,8 @@ public class ServerConfigTest {
     assertEquals(4, serverConfig.getBackgroundExecutorSchedulePoolSize());
     assertEquals(98, serverConfig.getBackgroundExecutorShutdownSecs());
 
+    assertTrue(serverConfig.isQueryPlanEnable());
+    assertEquals(10000, serverConfig.getQueryPlanThresholdMicros());
     assertTrue(serverConfig.isQueryPlanCapture());
     assertEquals(42, serverConfig.getQueryPlanCapturePeriodSecs());
     assertEquals(560, serverConfig.getQueryPlanCaptureMaxTimeMillis());
@@ -154,8 +156,9 @@ public class ServerConfigTest {
     assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
     assertTrue(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
     assertTrue(serverConfig.isAutoLoadModuleInfo());
-    assertEquals(Long.MAX_VALUE, serverConfig.getCollectQueryPlanThresholdMicros());
 
+    assertFalse(serverConfig.isQueryPlanEnable());
+    assertEquals(Long.MAX_VALUE, serverConfig.getQueryPlanThresholdMicros());
     assertFalse(serverConfig.isQueryPlanCapture());
     assertEquals(600, serverConfig.getQueryPlanCapturePeriodSecs());
     assertEquals(10000L, serverConfig.getQueryPlanCaptureMaxTimeMillis());
diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-core/src/test/resources/ebean.properties
index 953d2c720..aa1210739 100644
--- a/ebean-core/src/test/resources/ebean.properties
+++ b/ebean-core/src/test/resources/ebean.properties
@@ -27,8 +27,8 @@ datasource.default=h2
 
 ebean.dumpMetricsOnShutdown=true
 ebean.dumpMetricsOptions=sql,hash
-#ebean.collectQueryPlanThresholdMicros=1000
-ebean.collectQueryPlans=true
+#ebean.queryPlan.thresholdMicros=1000
+ebean.queryPlan.enable=true
 
 ebean.autoReadOnlyDataSource=true
 #datasource.h2-ro.url=jdbc:h2:mem:tests

From 1bf09ddd38c39f7814815ae88ee1072e994101a3 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Mar 2021 23:49:44 +1300
Subject: [PATCH 181/447] #2211 - Improve javadoc for queryPlanTTLSeconds

Hopefully people understand it is unrelated. Unfortunately we now have some properties with similar names so maybe we need a better name for this sometime in the future.
---
 .../src/main/java/io/ebean/config/DatabaseConfig.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index c4195f0be..bf4c61675 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -3108,14 +3108,17 @@ public class DatabaseConfig {
   }
 
   /**
-   * Return the query plan time to live.
+   * Return the time to live for ebean's internal query plan.
    */
   public int getQueryPlanTTLSeconds() {
     return queryPlanTTLSeconds;
   }
 
   /**
-   * Set the query plan time to live.
+   * Set the time to live for ebean's internal query plan.
+   * <p>
+   * This is the plan that knows how to execute the query, read the result
+   * and collects execution metrics. By default this is set to 5 mins.
    */
   public void setQueryPlanTTLSeconds(int queryPlanTTLSeconds) {
     this.queryPlanTTLSeconds = queryPlanTTLSeconds;

From f7035eb2289c035c2f762166118c76c01a056051 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Mar 2021 00:06:04 +1300
Subject: [PATCH 182/447] [maven-release-plugin] prepare release
 ebean-parent-12.8.1

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index ce3ba3688..d24999338 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 5c081a9df..5897d06d5 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 665ea80be..e30fff780 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.1-SNAPSHOT</version>
+        <version>12.8.1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 386d6d511..0e5b3aa23 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index e8ecd9616..da160656c 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.1</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 60300f7ce..7f2ea1c76 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 4efce3a65..92440b9d6 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index cd885187e..68f5d50a4 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 5b4bceec8..dd4967ee3 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 51f490b3b..8edf552ca 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 2a346b178..c258c4074 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index c32dab0c2..bccddf421 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 33c8aeb60..f8204d0cf 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 588872181..a9dda9dc6 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1-SNAPSHOT</version>
+      <version>12.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 297d5ab0a..4064eef48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.1-SNAPSHOT</version>
+  <version>12.8.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 6e7bf295f..7da5e03b1 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1-SNAPSHOT</version>
+    <version>12.8.1</version>
   </parent>
 
   <name>querybean generator</name>

From 09d772a5e53ab99c8a0148a1704fbd1312928618 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Mar 2021 00:06:13 +1300
Subject: [PATCH 183/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index d24999338..4fe1468ec 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 5897d06d5..700861dd9 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index e30fff780..401f6dbdf 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 0e5b3aa23..be8b15507 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index da160656c..3652ba9a3 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 7f2ea1c76..421166e46 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 92440b9d6..32a98a767 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 68f5d50a4..029f345fc 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index dd4967ee3..6528624f3 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 8edf552ca..86d02f68a 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index c258c4074..1d3a74a49 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index bccddf421..65e0d345c 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index f8204d0cf..b293a20bc 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index a9dda9dc6..70432f360 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.1</version>
+      <version>12.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 4064eef48..a0ce632a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.1</version>
+  <version>12.8.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 7da5e03b1..be174f512 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.1</version>
+    <version>12.8.2-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From f9b55a06b81064e761c7abdef297f2c086c89f3e Mon Sep 17 00:00:00 2001
From: Tobias <tobias@olsson.be>
Date: Wed, 31 Mar 2021 12:45:48 +0200
Subject: [PATCH 184/447] Add bitwise operators to query beans

---
 .../java/io/ebean/typequery/PInteger.java     | 66 +++++++++++++++++
 .../main/java/io/ebean/typequery/PLong.java   | 70 ++++++++++++++++++-
 .../main/java/io/ebean/typequery/PShort.java  | 68 +++++++++++++++++-
 3 files changed, 201 insertions(+), 3 deletions(-)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
index 3aefa8f46..8657461be 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
@@ -24,4 +24,70 @@ public class PInteger<R> extends PBaseNumber<R,Integer> {
     super(name, root, prefix);
   }
 
+  /**
+   * 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
+   *
+   * int selectedFlags = BwFlags.HAS_BULK + BwFlags.HAS_SIZE;
+   * int mask = BwFlags.HAS_SIZE; // Only Size flag set
+   *
+   * bitwiseAnd(selectedFlags, mask)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAnd(int flags, int mask) {
+    expr().bitwiseAnd(_name, flags, mask);
+    return _root;
+  }
+
+  /**
+   * Add expression for ALL of the given bit flags to be set.
+   * <pre>{@code
+   *
+   * bitwiseAll(BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAll(int flags) {
+    expr().bitwiseAll(_name, flags);
+    return _root;
+  }
+
+  /**
+   * Add expression for ANY of the given bit flags to be set.
+   * <pre>{@code
+   *
+   * bitwiseAny(BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAny(int flags) {
+    expr().bitwiseAny(_name, flags);
+    return _root;
+  }
+
+  /**
+   * Add expression for the given bit flags to be NOT set.
+   * <pre>{@code
+   *
+   * bitwiseNot(BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseNot(int flags) {
+    expr().bitwiseNot(_name, flags);
+    return _root;
+  }
 }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
index e5869682c..d8e4cf58b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PLong<R> extends PBaseNumber<R,Long> {
+public class PLong<R> extends PBaseNumber<R, Long> {
 
   /**
    * Construct with a property name and root instance.
@@ -14,7 +14,7 @@ public class PLong<R> extends PBaseNumber<R,Long> {
    * @param root the root query bean instance
    */
   public PLong(String name, R root) {
-    super(name , root);
+    super(name, root);
   }
 
   /**
@@ -24,4 +24,70 @@ public class PLong<R> extends PBaseNumber<R,Long> {
     super(name, root, prefix);
   }
 
+  /**
+   * 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
+   *
+   * bitwiseAnd(selectedFlags, mask)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAnd(long flags, long mask) {
+    expr().bitwiseAnd(_name, flags, mask);
+    return _root;
+  }
+
+  /**
+   * Add expression for ALL of the given bit flags to be set.
+   * <pre>{@code
+   *
+   * bitwiseAll(BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAll(long flags) {
+    expr().bitwiseAll(_name, flags);
+    return _root;
+  }
+
+  /**
+   * Add expression for ANY of the given bit flags to be set.
+   * <pre>{@code
+   *
+   * bitwiseAny(BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAny(long flags) {
+    expr().bitwiseAny(_name, flags);
+    return _root;
+  }
+
+  /**
+   * Add expression for the given bit flags to be NOT set.
+   * <pre>{@code
+   *
+   * bitwiseNot(BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseNot(long flags) {
+    expr().bitwiseNot(_name, flags);
+    return _root;
+  }
 }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java b/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
index 440a5ab4c..f8ee7bf8a 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PShort<R> extends PBaseNumber<R,Short> {
+public class PShort<R> extends PBaseNumber<R, Short> {
 
   /**
    * Construct with a property name and root instance.
@@ -24,4 +24,70 @@ public class PShort<R> extends PBaseNumber<R,Short> {
     super(name, root, prefix);
   }
 
+  /**
+   * 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
+   *
+   * short selectedFlags = BwFlags.HAS_BULK + BwFlags.HAS_SIZE;
+   * short mask = BwFlags.HAS_SIZE; // Only Size flag set
+   *
+   * bitwiseAnd(selectedFlags, mask)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAnd(short flags, short mask) {
+    expr().bitwiseAnd(_name, flags, mask);
+    return _root;
+  }
+
+  /**
+   * Add expression for ALL of the given bit flags to be set.
+   * <pre>{@code
+   *
+   * bitwiseAll(BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAll(short flags) {
+    expr().bitwiseAll(_name, flags);
+    return _root;
+  }
+
+  /**
+   * Add expression for ANY of the given bit flags to be set.
+   * <pre>{@code
+   *
+   * bitwiseAny(BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseAny(short flags) {
+    expr().bitwiseAny(_name, flags);
+    return _root;
+  }
+
+  /**
+   * Add expression for the given bit flags to be NOT set.
+   * <pre>{@code
+   *
+   * bitwiseNot(BwFlags.HAS_COLOUR)
+   *
+   * }</pre>
+   *
+   * @param flags        The flags we are looking for
+   */
+  public R bitwiseNot(short flags) {
+    expr().bitwiseNot(_name, flags);
+    return _root;
+  }
 }

From f53d31aa2e80f8e05663b99daa29ee4dd8fbccdd Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Apr 2021 12:22:45 +1300
Subject: [PATCH 185/447] No functional change - final field for BatchControl

---
 .../main/java/io/ebeaninternal/server/persist/BatchControl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 10ba7f205..f276bb331 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -81,7 +81,7 @@ public final class BatchControl {
    */
   private int bufferMax;
 
-  private Queue[] queues = new Queue[3];
+  private final Queue[] queues = new Queue[3];
 
   /**
    * Create for a given transaction, PersistExecute, default size and getGeneratedKeys.

From a617d5890203d445cbd33badcec33ddd3d9d5c0a Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Apr 2021 14:47:54 +1300
Subject: [PATCH 186/447] Initial experimental support for "transparent
 persistence"

In short, when this is turned on at flush() get any dirty beans held by the PersistenceContext and persist them (always update for these beans)
---
 .../src/main/java/io/ebean/Transaction.java   |   8 +
 .../io/ebean/bean/PersistenceContext.java     |   7 +
 .../ebeaninternal/api/ScopedTransaction.java  |   5 +
 .../server/core/DefaultServer.java            |   2 +-
 .../server/core/InternalConfiguration.java    |   4 +-
 .../DefaultPersistenceContext.java            |  31 ++-
 .../ImplicitReadOnlyTransaction.java          |   5 +
 .../server/transaction/JdbcTransaction.java   |  14 +-
 .../server/transaction/NoTransaction.java     |   5 +
 .../transaction/SavepointTransaction.java     |   5 +
 .../transaction/TransactionManager.java       |  16 +-
 .../TransactionManagerOptions.java            |   6 +-
 .../TestTransparentPersist.java               | 204 ++++++++++++++++++
 .../src/test/resources/logback-test.xml       |   4 +-
 14 files changed, 303 insertions(+), 13 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java

diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java
index d4918e84e..0cbfd6e3c 100644
--- a/ebean-api/src/main/java/io/ebean/Transaction.java
+++ b/ebean-api/src/main/java/io/ebean/Transaction.java
@@ -59,6 +59,14 @@ public interface Transaction extends AutoCloseable {
    */
   void register(TransactionCallback callback);
 
+  /**
+   * EXPERIMENTAL - turn on transparent persistence and batchMode true.
+   * <p>
+   * With this turned on beans that are dirty in the persistence context
+   * are automatically persisted on flush() and commit().
+   */
+  void setTransparentPersistence(boolean transparentPersistence);
+
   /**
    * Set a label on the transaction.
    * <p>
diff --git a/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java b/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java
index a8a42e51b..8c861af1f 100644
--- a/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java
+++ b/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java
@@ -1,5 +1,7 @@
 package io.ebean.bean;
 
+import java.util.List;
+
 /**
  * Holds entity beans by there type and id.
  * <p>
@@ -77,6 +79,11 @@ public interface PersistenceContext {
    */
   boolean resetLimit();
 
+  /**
+   * Return the list of dirty beans held by this persistence context.
+   */
+  List<Object> dirtyBeans();
+
   /**
    * Wrapper on a bean to also indicate if a bean has been deleted.
    * <p>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index f5a1db07b..6e95a114e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -131,6 +131,11 @@ public class ScopedTransaction extends SpiTransactionProxy {
     }
   }
 
+  @Override
+  public void setTransparentPersistence(boolean transparentPersistence) {
+    current.getTransaction().setTransparentPersistence(transparentPersistence);
+  }
+
   @Override
   public void setRollbackOnly() {
     current.setRollbackOnly();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 52b94bfb6..6595d9816 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -236,7 +236,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.clockService = config.getClockService();
 
     DocStoreIntegration docStoreComponents = config.createDocStoreIntegration(this);
-    this.transactionManager = config.createTransactionManager(docStoreComponents.updateProcessor());
+    this.transactionManager = config.createTransactionManager(this, docStoreComponents.updateProcessor());
     this.documentStore = docStoreComponents.documentStore();
     this.queryPlanManager = config.initQueryPlanManager(transactionManager);
     this.metaInfoManager = new DefaultMetaInfoManager(this);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 8cbbbfa4b..dca8e3059 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -423,13 +423,13 @@ public class InternalConfiguration {
   /**
    * Create the TransactionManager taking into account autoCommit mode.
    */
-  TransactionManager createTransactionManager(DocStoreUpdateProcessor indexUpdateProcessor) {
+  TransactionManager createTransactionManager(SpiServer server, DocStoreUpdateProcessor indexUpdateProcessor) {
 
     TransactionScopeManager scopeManager = createTransactionScopeManager();
     boolean notifyL2CacheInForeground = cacheManager.isLocalL2Caching() || config.isNotifyL2CacheInForeground();
 
     TransactionManagerOptions options =
-      new TransactionManagerOptions(notifyL2CacheInForeground, config, scopeManager, clusterManager, backgroundExecutor,
+      new TransactionManagerOptions(server, notifyL2CacheInForeground, config, scopeManager, clusterManager, backgroundExecutor,
         indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager,
         tableModState, cacheNotify, clockService);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
index df92246fa..27eea2e4c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
@@ -1,11 +1,9 @@
 package io.ebeaninternal.server.transaction;
 
+import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -200,6 +198,20 @@ public final class DefaultPersistenceContext implements PersistenceContext {
     }
   }
 
+  @Override
+  public List<Object> dirtyBeans() {
+    lock.lock();
+    try {
+      List<Object> list = new ArrayList<>();
+      for (ClassContext classContext : typeCache.values()) {
+        classContext.dirtyBeans(list);
+      }
+      return list;
+    } finally {
+      lock.unlock();
+    }
+  }
+
   @Override
   public String toString() {
     lock.lock();
@@ -318,6 +330,17 @@ public final class DefaultPersistenceContext implements PersistenceContext {
       deleteSet.add(id);
       map.remove(id);
     }
+
+    /**
+     * Add the dirty beans to the list.
+     */
+    void dirtyBeans(List<Object> list) {
+      for (Object value : map.values()) {
+        if (((EntityBean) value)._ebean_getIntercept().isDirty()) {
+          list.add(value);
+        }
+      }
+    }
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 79bf85335..04d7a83a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -95,6 +95,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     return startNanos;
   }
 
+  @Override
+  public void setTransparentPersistence(boolean transparentPersistence) {
+    // do nothing
+  }
+
   @Override
   public void setLabel(String label) {
     // do nothing
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 8c1897ff5..2585c2b23 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -187,6 +187,8 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   private final long startNanos;
 
+  private boolean transparentPersistence;
+
   /**
    * Create a new JdbcTransaction.
    */
@@ -294,6 +296,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     return sb.toString();
   }
 
+  @Override
+  public void setTransparentPersistence(boolean transparentPersistence) {
+    this.transparentPersistence = transparentPersistence;
+    this.batchMode = true;
+  }
+
   @Override
   public boolean isSkipCacheExplicit() {
     return (skipCache != null && !skipCache);
@@ -774,6 +782,10 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Flush the JDBC batch and execute derived relationship statements if necessary.
    */
   private void internalBatchFlush() {
+    if (transparentPersistence) {
+      // Experimental - flush dirty beans held by the persistence context
+      manager.flushTransparent(persistenceContext, this);
+    }
     batchFlush();
     if (deferredList != null) {
       for (PersistDeferredRelationship deferred : deferredList) {
@@ -1042,7 +1054,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
-      if (queryOnly) {
+      if (queryOnly && !transparentPersistence) {
         connectionEndForQueryOnly();
       } else {
         flushCommitAndNotify();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 2ef3f2058..5d593302f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -25,6 +25,11 @@ class NoTransaction implements SpiTransaction {
 
   static final NoTransaction INSTANCE = new NoTransaction();
 
+  @Override
+  public void setTransparentPersistence(boolean transparentPersistence) {
+    // do nothing
+  }
+
   @Override
   public void setLabel(String label) {
     // do nothing
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index b50122f5c..7b596afec 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -60,6 +60,11 @@ class SavepointTransaction extends SpiTransactionProxy {
     this.rollbackOnly = true;
   }
 
+  @Override
+  public void setTransparentPersistence(boolean transparentPersistence) {
+    throw new IllegalStateException("This is not handled yet. Need to review this case.");
+  }
+
   @Override
   public void commit() {
     if (rollbackOnly) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index e42ce2fe3..45885ad2a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -5,6 +5,7 @@ import io.ebean.ProfileLocation;
 import io.ebean.TxScope;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.TxType;
+import io.ebean.bean.PersistenceContext;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
@@ -17,6 +18,7 @@ import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.TimedMetric;
 import io.ebean.metric.TimedMetricMap;
+import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.ScopeTrans;
 import io.ebeaninternal.api.ScopedTransaction;
 import io.ebeaninternal.api.SpiLogManager;
@@ -59,6 +61,8 @@ public class TransactionManager implements SpiTransactionManager {
 
   private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
 
+  private final SpiServer server;
+
   private final BeanDescriptorManager beanDescriptorManager;
 
   /**
@@ -153,7 +157,7 @@ public class TransactionManager implements SpiTransactionManager {
    * Create the TransactionManager
    */
   public TransactionManager(TransactionManagerOptions options) {
-
+    this.server = options.server;
     this.logManager = options.logManager;
     this.txnLogger = logManager.txn();
     this.txnDebug = txnLogger.isDebug();
@@ -786,4 +790,14 @@ public class TransactionManager implements SpiTransactionManager {
   public boolean isLogSummary() {
     return logManager.sum().isDebug();
   }
+
+  /**
+   * Experimental - find dirty beans in the persistence context and persist them.
+   */
+  public void flushTransparent(PersistenceContext persistenceContext, SpiTransaction transaction) {
+    List<Object> dirtyBeans = persistenceContext.dirtyBeans();
+    if (!dirtyBeans.isEmpty()) {
+      server.updateAll(dirtyBeans, transaction);
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
index 9a1b0139b..5d0c87794 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.BackgroundExecutor;
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.DatabaseConfig;
+import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiProfileHandler;
 import io.ebeaninternal.server.cluster.ClusterManager;
@@ -15,6 +16,7 @@ import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
  */
 public class TransactionManagerOptions {
 
+  final SpiServer server;
   final boolean notifyL2CacheInForeground;
   final DatabaseConfig config;
   final ClusterManager clusterManager;
@@ -31,11 +33,11 @@ public class TransactionManagerOptions {
   final ClockService clockService;
 
 
-  public TransactionManagerOptions(boolean notifyL2CacheInForeground, DatabaseConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
+  public TransactionManagerOptions(SpiServer server, boolean notifyL2CacheInForeground, DatabaseConfig config, TransactionScopeManager scopeManager, ClusterManager clusterManager,
                                    BackgroundExecutor backgroundExecutor, DocStoreUpdateProcessor docStoreUpdateProcessor,
                                    BeanDescriptorManager descMgr, DataSourceSupplier dataSourceSupplier, SpiProfileHandler profileHandler,
                                    SpiLogManager logManager, TableModState tableModState, ServerCacheNotify cacheNotify, ClockService clockService) {
-
+    this.server = server;
     this.notifyL2CacheInForeground = notifyL2CacheInForeground;
     this.config = config;
     this.scopeManager = scopeManager;
diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
new file mode 100644
index 000000000..2922d20b2
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -0,0 +1,204 @@
+package org.tests.transparentpersist;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.Transaction;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeantest.LoggedSql;
+import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.EBasicVer;
+import org.tests.model.basic.Order;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestTransparentPersist extends BaseTestCase {
+
+  @Test
+  public void simpleInsertUpdateDelete_experimental() {
+
+    EBasicVer b0 = new EBasicVer("simpleIUD_0");
+    b0.save();
+    EBasicVer b1 = new EBasicVer("simpleIUD_1");
+    b1.save();
+    EBasicVer b2 = new EBasicVer("simpleIUD_2");
+    b2.save();
+
+    EBasicVer newBean;
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+
+      EBasicVer found = DB.find(EBasicVer.class, b0.getId());
+      found.setName("auto dirty");
+
+      // delete by id
+      DB.delete(EBasicVer.class, b1.getId());
+      // find and delete, note the delete is batched up to execute later
+      DB.delete(DB.find(EBasicVer.class, b2.getId()));
+
+      // insert is batched up to execute later
+      newBean = new EBasicVer("simpleIUD_New1");
+      DB.save(newBean);
+      // can still mutate newBean before flush (but not after flush yet as new bean isn't put into Persistence context)
+      newBean.setName("simpleIUD_New2");
+
+      transaction.commit();
+    }
+
+    EBasicVer after = DB.find(EBasicVer.class, b0.getId());
+    assertThat(after.getName()).isEqualTo("auto dirty");
+
+    EBasicVer wasInserted = DB.find(EBasicVer.class, newBean.getId());
+    assertThat(wasInserted.getName()).isEqualTo("simpleIUD_New2");
+
+    assertThat(DB.find(EBasicVer.class, b1.getId())).isNull();
+    assertThat(DB.find(EBasicVer.class, b2.getId())).isNull();
+
+    DB.delete(after);
+    DB.delete(wasInserted);
+  }
+
+  @Test
+  public void simpleUpdate_experimental() {
+
+    EBasicVer transPersist = new EBasicVer("simulate_simpleUpdate");
+    transPersist.save();
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+
+      EBasicVer found = DB.find(EBasicVer.class, transPersist.getId());
+      found.setName("Persisted automatically as dirty");
+
+      transaction.commit();
+    }
+
+    EBasicVer after = DB.find(EBasicVer.class,transPersist.getId());
+    assertThat(after.getName()).isEqualTo("Persisted automatically as dirty");
+    DB.delete(after);
+  }
+
+  @Test
+  public void updateWithPersistCascadeInsert() {
+
+    // setup data
+    Customer c0 = new Customer();
+    c0.setName("firstCust");
+    Order order = new Order();
+    order.setStatus(Order.Status.NEW);
+    order.setCustomer(c0);
+    DB.save(order);
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+
+      Order foundOrder = DB.find(Order.class, order.getId());
+      foundOrder.setStatus(Order.Status.APPROVED);
+      // cascade persist will insert this customer (even though it isn't in the persistence context)
+      Customer c1 = new Customer();
+      c1.setName("newCust CascadePersist");
+      foundOrder.setCustomer(c1);
+
+      transaction.commit();
+    }
+
+    Order checkOrder = DB.find(Order.class, order.getId());
+
+    assertThat(checkOrder.getStatus()).isEqualTo(Order.Status.APPROVED);
+    assertThat(checkOrder.getCustomer().getName()).isEqualTo("newCust CascadePersist");
+
+    DB.delete(checkOrder);
+    DB.delete(Customer.class, checkOrder.getCustomer().getId());
+    DB.delete(Customer.class, c0.getId());
+  }
+
+  @Test
+  public void updateReferenceOnlyWithPersistCascade_Insert_andUpdateForeignKey() {
+
+    // setup data
+    Customer c0 = new Customer();
+    c0.setName("firstCust");
+    Order order = new Order();
+    order.setStatus(Order.Status.NEW);
+    order.setCustomer(c0);
+    DB.save(order);
+
+    LoggedSql.start();
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+
+      Order foundOrder = DB.find(Order.class, order.getId());
+      // we ONLY mutate the foreign key
+      // cascade persist will insert this customer (even though it isn't in the persistence context)
+      Customer c1 = new Customer();
+      c1.setName("newCust CascadePersist");
+      foundOrder.setCustomer(c1);
+
+      transaction.commit();
+    }
+
+    List<String> sql = LoggedSql.stop();
+
+    Order checkOrder = DB.find(Order.class, order.getId());
+
+    assertThat(checkOrder.getStatus()).isEqualTo(Order.Status.NEW);
+    assertThat(checkOrder.getCustomer().getName()).isEqualTo("newCust CascadePersist");
+
+    assertThat(sql).hasSize(5);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.order_date");
+    assertThat(sql.get(1)).contains("insert into o_customer");
+    assertThat(sql.get(2)).contains(" -- bind(");
+    assertThat(sql.get(3)).contains("update o_order set updtime=?, kcustomer_id=? where id=? and updtime=?");
+    assertThat(sql.get(4)).contains(" -- bind(");
+
+    DB.delete(checkOrder);
+    DB.delete(Customer.class, checkOrder.getCustomer().getId());
+    DB.delete(Customer.class, c0.getId());
+  }
+
+  @Test
+  public void simulate_transparentPersistence_forSimpleUpdate() {
+
+    EBasicVer transPersist = new EBasicVer("simulate_simpleUpdate");
+    transPersist.save();
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+      transaction.setBatchSize(10);
+
+      EBasicVer found = DB.find(EBasicVer.class, transPersist.getId());
+      found.setName("Changed");
+
+      // simulate transparent persistence
+      List<Object> dirtyBeans = simulateTransparentPersist(transaction);
+      assertThat(dirtyBeans).hasSize(1);
+      assertThat(dirtyBeans).contains(found);
+
+      // would occur as first part of flush
+      transaction.flush();
+      transaction.commit();
+    }
+
+    EBasicVer after = DB.find(EBasicVer.class,transPersist.getId());
+    assertThat(after.getName()).isEqualTo("Changed");
+    DB.delete(after);
+  }
+
+  private List<Object> simulateTransparentPersist(Transaction transaction) {
+    Database db = DB.getDefault();
+    List<Object> dirtyBeans = getDirtyBeansFromPersistenceContext(transaction);
+    for (Object dirtyBean : dirtyBeans) {
+      db.update(dirtyBean, transaction);
+    }
+    return dirtyBeans;
+  }
+
+  private List<Object> getDirtyBeansFromPersistenceContext(Transaction transaction) {
+    return ((SpiTransaction)transaction).getPersistenceContext().dirtyBeans();
+  }
+
+}
diff --git a/ebean-core/src/test/resources/logback-test.xml b/ebean-core/src/test/resources/logback-test.xml
index 1b8a60a9b..164ff73d3 100644
--- a/ebean-core/src/test/resources/logback-test.xml
+++ b/ebean-core/src/test/resources/logback-test.xml
@@ -79,8 +79,8 @@
   <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.SQL" level="TRACE"/>
+  <logger name="io.ebean.TXN" level="TRACE"/>
 <!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
 
 <!--  <logger name="io.ebean.cache" level="TRACE"/>-->

From ba397bbb0c383bb9be0d1174e3752b9db09c4ef5 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Apr 2021 16:04:18 +1300
Subject: [PATCH 187/447] For experimental "transparent persistence" - Delete
 removes from PC early

When delete bean executed with transparent persistence, this marks the bean as removed from the persistence context early.

This avoids a "dirty" deleted bean from being seen as a "dirty" bean in the persistence context at flush() time.
---
 .../server/core/PersistRequestBean.java       |  8 +++++++
 .../server/persist/DefaultPersister.java      |  1 +
 .../TestTransparentPersist.java               | 23 +++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index eb48fc2ef..c4d02cbf6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -887,6 +887,14 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
   }
 
+  /**
+   * Remove deleted beans from the persistence context early.
+   */
+  public void removeFromPersistenceContext() {
+    idValue = beanDescriptor.getId(entityBean);
+    beanDescriptor.contextDeleted(transaction.getPersistenceContext(), idValue);
+  }
+
   /**
    * Aggressive L1 and L2 cache cleanup for deletes.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index a7b21f0c8..005e85d95 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -881,6 +881,7 @@ public final class DefaultPersister implements Persister {
     }
 
     int count = request.executeOrQueue();
+    request.removeFromPersistenceContext();
 
     if (request.isPersistCascade()) {
       deleteAssocOne(request);
diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
index 2922d20b2..be5d8329b 100644
--- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -17,6 +17,29 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTransparentPersist extends BaseTestCase {
 
+  @Test
+  public void delete_expect_beanRemovedFromPersistenceContext() {
+
+    EBasicVer b0 = new EBasicVer("simpleDelete");
+    DB.save(b0);
+
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+
+      EBasicVer found = DB.find(EBasicVer.class, b0.getId());
+      // make it dirty
+      found.setName("make it dirty");
+
+      // delete it, should remove it from the "live" part of persistence context
+      // with the expectation that no update is executed (no dirty in PC update)
+      DB.delete(found);
+      transaction.commit();
+    }
+
+    EBasicVer after = DB.find(EBasicVer.class, b0.getId());
+    assertThat(after).isNull();
+  }
+
   @Test
   public void simpleInsertUpdateDelete_experimental() {
 

From 0527f45f5a4e3b479296e051493cf536728bcc06 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Apr 2021 16:59:03 +1300
Subject: [PATCH 188/447] For experimental "transparent persistence" - Inserts
 added to PC

When inserting bean with transparent persistence the beans are registered with the persistence context. This is done to support the cases where the beans are inserted, a flush() occurs, the inserted bean is mutated and now dirty - we want that to be detected and get an update
---
 .../ebeaninternal/api/ScopedTransaction.java  |  5 ---
 .../io/ebeaninternal/api/SpiTransaction.java  |  5 +++
 .../api/SpiTransactionProxy.java              | 10 ++++++
 .../server/core/PersistRequestBean.java       |  4 +++
 .../ImplicitReadOnlyTransaction.java          |  5 +++
 .../server/transaction/JdbcTransaction.java   |  5 +++
 .../server/transaction/NoTransaction.java     |  5 +++
 .../transaction/SavepointTransaction.java     |  5 ---
 .../TestTransparentPersist.java               | 36 +++++++++++++++++++
 9 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 6e95a114e..f5a1db07b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -131,11 +131,6 @@ public class ScopedTransaction extends SpiTransactionProxy {
     }
   }
 
-  @Override
-  public void setTransparentPersistence(boolean transparentPersistence) {
-    current.getTransaction().setTransparentPersistence(transparentPersistence);
-  }
-
   @Override
   public void setRollbackOnly() {
     current.setRollbackOnly();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 74faeccb0..8c520f79e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -147,6 +147,11 @@ public interface SpiTransaction extends Transaction {
    */
   int depth();
 
+  /**
+   * Return true if transparent persistence is turned on.
+   */
+  boolean isTransparentPersistence();
+
   /**
    * Return true if this transaction was created explicitly via
    * <code>Ebean.beginTransaction()</code>.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index fe5351ddc..1652b56f6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -43,6 +43,16 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     return transaction.getLabel();
   }
 
+  @Override
+  public void setTransparentPersistence(boolean transparentPersistence) {
+    transaction.setTransparentPersistence(transparentPersistence);
+  }
+
+  @Override
+  public boolean isTransparentPersistence() {
+    return transaction.isTransparentPersistence();
+  }
+
   @Override
   public void commitAndContinue() {
     transaction.commitAndContinue();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index c4d02cbf6..3f7d6e79a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1038,6 +1038,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     if (!publish) {
       beanDescriptor.setDraft(entityBean);
     }
+    if (transaction.isTransparentPersistence() && idValue != null) {
+      // with getGeneratedKeys off we will not have a idValue
+      beanDescriptor.contextPut(transaction.getPersistenceContext(), idValue, entityBean);
+    }
   }
 
   public boolean isReference() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 04d7a83a5..a94260fb6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -100,6 +100,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     // do nothing
   }
 
+  @Override
+  public boolean isTransparentPersistence() {
+    return false;
+  }
+
   @Override
   public void setLabel(String label) {
     // do nothing
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 2585c2b23..bb672cd33 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -302,6 +302,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     this.batchMode = true;
   }
 
+  @Override
+  public boolean isTransparentPersistence() {
+    return transparentPersistence;
+  }
+
   @Override
   public boolean isSkipCacheExplicit() {
     return (skipCache != null && !skipCache);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 5d593302f..92f0e1ca9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -30,6 +30,11 @@ class NoTransaction implements SpiTransaction {
     // do nothing
   }
 
+  @Override
+  public boolean isTransparentPersistence() {
+    return false;
+  }
+
   @Override
   public void setLabel(String label) {
     // do nothing
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index 7b596afec..b50122f5c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -60,11 +60,6 @@ class SavepointTransaction extends SpiTransactionProxy {
     this.rollbackOnly = true;
   }
 
-  @Override
-  public void setTransparentPersistence(boolean transparentPersistence) {
-    throw new IllegalStateException("This is not handled yet. Need to review this case.");
-  }
-
   @Override
   public void commit() {
     if (rollbackOnly) {
diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
index be5d8329b..a59ddda60 100644
--- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -17,6 +17,42 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTransparentPersist extends BaseTestCase {
 
+  @Test
+  public void insertFlush_mutateFlush_expect_update() {
+
+    LoggedSql.start();
+
+    EBasicVer newBean;
+    try (Transaction transaction = DB.beginTransaction()) {
+      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+
+      newBean = new EBasicVer("insertMe");
+      DB.save(newBean);
+
+      // flush - new bean needs to get registered into persistence context
+      transaction.flush();
+
+      // make it dirty, we expect it to execute an update on flush()
+      newBean.setName("make it dirty - auto save");
+
+      // flush again, auto persist dirty bean in persistence context
+      transaction.commit();
+    }
+
+    List<String> sql = LoggedSql.stop();
+
+    EBasicVer found = DB.find(EBasicVer.class, newBean.getId());
+    assertThat(found.getName()).isEqualTo("make it dirty - auto save");
+
+    assertThat(sql).hasSize(4);
+    assertThat(sql.get(0)).contains("insert into e_basicver");
+    assertThat(sql.get(1)).contains(" -- bind(");
+    assertThat(sql.get(2)).contains("update e_basicver set name=?, last_update=? where id=? and last_update=?");
+    assertThat(sql.get(3)).contains(" -- bind(");
+
+    DB.delete(found);
+  }
+
   @Test
   public void delete_expect_beanRemovedFromPersistenceContext() {
 

From 6bcf5c6881e14b0156abaaf14fd4cff39dce8df1 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Apr 2021 22:57:34 +1300
Subject: [PATCH 189/447] Add DatabaseConfig.autoPersistUpdates for
 experimental "transparent persistence"

---
 .../java/io/ebean/config/DatabaseConfig.java  | 23 ++++++++++++++++++-
 .../server/transaction/JdbcTransaction.java   |  5 ++--
 .../transaction/TransactionManager.java       | 11 +++++++--
 .../io/ebean/config/ServerConfigTest.java     |  3 +++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index bf4c61675..be2ac6c1f 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -232,6 +232,12 @@ public class DatabaseConfig {
    */
   private String historyTableSuffix = "_history";
 
+  /**
+   * When true explicit transactions beans that have been made dirty will be
+   * automatically persisted via update on flush.
+   */
+  private boolean autoPersistUpdates;
+
   /**
    * Use for transaction scoped batch mode.
    */
@@ -905,6 +911,20 @@ public class DatabaseConfig {
     this.tenantCatalogProvider = tenantCatalogProvider;
   }
 
+  /**
+   * Return true if dirty beans are automatically persisted.
+   */
+  public boolean isAutoPersistUpdates() {
+    return autoPersistUpdates;
+  }
+
+  /**
+   * Set to true if dirty beans are automatically persisted.
+   */
+  public void setAutoPersistUpdates(boolean autoPersistUpdates) {
+    this.autoPersistUpdates = autoPersistUpdates;
+  }
+
   /**
    * Return the PersistBatch mode to use by default at the transaction level.
    * <p>
@@ -2807,6 +2827,7 @@ public class DatabaseConfig {
     loadDocStoreSettings(p);
 
     defaultServer = p.getBoolean("defaultServer", defaultServer);
+    autoPersistUpdates = p.getBoolean("autoPersistUpdates", autoPersistUpdates);
     loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);
     maxCallStack = p.getInt("maxCallStack", maxCallStack);
     dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
@@ -3348,7 +3369,7 @@ public class DatabaseConfig {
     this.loadModuleInfo = loadModuleInfo;
   }
 
-  public enum UuidVersion {
+    public enum UuidVersion {
     VERSION4,
     VERSION1,
     VERSION1RND
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index bb672cd33..411331aef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -211,11 +211,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.batchOnCascadeMode = false;
         this.onQueryOnly = OnQueryOnly.ROLLBACK;
       } else {
+        this.transparentPersistence = explicit && manager.isAutoPersistUpdates();
         this.logSql = manager.isLogSql();
         this.logSummary = manager.isLogSummary();
         this.skipCacheAfterWrite = manager.isSkipCacheAfterWrite();
-        this.batchMode = manager.getPersistBatch();
-        this.batchOnCascadeMode = manager.getPersistBatchOnCascade();
+        this.batchMode = manager.isPersistBatch();
+        this.batchOnCascadeMode = manager.isPersistBatchOnCascade();
         this.onQueryOnly = manager.getOnQueryOnly();
       }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 45885ad2a..b71868e5d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -104,6 +104,8 @@ public class TransactionManager implements SpiTransactionManager {
    */
   final DocStoreUpdateProcessor docStoreUpdateProcessor;
 
+  private final boolean autoPersistUpdates;
+
   private final boolean persistBatch;
 
   private final boolean persistBatchOnCascade;
@@ -165,6 +167,7 @@ public class TransactionManager implements SpiTransactionManager {
     this.supportsSavepointId = databasePlatform.isSupportsSavepointId();
     this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
     this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
+    this.autoPersistUpdates = options.config.isAutoPersistUpdates();
     this.persistBatch = PersistBatch.ALL == options.config.getPersistBatch();
     this.persistBatchOnCascade = PersistBatch.ALL == options.config.appliedPersistBatchOnCascade();
     this.rollbackOnChecked = options.config.isTransactionRollbackOnChecked();
@@ -283,11 +286,15 @@ public class TransactionManager implements SpiTransactionManager {
     return bulkEventListenerMap;
   }
 
-  boolean getPersistBatch() {
+  boolean isAutoPersistUpdates() {
+    return autoPersistUpdates;
+  }
+
+  boolean isPersistBatch() {
     return persistBatch;
   }
 
-  public boolean getPersistBatchOnCascade() {
+  boolean isPersistBatchOnCascade() {
     return persistBatchOnCascade;
   }
 
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
index f93c18d26..4e92798d6 100644
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -149,6 +149,7 @@ public class ServerConfigTest {
     ServerConfig serverConfig = new ServerConfig();
     assertTrue(serverConfig.isIdGeneratorAutomatic());
     assertTrue(serverConfig.isDefaultServer());
+    assertFalse(serverConfig.isAutoPersistUpdates());
 
     serverConfig.setIdGeneratorAutomatic(false);
     assertFalse(serverConfig.isIdGeneratorAutomatic());
@@ -166,6 +167,8 @@ public class ServerConfigTest {
 
     serverConfig.setLoadModuleInfo(false);
     assertFalse(serverConfig.isAutoLoadModuleInfo());
+    serverConfig.setAutoPersistUpdates(true);
+    assertTrue(serverConfig.isAutoPersistUpdates());
   }
 
   @Test

From 303039735f1cbae070cced68706a64b2dddb3bc8 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Apr 2021 23:04:22 +1300
Subject: [PATCH 190/447] Refactor rename transparentPersistence to
 autoPersistUpdates

---
 .../src/main/java/io/ebean/Transaction.java      |  4 ++--
 .../io/ebeaninternal/api/SpiTransaction.java     |  4 ++--
 .../ebeaninternal/api/SpiTransactionProxy.java   |  8 ++++----
 .../server/core/PersistRequestBean.java          |  2 +-
 .../transaction/ImplicitReadOnlyTransaction.java |  4 ++--
 .../server/transaction/JdbcTransaction.java      | 16 ++++++++--------
 .../server/transaction/NoTransaction.java        |  4 ++--
 .../TestTransparentPersist.java                  | 12 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java
index 0cbfd6e3c..9a391d654 100644
--- a/ebean-api/src/main/java/io/ebean/Transaction.java
+++ b/ebean-api/src/main/java/io/ebean/Transaction.java
@@ -60,12 +60,12 @@ public interface Transaction extends AutoCloseable {
   void register(TransactionCallback callback);
 
   /**
-   * EXPERIMENTAL - turn on transparent persistence and batchMode true.
+   * EXPERIMENTAL - turn on automatic persistence of dirty beans and batchMode true.
    * <p>
    * With this turned on beans that are dirty in the persistence context
    * are automatically persisted on flush() and commit().
    */
-  void setTransparentPersistence(boolean transparentPersistence);
+  void setAutoPersistUpdates(boolean autoPersistUpdates);
 
   /**
    * Set a label on the transaction.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 8c520f79e..8c59fa7dc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -148,9 +148,9 @@ public interface SpiTransaction extends Transaction {
   int depth();
 
   /**
-   * Return true if transparent persistence is turned on.
+   * Return true if dirty beans are automatically persisted.
    */
-  boolean isTransparentPersistence();
+  boolean isAutoPersistUpdates();
 
   /**
    * Return true if this transaction was created explicitly via
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index 1652b56f6..5fd2a3c6e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
@@ -44,13 +44,13 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setTransparentPersistence(boolean transparentPersistence) {
-    transaction.setTransparentPersistence(transparentPersistence);
+  public void setAutoPersistUpdates(boolean autoPersistUpdates) {
+    transaction.setAutoPersistUpdates(autoPersistUpdates);
   }
 
   @Override
-  public boolean isTransparentPersistence() {
-    return transaction.isTransparentPersistence();
+  public boolean isAutoPersistUpdates() {
+    return transaction.isAutoPersistUpdates();
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 3f7d6e79a..31d92b0a0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1038,7 +1038,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     if (!publish) {
       beanDescriptor.setDraft(entityBean);
     }
-    if (transaction.isTransparentPersistence() && idValue != null) {
+    if (transaction.isAutoPersistUpdates() && idValue != null) {
       // with getGeneratedKeys off we will not have a idValue
       beanDescriptor.contextPut(transaction.getPersistenceContext(), idValue, entityBean);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index a94260fb6..5f2b5d195 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -96,12 +96,12 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setTransparentPersistence(boolean transparentPersistence) {
+  public void setAutoPersistUpdates(boolean autoPersistUpdates) {
     // do nothing
   }
 
   @Override
-  public boolean isTransparentPersistence() {
+  public boolean isAutoPersistUpdates() {
     return false;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 411331aef..7d3b3ddf1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -187,7 +187,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   private final long startNanos;
 
-  private boolean transparentPersistence;
+  private boolean autoPersistUpdates;
 
   /**
    * Create a new JdbcTransaction.
@@ -211,7 +211,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.batchOnCascadeMode = false;
         this.onQueryOnly = OnQueryOnly.ROLLBACK;
       } else {
-        this.transparentPersistence = explicit && manager.isAutoPersistUpdates();
+        this.autoPersistUpdates = explicit && manager.isAutoPersistUpdates();
         this.logSql = manager.isLogSql();
         this.logSummary = manager.isLogSummary();
         this.skipCacheAfterWrite = manager.isSkipCacheAfterWrite();
@@ -298,14 +298,14 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setTransparentPersistence(boolean transparentPersistence) {
-    this.transparentPersistence = transparentPersistence;
+  public void setAutoPersistUpdates(boolean autoPersistUpdates) {
+    this.autoPersistUpdates = autoPersistUpdates;
     this.batchMode = true;
   }
 
   @Override
-  public boolean isTransparentPersistence() {
-    return transparentPersistence;
+  public boolean isAutoPersistUpdates() {
+    return autoPersistUpdates;
   }
 
   @Override
@@ -788,7 +788,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Flush the JDBC batch and execute derived relationship statements if necessary.
    */
   private void internalBatchFlush() {
-    if (transparentPersistence) {
+    if (autoPersistUpdates) {
       // Experimental - flush dirty beans held by the persistence context
       manager.flushTransparent(persistenceContext, this);
     }
@@ -1060,7 +1060,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
-      if (queryOnly && !transparentPersistence) {
+      if (queryOnly && !autoPersistUpdates) {
         connectionEndForQueryOnly();
       } else {
         flushCommitAndNotify();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 92f0e1ca9..0d3c82cd6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -26,12 +26,12 @@ class NoTransaction implements SpiTransaction {
   static final NoTransaction INSTANCE = new NoTransaction();
 
   @Override
-  public void setTransparentPersistence(boolean transparentPersistence) {
+  public void setAutoPersistUpdates(boolean autoPersistUpdates) {
     // do nothing
   }
 
   @Override
-  public boolean isTransparentPersistence() {
+  public boolean isAutoPersistUpdates() {
     return false;
   }
 
diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
index a59ddda60..963cc1dcb 100644
--- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -24,7 +24,7 @@ public class TestTransparentPersist extends BaseTestCase {
 
     EBasicVer newBean;
     try (Transaction transaction = DB.beginTransaction()) {
-      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+      transaction.setAutoPersistUpdates(true); // EXPERIMENTAL feature
 
       newBean = new EBasicVer("insertMe");
       DB.save(newBean);
@@ -60,7 +60,7 @@ public class TestTransparentPersist extends BaseTestCase {
     DB.save(b0);
 
     try (Transaction transaction = DB.beginTransaction()) {
-      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+      transaction.setAutoPersistUpdates(true); // EXPERIMENTAL feature
 
       EBasicVer found = DB.find(EBasicVer.class, b0.getId());
       // make it dirty
@@ -88,7 +88,7 @@ public class TestTransparentPersist extends BaseTestCase {
 
     EBasicVer newBean;
     try (Transaction transaction = DB.beginTransaction()) {
-      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+      transaction.setAutoPersistUpdates(true); // EXPERIMENTAL feature
 
       EBasicVer found = DB.find(EBasicVer.class, b0.getId());
       found.setName("auto dirty");
@@ -127,7 +127,7 @@ public class TestTransparentPersist extends BaseTestCase {
     transPersist.save();
 
     try (Transaction transaction = DB.beginTransaction()) {
-      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+      transaction.setAutoPersistUpdates(true); // EXPERIMENTAL feature
 
       EBasicVer found = DB.find(EBasicVer.class, transPersist.getId());
       found.setName("Persisted automatically as dirty");
@@ -152,7 +152,7 @@ public class TestTransparentPersist extends BaseTestCase {
     DB.save(order);
 
     try (Transaction transaction = DB.beginTransaction()) {
-      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+      transaction.setAutoPersistUpdates(true); // EXPERIMENTAL feature
 
       Order foundOrder = DB.find(Order.class, order.getId());
       foundOrder.setStatus(Order.Status.APPROVED);
@@ -188,7 +188,7 @@ public class TestTransparentPersist extends BaseTestCase {
     LoggedSql.start();
 
     try (Transaction transaction = DB.beginTransaction()) {
-      transaction.setTransparentPersistence(true); // EXPERIMENTAL feature
+      transaction.setAutoPersistUpdates(true); // EXPERIMENTAL feature
 
       Order foundOrder = DB.find(Order.class, order.getId());
       // we ONLY mutate the foreign key

From 6d8a1c9398951b2bffe51e1e9d951b971bfbcb91 Mon Sep 17 00:00:00 2001
From: Vladimir Konkov <vkonkov@citc.ru>
Date: Mon, 5 Apr 2021 21:45:48 +0300
Subject: [PATCH 191/447] Explicit locking method withLock() is unaccessible on
 query beans

---
 .../src/main/java/io/ebean/typequery/TQRootBean.java          | 4 ++--
 .../src/test/java/org/querytest/QCustomerTest.java            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 654e35e9d..728184cf4 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -679,7 +679,7 @@ public abstract class TQRootBean<T, R> {
    * Provides us with the ability to explicitly use Postgres
    * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
    */
-  R withLock(Query.LockType lockType) {
+  public R withLock(Query.LockType lockType) {
     query.withLock(lockType);
     return root;
   }
@@ -693,7 +693,7 @@ public abstract class TQRootBean<T, R> {
    * Provides us with the ability to explicitly use Postgres
    * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
    */
-  R withLock(Query.LockType lockType, Query.LockWait lockWait) {
+  public R withLock(Query.LockType lockType, Query.LockWait lockWait) {
     query.withLock(lockType, lockWait);
     return root;
   }
diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
index 56aec1c51..867290e71 100644
--- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
+++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
@@ -71,6 +71,7 @@ public class QCustomerTest {
       // not found using other transaction
       final Customer foundNot = new QCustomer()
         .name.eq("explicitTransaction")
+        .withLock(Query.LockType.SHARE)
         .findOne();
       assertThat(foundNot).isNull();
 

From 9b04f20ed3a1c40de97826f682524d3a6757a77d Mon Sep 17 00:00:00 2001
From: Roman Parshikov <promansew@gmail.com>
Date: Tue, 6 Apr 2021 13:32:57 +0800
Subject: [PATCH 192/447] Fix copy/paste typo

---
 ebean-api/src/main/java/io/ebean/ExpressionList.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index 72f1c06f9..e91846e08 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -1671,7 +1671,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> endAnd();
 
   /**
-   * End a AND junction - synonym for endJunction().
+   * End a OR junction - synonym for endJunction().
    */
   ExpressionList<T> endOr();
 

From f7c1845f0c5dae997f27a799438fea02a7dadf2f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Apr 2021 19:58:02 +1200
Subject: [PATCH 193/447] #2177 - Fix where schema not provided by JDBC driver

For @Table with schema, using findNative with a JDBC driver that does not provide the schema this fix matches by just using the table name.
---
 .../server/deploy/BeanDescriptor.java         |  6 +--
 .../server/deploy/BeanDescriptorTest.java     | 53 ++++++++++++++++---
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index a2d902f13..e05c636bb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2473,7 +2473,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return the property path given the db table and column.
    */
   public String findBeanPath(String schemaName, String tableName, String columnName) {
-    if (matchBaseTable(schemaName, tableName)) {
+    if (matchBaseTable(tableName)) {
       return columnPath.get(columnName);
     }
     BeanPropertyAssoc<?> assocProperty = tablePath.get(tableName);
@@ -2489,10 +2489,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return null;
   }
 
-  private boolean matchBaseTable(String schemaName, String tableName) {
+  boolean matchBaseTable(String tableName) {
     return tableName.isEmpty()
       || baseTable.equalsIgnoreCase(tableName)
-      || baseTable.equalsIgnoreCase(schemaName + "." + tableName);
+      || baseTable.endsWith("." + tableName);
   }
 
   /**
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
index d4cbcbfbf..ab8ae6a87 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
@@ -4,21 +4,22 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.Property;
+import io.ebeaninternal.server.core.CacheOptions;
+import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
+import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 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.basic.*;
 import org.tests.model.bridge.BSite;
 import org.tests.model.bridge.BUser;
 
 import java.util.Collection;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class BeanDescriptorTest extends BaseTestCase {
 
@@ -88,6 +89,42 @@ public class BeanDescriptorTest extends BaseTestCase {
     assertThat(props).extracting("name").contains("id", "status", "orderDate", "shipDate");
   }
 
+  @Test
+  public void matchBaseTable() {
+    BeanDescriptor<Customer> desc = getBeanDescriptor(Customer.class);
+    assertTrue(desc.matchBaseTable("o_customer"));
+  }
+
+  @Test
+  public void matchBaseTable_whenTableHasSchema_expect_matchRegardlessOfSchema() {
+
+    DeployBeanDescriptor<Customer> deploy = mockDeployCustomer();
+
+    when(deploy.getBaseTable()).thenReturn("foo.o_customer");
+    BeanDescriptor<?> desc1 = new BeanDescriptor<>(mockOwner(), deploy);
+    assertTrue(desc1.matchBaseTable("o_customer"));
+
+    when(deploy.getBaseTable()).thenReturn("bar.o_customer");
+    BeanDescriptor<?> desc2 = new BeanDescriptor<>(mockOwner(), deploy);
+    assertTrue(desc2.matchBaseTable("o_customer"));
+  }
+
+  @SuppressWarnings("unchecked")
+  private DeployBeanDescriptor<Customer> mockDeployCustomer() {
+    DeployBeanDescriptor<Customer> deploy = mock(DeployBeanDescriptor.class);
+    when(deploy.getBeanType()).thenReturn(Customer.class);
+    when(deploy.getIdentityMode()).thenReturn(DeployIdentityMode.auto());
+    when(deploy.buildIdentityMode()).thenReturn(IdentityMode.NONE);
+    when(deploy.getCacheOptions()).thenReturn(CacheOptions.NO_CACHING);
+    return deploy;
+  }
+
+  private BeanDescriptorMap mockOwner() {
+    BeanDescriptorMap owner = mock(BeanDescriptorMap.class);
+    when(owner.createDocStoreBeanAdapter(any(), any())).thenReturn(mock(DocStoreBeanAdapter.class));
+    return owner;
+  }
+
   @Test
   public void merge_when_empty() {
 

From 3e97a4005ab34abbac6829ac7e8d70550427c96f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Apr 2021 20:09:09 +1200
Subject: [PATCH 194/447] Change TestCustomerFinder drop query plan threshold
 for tests only

---
 .../java/org/tests/query/finder/TestCustomerFinder.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 8446f9d5b..468b165bb 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -55,7 +55,6 @@ public class TestCustomerFinder extends BaseTestCase {
     assertThat(json1).contains("\"name\":\"txn.main\"");
     assertThat(json1).contains("\"name\":\"orm.Customer.findList\"");
     assertThat(json1).doesNotContain("\"sql\":\"select t0.id, t0.status, t0.name");
-
   }
 
   @Test
@@ -85,7 +84,6 @@ public class TestCustomerFinder extends BaseTestCase {
     assertThat(customer.getName()).isEqualTo(customer1.getName());
 
     assertThat(Customer.find.db().getName()).isEqualTo(DB.getDefault().getName());
-
   }
 
   @Test
@@ -178,7 +176,7 @@ public class TestCustomerFinder extends BaseTestCase {
     // change default collect query plan threshold to 200 micros
     QueryPlanInit init0 = new QueryPlanInit();
     init0.setAll(true);
-    init0.setThresholdMicros(200);
+    init0.setThresholdMicros(2);
     final List<MetaQueryPlan> plans = server().getMetaInfoManager().queryPlanInit(init0);
     assertThat(plans.size()).isGreaterThan(1);
 
@@ -188,7 +186,7 @@ public class TestCustomerFinder extends BaseTestCase {
     // change query plan threshold to 100 micros
     QueryPlanInit init = new QueryPlanInit();
     init.setAll(true);
-    init.setThresholdMicros(100);
+    init.setThresholdMicros(1);
     final List<MetaQueryPlan> appliedToPlans = server().getMetaInfoManager().queryPlanInit(init);
     assertThat(appliedToPlans.size()).isGreaterThan(4);
 

From bb1275f4f95aa43c34b392791b419f2e673bb6dc Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 6 Apr 2021 21:13:59 +1200
Subject: [PATCH 195/447] #2217 - Inserting an entity bean is skipped with a
 String @Id property and no other properties set

---
 .../server/core/PersistRequestBean.java       |  7 ++
 .../server/deploy/BeanDescriptor.java         |  2 +-
 .../server/persist/DefaultPersister.java      |  2 +-
 .../cache/personinfo/PersonCacheEmail.java    |  4 +
 .../tests/cache/personinfo/PersonOther.java   | 73 +++++++++++++++++++
 .../cache/personinfo/TestStringIdOnly.java    | 30 ++++++++
 6 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java
 create mode 100644 ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index eb48fc2ef..01c27fa0f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -1032,6 +1032,13 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
   }
 
+  /**
+   * Return if persist can be skipped on the reference only bean.
+   */
+  public boolean isSkipReference() {
+    return intercept.isReference() || (Flags.isRecurse(flags) && beanDescriptor.referenceIdPropertyOnly(intercept));
+  }
+
   public boolean isReference() {
     return beanDescriptor.isReference(intercept);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index a2d902f13..2e0e00b65 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3134,7 +3134,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return ebi.isReference() || referenceIdPropertyOnly(ebi);
   }
 
-  boolean referenceIdPropertyOnly(EntityBeanIntercept ebi) {
+  public boolean referenceIdPropertyOnly(EntityBeanIntercept ebi) {
     return idOnlyReference && ebi.hasIdOnly(idPropertyIndex);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index a7b21f0c8..935fbb6b8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -447,7 +447,7 @@ public final class DefaultPersister implements Persister {
   public void insert(EntityBean bean, Transaction t) {
 
     PersistRequestBean<?> req = createRequest(bean, t, PersistRequest.Type.INSERT);
-    if (req.isReference()) {
+    if (req.isSkipReference()) {
       // skip insert on reference bean
       return;
     }
diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
index 58ddea0a2..144253edf 100644
--- a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
+++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java
@@ -25,6 +25,10 @@ public class PersonCacheEmail {
     this.email = email;
   }
 
+  public PersonCacheEmail(String id) {
+    this.id = id;
+  }
+
   public String getId() {
     return id;
   }
diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java
new file mode 100644
index 000000000..b4b505125
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java
@@ -0,0 +1,73 @@
+package org.tests.cache.personinfo;
+
+import io.ebean.annotation.WhenCreated;
+import io.ebean.annotation.WhenModified;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+import javax.validation.constraints.Size;
+import java.time.Instant;
+
+@Entity
+public class PersonOther {
+
+  @Id
+  @Size(max=128)
+  private String id;
+
+  private String email;
+
+  @WhenCreated
+  private Instant whenCreated;
+
+  @WhenModified
+  private Instant whenModified;
+
+  @Version
+  private long version;
+
+  public PersonOther(String id) {
+    this.id = id;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public Instant getWhenCreated() {
+    return whenCreated;
+  }
+
+  public void setWhenCreated(Instant whenCreated) {
+    this.whenCreated = whenCreated;
+  }
+
+  public Instant getWhenModified() {
+    return whenModified;
+  }
+
+  public void setWhenModified(Instant whenModified) {
+    this.whenModified = whenModified;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java b/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java
new file mode 100644
index 000000000..6379491ff
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java
@@ -0,0 +1,30 @@
+package org.tests.cache.personinfo;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestStringIdOnly extends BaseTestCase {
+
+  @Test
+  public void insert() {
+
+    PersonCacheEmail b0 = new PersonCacheEmail("IdOnly");
+    DB.save(b0);
+
+    PersonCacheEmail found = DB.find(PersonCacheEmail.class, b0.getId());
+    assertThat(found).isNotNull();
+  }
+
+  @Test
+  public void insert_whenIdOnly() {
+
+    PersonOther b0 = new PersonOther("IdOnly");
+    DB.save(b0);
+
+    PersonOther found = DB.find(PersonOther.class, b0.getId());
+    assertThat(found).isNotNull();
+  }
+}

From f7f383d8f303682368096a9fdb52da50bcaf7e50 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Apr 2021 13:38:34 +1200
Subject: [PATCH 196/447] No effective change - tidy tests
 TestRawSqlPositionedParams, TestRawSqlUnparsedQuery

---
 .../rawsql/TestRawSqlPositionedParams.java    | 54 +++++++++----------
 .../tests/rawsql/TestRawSqlUnparsedQuery.java | 29 +++++-----
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java
index f1c3ef4fd..75d678fd6 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java
@@ -1,38 +1,42 @@
 package org.tests.rawsql;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
+import io.ebean.DB;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestRawSqlPositionedParams extends BaseTestCase {
 
+  private static final RawSql RAWSQL_1 = RawSqlBuilder
+    .parse("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?")
+    .create();
+
+  private static final RawSql RAW_SQL_2 = RawSqlBuilder
+    .unparsed("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?")
+    .columnMapping("r.id", "id")
+    .columnMapping("r.name", "name")
+    .create();
+
   @Test
   public void test() {
 
     ResetBasicData.reset();
 
-    RawSql rawSql = RawSqlBuilder
-      .parse("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?")
-      .create();
+    List<Customer> list = DB.find(Customer.class)
+      .setRawSql(RAWSQL_1)
+      .setParameter(1)
+      .setParameter("R%")
+      .where().lt("id", 2001)
+      .findList();
 
-    Query<Customer> query = Ebean.find(Customer.class);
-    query.setRawSql(rawSql);
-    query.setParameter(1, 1);
-    query.setParameter(2, "R%");
-    query.where().lt("id", 2001);
-
-    List<Customer> list = query.findList();
-
-    assertNotNull(list);
+    assertThat(list).isNotNull();
   }
 
   @Test
@@ -40,18 +44,12 @@ public class TestRawSqlPositionedParams extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    RawSql rawSql = RawSqlBuilder
-      .unparsed("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?")
-      .columnMapping("r.id", "id")
-      .columnMapping("r.name", "name").create();
+    List<Customer> list = DB.find(Customer.class)
+      .setRawSql(RAW_SQL_2)
+      .setParameter(1)
+      .setParameter("R%")
+      .findList();
 
-    Query<Customer> query = Ebean.find(Customer.class);
-    query.setRawSql(rawSql);
-    query.setParameter(1, 1);
-    query.setParameter(2, "R%");
-
-    List<Customer> list = query.findList();
-
-    assertNotNull(list);
+    assertThat(list).isNotNull();
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java
index 8d900b15f..1e576f0b7 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java
@@ -1,19 +1,25 @@
 package org.tests.rawsql;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
+import io.ebean.DB;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 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;
+
 public class TestRawSqlUnparsedQuery extends BaseTestCase {
 
+  private static final RawSql rawSql = RawSqlBuilder
+    .unparsed("select r.id, r.name from o_customer r where r.id >= :a and r.name like :b")
+    .columnMapping("r.id", "id")
+    .columnMapping("r.name", "name")
+    .create();
+
   @Test
   public void testDoubleUnparsedQuery() {
 
@@ -25,17 +31,14 @@ public class TestRawSqlUnparsedQuery extends BaseTestCase {
   }
 
   private static void test() {
-    RawSql rawSql = RawSqlBuilder
-      .unparsed("select r.id, r.name from o_customer r where r.id >= :a and r.name like :b")
-      .columnMapping("r.id", "id").columnMapping("r.name", "name").create();
 
-    Query<Customer> query = Ebean.find(Customer.class);
-    query.setRawSql(rawSql);
-    query.setParameter("a", 1);
-    query.setParameter("b", "R%");
+    List<Customer> list = DB.find(Customer.class)
+      .setRawSql(rawSql)
+      .setParameter("a", 1)
+      .setParameter("b", "R%")
+      .findList();
 
-    List<Customer> list = query.findList();
-    Assert.assertNotNull(list);
+    assertThat(list).isNotNull();
   }
 
 }

From 59793f3c018e1291ec4bf6d869dba4117aa1ca7c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Apr 2021 15:50:04 +1200
Subject: [PATCH 197/447] Improve javadoc for Transaction#setGetGeneratedKeys

More clearly document the limitation that we can't update beans that don't have id values
---
 .../src/main/java/io/ebean/Transaction.java   | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java
index d4918e84e..d3e918c0d 100644
--- a/ebean-api/src/main/java/io/ebean/Transaction.java
+++ b/ebean-api/src/main/java/io/ebean/Transaction.java
@@ -339,15 +339,12 @@ public interface Transaction extends AutoCloseable {
    * 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>
    * We use {@link #flush()} to explicitly flush the batch and we can use
    * {@link #setFlushOnQuery(boolean)} and {@link #setFlushOnMixed(boolean)}
    * to control the automatic flushing behaviour.
-   * </p>
    * <p>
    * Example: batch processing of CallableSql executing every 10 rows
-   * </p>
    *
    * <pre>{@code
    *
@@ -392,14 +389,11 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * This only takes effect when batch mode on the transaction has not already meant that
    * JDBC batch mode is being used.
-   * </p>
    * <p>
    * 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 batchMode the batch mode to use per save(), insert(), update() or delete()
    * @see io.ebean.config.DatabaseConfig#setPersistBatchOnCascade(PersistBatch)
@@ -422,15 +416,19 @@ public interface Transaction extends AutoCloseable {
   int getBatchSize();
 
   /**
-   * Specify if you want batched inserts to use getGeneratedKeys.
+   * Specify if we want batched inserts to use getGeneratedKeys.
    * <p>
    * By default batched inserts will try to use getGeneratedKeys if it is
    * supported by the underlying jdbc driver and database.
-   * </p>
    * <p>
-   * You may want to turn getGeneratedKeys off when you are inserting a large
-   * number of objects and you don't care about getting back the ids.
-   * </p>
+   * We want to turn off getGeneratedKeys when we are inserting a large
+   * number of objects and we don't care about getting back the ids. In this
+   * way we avoid the extra cost of getting back the generated id values
+   * from the database.
+   * <p>
+   * Note that when we do turn off getGeneratedKeys then we have the limitation
+   * that after a bean has been inserted we are unable to then mutate the bean
+   * and update it in the same transaction as we have not obtained it's id value.
    */
   void setGetGeneratedKeys(boolean getGeneratedKeys);
 
@@ -449,13 +447,11 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * If you want to execute both WITHOUT having the batch automatically flush
    * you need to call this with batchFlushOnMixed = false.
-   * </p>
    * <p>
    * Note that UpdateSql and CallableSql are ALWAYS executed first (before the
    * beans are executed). This is because the UpdateSql and CallableSql have
    * already been bound to their PreparedStatements. The beans on the other hand
    * have a 2 step process (delayed binding).
-   * </p>
    */
   void setFlushOnMixed(boolean batchFlushOnMixed);
 
@@ -473,7 +469,6 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * Calling this method with batchFlushOnQuery = false means that you can
    * execute a query and the batch will not be automatically flushed.
-   * </p>
    */
   void setFlushOnQuery(boolean batchFlushOnQuery);
 
@@ -490,7 +485,6 @@ public interface Transaction extends AutoCloseable {
    * should be flushed prior to executing a query.
    * <p>
    * The default is for this to be true.
-   * </p>
    */
   boolean isFlushOnQuery();
 
@@ -507,7 +501,6 @@ public interface Transaction extends AutoCloseable {
    * 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>
@@ -533,11 +526,9 @@ public interface Transaction extends AutoCloseable {
    * commit() rollback() and end() methods on the Transaction should still be
    * used. Calling these methods on the Connection would be a big no no unless
    * you know what you are doing.
-   * </p>
    * <p>
    * Examples of when a developer may wish to use the connection directly are:
    * Savepoints, advanced CLOB BLOB use and advanced stored procedure calls.
-   * </p>
    */
   Connection getConnection();
 
@@ -545,17 +536,14 @@ public interface Transaction extends AutoCloseable {
    * Add table modification information to the TransactionEvent.
    * <p>
    * Use this in conjunction with getConnection() and raw JDBC.
-   * </p>
    * <p>
    * This effectively informs Ebean of the data that has been changed by the
    * transaction and this information is normally automatically handled by Ebean
    * when you save entity beans or use UpdateSql etc.
-   * </p>
    * <p>
    * If you use raw JDBC then you can use this method to inform Ebean for the
    * tables that have been modified. Ebean uses this information to keep its
    * caches in synch and maintain text indexes.
-   * </p>
    */
   void addModification(String tableName, boolean inserts, boolean updates, boolean deletes);
 

From 4ee8d647b7ee91dd1e1c0dada43e70c3355f9421 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Apr 2021 23:28:53 +1200
Subject: [PATCH 198/447] No effective change - tidy test TestCustomerFinder

---
 .../java/org/tests/query/finder/TestCustomerFinder.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 468b165bb..eeefe42c2 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -31,7 +31,7 @@ public class TestCustomerFinder extends BaseTestCase {
     runQueries();
 
     StringBuilder buffer0 = new StringBuilder();
-    server().getMetaInfoManager()
+    DB.getDefault().getMetaInfoManager()
       .collectMetricsAsJson()
       .withHeader(false)
       .write(buffer0);
@@ -45,7 +45,7 @@ public class TestCustomerFinder extends BaseTestCase {
     runQueries();
 
     StringBuilder buffer1 = new StringBuilder();
-    server().getMetaInfoManager()
+    DB.getDefault().getMetaInfoManager()
       .collectMetricsAsJson()
       .withHeader(false)
       .write(buffer1);
@@ -193,7 +193,7 @@ public class TestCustomerFinder extends BaseTestCase {
     // run queries again
     runQueries();
 
-    ServerMetrics metrics = server().getMetaInfoManager().collectMetrics();
+    ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics();
 
     List<MetaQueryMetric> planStats = metrics.getQueryMetrics();
     assertThat(planStats.size()).isGreaterThan(4);

From 7f13ac9e5e7354954492ef23041435c5e4fa3b4d Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Apr 2021 23:15:49 +1200
Subject: [PATCH 199/447] #2213 - Support autoPersistUpdates via TxScope

---
 ebean-api/pom.xml                             |  2 +-
 ebean-api/src/main/java/io/ebean/TxScope.java | 18 ++++++++
 ebean-core/pom.xml                            |  2 +-
 .../java/io/ebeaninternal/api/ScopeTrans.java |  4 ++
 .../TestTransparentPersist.java               | 43 +++++++++++++++++--
 .../src/test/resources/logback-test.xml       |  4 +-
 6 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 4fe1468ec..cb8c1d67e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.15</version>
+      <version>7.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-api/src/main/java/io/ebean/TxScope.java b/ebean-api/src/main/java/io/ebean/TxScope.java
index ee9fdca7b..59d9f6971 100644
--- a/ebean-api/src/main/java/io/ebean/TxScope.java
+++ b/ebean-api/src/main/java/io/ebean/TxScope.java
@@ -2,6 +2,7 @@ package io.ebean;
 
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.TxIsolation;
+import io.ebean.annotation.TxOption;
 import io.ebean.annotation.TxType;
 
 import java.util.ArrayList;
@@ -33,6 +34,8 @@ public final class TxScope {
 
   private TxIsolation isolation;
 
+  private TxOption autoPersistUpdates;
+
   private PersistBatch batch;
 
   private PersistBatch batchOnCascade;
@@ -123,6 +126,13 @@ public final class TxScope {
       + "] serverName[" + serverName + "] rollbackFor[" + rollbackFor + "] noRollbackFor[" + noRollbackFor + "]";
   }
 
+  /**
+   * Return the AutoPersistUpdates mode as a nullable Boolean.
+   */
+  public Boolean getAutoPersistUpdates() {
+    return autoPersistUpdates == null ? null : autoPersistUpdates.asBoolean();
+  }
+
   /**
    * Return true if PersistBatch has been set.
    */
@@ -176,6 +186,14 @@ public final class TxScope {
     return this;
   }
 
+  /**
+   * Set the autoPersistUpdates mode.
+   */
+  public TxScope setAutoPersistUpdates(TxOption autoPersistUpdates) {
+    this.autoPersistUpdates = autoPersistUpdates;
+    return this;
+  }
+
   /**
    * Return the transaction profile id.
    */
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 3652ba9a3..4b37905a9 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2-SNAPSHOT</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index 5fbb03f25..631b6dfb8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -73,6 +73,10 @@ public class ScopeTrans {
         restoreBatchGeneratedKeys = transaction.getBatchGetGeneratedKeys();
         restoreBatchFlushOnQuery = transaction.isFlushOnQuery();
       }
+      Boolean autoPersistUpdates = txScope.getAutoPersistUpdates();
+      if (autoPersistUpdates != null) {
+        transaction.setAutoPersistUpdates(autoPersistUpdates);
+      }
       if (txScope.isBatchSet()) {
         transaction.setBatchMode(txScope.isBatchMode());
       }
diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
index 963cc1dcb..a169145eb 100644
--- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -1,9 +1,7 @@
 package org.tests.transparentpersist;
 
-import io.ebean.BaseTestCase;
-import io.ebean.DB;
-import io.ebean.Database;
-import io.ebean.Transaction;
+import io.ebean.*;
+import io.ebean.annotation.*;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeantest.LoggedSql;
 import org.junit.Test;
@@ -219,6 +217,43 @@ public class TestTransparentPersist extends BaseTestCase {
     DB.delete(Customer.class, c0.getId());
   }
 
+  @Test
+  public void txScope_setAutoPersistUpdates() {
+
+    EBasicVer b0 = new EBasicVer("txScopeUpdate");
+    b0.save();
+
+    DB.execute(TxScope.required().setAutoPersistUpdates(TxOption.ON), () -> {
+      EBasicVer found = DB.find(EBasicVer.class, b0.getId());
+      found.setName("mutable txScope bean");
+    });
+
+    EBasicVer after = DB.find(EBasicVer.class, b0.getId());
+    assertThat(after.getName()).isEqualTo("mutable txScope bean");
+
+    DB.delete(after);
+  }
+
+//  @Test
+//  public void txn_setAutoPersistUpdates() {
+//
+//    EBasicVer b0 = new EBasicVer("txn autoPersistUpdates ON");
+//    b0.save();
+//
+//    performUpdate(b0);
+//
+//    EBasicVer after = DB.find(EBasicVer.class, b0.getId());
+//    assertThat(after.getName()).isEqualTo("mutated with autoPersistUpdates ON");
+//
+//    DB.delete(after);
+//  }
+//
+//  @Transactional(autoPersistUpdates = TxOption.ON)
+//  private void performUpdate(EBasicVer b0) {
+//    EBasicVer found = DB.find(EBasicVer.class, b0.getId());
+//    found.setName("mutated with autoPersistUpdates ON");
+//  }
+
   @Test
   public void simulate_transparentPersistence_forSimpleUpdate() {
 
diff --git a/ebean-core/src/test/resources/logback-test.xml b/ebean-core/src/test/resources/logback-test.xml
index 164ff73d3..1b8a60a9b 100644
--- a/ebean-core/src/test/resources/logback-test.xml
+++ b/ebean-core/src/test/resources/logback-test.xml
@@ -79,8 +79,8 @@
   <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.SQL" level="TRACE"/>-->
+<!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
 <!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
 
 <!--  <logger name="io.ebean.cache" level="TRACE"/>-->

From 06802896ef0b9412c8fb153365dc1866c7fb588d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Apr 2021 16:17:58 +1200
Subject: [PATCH 200/447] #2213 Bump agent for
 @Transactional(autoPersistUpdates = TxOption.ON)

---
 ebean-bom/pom.xml                             |  4 +-
 ebean-core/pom.xml                            |  2 +-
 .../TestTransparentPersist.java               | 38 +++++++++----------
 ebean-ddl-generator/pom.xml                   |  2 +-
 kotlin-querybean-generator/pom.xml            |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 401f6dbdf..7ab7bb0e9 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,8 +18,8 @@
     <ebean-migration.version>12.4.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.8.1</ebean-agent.version>
-    <ebean-maven-plugin.version>12.8.1</ebean-maven-plugin.version>
+    <ebean-agent.version>12.8.2</ebean-agent.version>
+    <ebean-maven-plugin.version>12.8.2</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 4b37905a9..2e403ef17 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
index a169145eb..75d767b3b 100644
--- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -234,25 +234,25 @@ public class TestTransparentPersist extends BaseTestCase {
     DB.delete(after);
   }
 
-//  @Test
-//  public void txn_setAutoPersistUpdates() {
-//
-//    EBasicVer b0 = new EBasicVer("txn autoPersistUpdates ON");
-//    b0.save();
-//
-//    performUpdate(b0);
-//
-//    EBasicVer after = DB.find(EBasicVer.class, b0.getId());
-//    assertThat(after.getName()).isEqualTo("mutated with autoPersistUpdates ON");
-//
-//    DB.delete(after);
-//  }
-//
-//  @Transactional(autoPersistUpdates = TxOption.ON)
-//  private void performUpdate(EBasicVer b0) {
-//    EBasicVer found = DB.find(EBasicVer.class, b0.getId());
-//    found.setName("mutated with autoPersistUpdates ON");
-//  }
+  @Test
+  public void txn_setAutoPersistUpdates() {
+
+    EBasicVer b0 = new EBasicVer("txn autoPersistUpdates ON");
+    b0.save();
+
+    performUpdate(b0);
+
+    EBasicVer after = DB.find(EBasicVer.class, b0.getId());
+    assertThat(after.getName()).isEqualTo("mutated with autoPersistUpdates ON");
+
+    DB.delete(after);
+  }
+
+  @Transactional(autoPersistUpdates = TxOption.ON)
+  private void performUpdate(EBasicVer b0) {
+    EBasicVer found = DB.find(EBasicVer.class, b0.getId());
+    found.setName("mutated with autoPersistUpdates ON");
+  }
 
   @Test
   public void simulate_transparentPersistence_forSimpleUpdate() {
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 421166e46..edabcce4f 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 70432f360..40d38fe36 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -146,7 +146,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.1</version>
+        <version>12.8.2</version>
         <executions>
           <execution>
             <id>test</id>

From fc174c8988f7eb47989c0d84b701e225919578e3 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Apr 2021 17:49:07 +1200
Subject: [PATCH 201/447] [maven-release-plugin] prepare release
 ebean-parent-12.8.2

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index cb8c1d67e..27641ad7e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 700861dd9..5d855889e 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.2</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 7ab7bb0e9..37d9aba2c 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.2-SNAPSHOT</version>
+        <version>12.8.2</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index be8b15507..f57b0876e 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 2e403ef17..cfd18d306 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.2</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index edabcce4f..f6efd42b5 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 32a98a767..a5fc4063a 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 029f345fc..2b70daecf 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.2</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 6528624f3..376235aef 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 86d02f68a..a213b74b7 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 1d3a74a49..35689ff88 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 65e0d345c..0f9670dc6 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index b293a20bc..fb3fce888 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 40d38fe36..c8a470b11 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2-SNAPSHOT</version>
+      <version>12.8.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index a0ce632a3..87457c583 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.2-SNAPSHOT</version>
+  <version>12.8.2</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.2</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index be174f512..569bd963f 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2-SNAPSHOT</version>
+    <version>12.8.2</version>
   </parent>
 
   <name>querybean generator</name>

From 65b282a056492f096794e80189cff9d743558464 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Apr 2021 17:49:16 +1200
Subject: [PATCH 202/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 27641ad7e..92c01ccfb 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 5d855889e..e3b77f33e 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 37d9aba2c..488bce1cd 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.3-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index f57b0876e..41b6d4c6d 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index cfd18d306..94820c06d 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index f6efd42b5..77feacd15 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index a5fc4063a..79278c962 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 2b70daecf..9c948ce06 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 376235aef..8c841697c 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index a213b74b7..798ccf976 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 35689ff88..793fab680 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 0f9670dc6..d7f7c563a 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index fb3fce888..8881210b6 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index c8a470b11..4b957878f 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.2</version>
+      <version>12.8.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 87457c583..10f7d260d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.2</version>
+  <version>12.8.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 569bd963f..5d6d29dc6 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.2</version>
+    <version>12.8.3-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 9d54b264ad536ed8564afe3d337af693de3e713d Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Apr 2021 17:04:57 +1200
Subject: [PATCH 203/447] #2219 - Compile error with ZonedDateTime and query
 beans - type argument java.time.ZonedDateTime is not within bounds of
 type-variable D

---
 .../io/ebean/typequery/PZonedDateTime.java    | 50 +++++++++++++++++++
 .../test/java/org/example/domain/Contact.java | 29 +++++++----
 .../test/java/org/querytest/QContactTest.java |  4 +-
 .../querybean/generator/PropertyTypeMap.java  |  6 +--
 .../querybean/generator/PropertyTypeMap.java  |  6 +--
 5 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
new file mode 100644
index 000000000..e233449ef
--- /dev/null
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
@@ -0,0 +1,50 @@
+package io.ebean.typequery;
+
+import java.time.ZonedDateTime;
+
+/**
+ * ZonedDateTime property.
+ *
+ * @param <R> the root query bean type
+ */
+public class PZonedDateTime<R> extends PBaseCompareable<R, ZonedDateTime> {
+
+  /**
+   * Construct with a property name and root instance.
+   *
+   * @param name property name
+   * @param root the root query bean instance
+   */
+  public PZonedDateTime(String name, R root) {
+    super(name, root);
+  }
+
+  /**
+   * Construct with additional path prefix.
+   */
+  public PZonedDateTime(String name, R root, String prefix) {
+    super(name, root, prefix);
+  }
+
+  /**
+   * Same as greater than.
+   *
+   * @param value the equal to bind value
+   * @return the root query bean instance
+   */
+  public R after(ZonedDateTime value) {
+    expr().gt(_name, value);
+    return _root;
+  }
+
+  /**
+   * Same as less than.
+   *
+   * @param value the equal to bind value
+   * @return the root query bean instance
+   */
+  public R before(ZonedDateTime value) {
+    expr().lt(_name, value);
+    return _root;
+  }
+}
diff --git a/ebean-querybean/src/test/java/org/example/domain/Contact.java b/ebean-querybean/src/test/java/org/example/domain/Contact.java
index 00035d80a..2b5fe9f53 100644
--- a/ebean-querybean/src/test/java/org/example/domain/Contact.java
+++ b/ebean-querybean/src/test/java/org/example/domain/Contact.java
@@ -3,6 +3,7 @@ package org.example.domain;
 import io.ebean.annotation.DbArray;
 
 import javax.persistence.*;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -11,33 +12,35 @@ import java.util.Map;
  * Contact entity bean.
  */
 @Entity
-@Table(name="be_contact")
+@Table(name = "be_contact")
 public class Contact extends BaseModel {
 
   @DbArray
-  List<String> phoneNumbers = new ArrayList();
+  List<String> phoneNumbers = new ArrayList<>();
 
-  @Column(length=50)
+  @Column(length = 50)
   String firstName;
 
-  @Column(length=50)
+  @Column(length = 50)
   String lastName;
 
-  @Column(length=200)
+  @Column(length = 200)
   String email;
 
-  @Column(length=20)
+  @Column(length = 20)
   String phone;
 
-  @ManyToOne(optional=false)
+  ZonedDateTime zoneDateTime;
+
+  @ManyToOne(optional = false)
   Customer customer;
 
   @OneToMany(mappedBy = "contact")
   List<ContactNote> notes;
 
   @OneToMany(cascade = CascadeType.PERSIST)
-  @MapKey(name="key")
-  Map<String,ContactOther> others;
+  @MapKey(name = "key")
+  Map<String, ContactOther> others;
 
   /**
    * Default constructor.
@@ -85,6 +88,14 @@ public class Contact extends BaseModel {
     this.phone = phone;
   }
 
+  public ZonedDateTime getZoneDateTime() {
+    return zoneDateTime;
+  }
+
+  public void setZoneDateTime(ZonedDateTime zoneDateTime) {
+    this.zoneDateTime = zoneDateTime;
+  }
+
   public Customer getCustomer() {
     return customer;
   }
diff --git a/ebean-querybean/src/test/java/org/querytest/QContactTest.java b/ebean-querybean/src/test/java/org/querytest/QContactTest.java
index ff37f789e..ef0d5a01b 100644
--- a/ebean-querybean/src/test/java/org/querytest/QContactTest.java
+++ b/ebean-querybean/src/test/java/org/querytest/QContactTest.java
@@ -3,13 +3,15 @@ package org.querytest;
 import org.example.domain.query.QContact;
 import org.junit.Test;
 
+import java.time.ZonedDateTime;
+
 public class QContactTest {
 
   @Test
   public void test_oneToManyMap() {
-
     new QContact()
       .others.fetch()
+      .zoneDateTime.before(ZonedDateTime.now())
       .findList();
   }
 }
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java
index f5676f060..6afc8a6e3 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java
@@ -25,10 +25,9 @@ class PropertyTypeMap {
    */
   private final PropertyType dbJsonType = new PropertyType("PJson");
 
-  private Map<String,PropertyType> map = new HashMap<>();
+  private final Map<String,PropertyType> map = new HashMap<>();
 
   PropertyTypeMap() {
-
     map.put("boolean", new PropertyType("PBoolean"));
     map.put("short", new PropertyType("PShort"));
     map.put("int", new PropertyType("PInteger"));
@@ -57,7 +56,6 @@ class PropertyTypeMap {
     addType(Locale.class);
     addType(File.class);
     addType(InetAddress.class);
-
     map.put(URI.class.getName(), new PropertyType("PUri"));
     map.put(URL.class.getName(), new PropertyType("PUrl"));
     map.put(UUID.class.getName(), new PropertyType("PUuid"));
@@ -74,7 +72,6 @@ class PropertyTypeMap {
   }
 
   private void addJava8Types() {
-
     try {
       Class.forName("java.time.Instant");
     } catch (ClassNotFoundException e) {
@@ -94,6 +91,7 @@ class PropertyTypeMap {
     addType(java.time.YearMonth.class);
     addType(java.time.ZoneId.class);
     addType(java.time.ZoneOffset.class);
+    addType(java.time.ZonedDateTime.class);
   }
 
   private void addJodaTypes() {
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java
index b60a42cd7..fa35c72fa 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeMap.java
@@ -25,10 +25,9 @@ class PropertyTypeMap {
    */
   private final PropertyType dbJsonType = new PropertyType("PJson");
 
-  private Map<String,PropertyType> map = new HashMap<>();
+  private final Map<String,PropertyType> map = new HashMap<>();
 
   PropertyTypeMap() {
-
     map.put("boolean", new PropertyType("PBoolean"));
     map.put("short", new PropertyType("PShort"));
     map.put("int", new PropertyType("PInteger"));
@@ -57,7 +56,6 @@ class PropertyTypeMap {
     map.put("java.lang.Class<?>", new PropertyType("PClass"));
     addType(File.class);
     addType(InetAddress.class);
-
     map.put(URI.class.getName(), new PropertyType("PUri"));
     map.put(URL.class.getName(), new PropertyType("PUrl"));
     map.put(UUID.class.getName(), new PropertyType("PUuid"));
@@ -73,7 +71,6 @@ class PropertyTypeMap {
   }
 
   private void addJava8Types() {
-
     try {
       Class.forName("java.time.Instant");
     } catch (ClassNotFoundException e) {
@@ -93,6 +90,7 @@ class PropertyTypeMap {
     addType(java.time.YearMonth.class);
     addType(java.time.ZoneId.class);
     addType(java.time.ZoneOffset.class);
+    addType(java.time.ZonedDateTime.class);
   }
 
   private void addJodaTypes() {

From 2d719c5b37f18c8ba2cc2189fd459d73c858dcf7 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Apr 2021 20:08:38 +1200
Subject: [PATCH 204/447] #2218 - @Encrypted columns on Oracle. The identifier
 alias starts with an underscore (ORA-00911)

Change to use zx__ for the encryption column alias prefix rather than _e_
---
 .../io/ebeaninternal/server/core/DtoQueryRequest.java     | 7 +++++--
 .../java/io/ebeaninternal/server/core/EncryptAlias.java   | 8 ++++++++
 .../java/io/ebeaninternal/server/deploy/BeanProperty.java | 5 ++++-
 .../io/ebeaninternal/server/core/DtoQueryRequestTest.java | 8 ++++----
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/core/EncryptAlias.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 120e98a27..2372ed7c3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -23,6 +23,9 @@ import java.util.function.Predicate;
  */
 public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
 
+  private static final String ENC_PREFIX = EncryptAlias.PREFIX;
+  private static final String ENC_PREFIX_UPPER = EncryptAlias.PREFIX.toUpperCase();
+
   private final SpiDtoQuery<T> query;
 
   private final DtoQueryEngine queryEngine;
@@ -133,9 +136,9 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
   }
 
   static String parseColumn(String columnLabel) {
-    if (columnLabel.startsWith("_e_") || columnLabel.startsWith("_E_")) {
+    if (columnLabel.startsWith(ENC_PREFIX) || columnLabel.startsWith(ENC_PREFIX_UPPER)) {
       // encrypted column alias in the form _e_<tableAlias>_<column>
-      final int pos = columnLabel.indexOf("_", 3);
+      final int pos = columnLabel.indexOf("_", 4);
       if (pos > -1) {
         return columnLabel.substring(pos + 1);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/EncryptAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/EncryptAlias.java
new file mode 100644
index 000000000..e73a2a9e9
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/EncryptAlias.java
@@ -0,0 +1,8 @@
+package io.ebeaninternal.server.core;
+
+/**
+ * Used to create column alias for encrypted columns.
+ */
+public interface EncryptAlias {
+  String PREFIX = "zx__";
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index d3b1f429b..270415a22 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -18,6 +18,7 @@ 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.EncryptAlias;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated;
@@ -65,6 +66,8 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanProperty.class);
 
+  private static final String ENC_PREFIX = " " + EncryptAlias.PREFIX;
+
   /**
    * Flag to mark this is the id property.
    */
@@ -531,7 +534,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * Return the SQL for the column including decryption function and column alias.
    */
   private String getDecryptSqlWithColumnAlias(String tableAlias) {
-    return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.getDbColumn()) + " _e_" + tableAlias + "_" + this.getDbColumn();
+    return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.getDbColumn()) + ENC_PREFIX + tableAlias + "_" + this.getDbColumn();
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java
index f8bdd66bd..4b85f18f1 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java
@@ -11,10 +11,10 @@ public class DtoQueryRequestTest {
   public void testParse() {
 
     assertEquals("foo", DtoQueryRequest.parseColumn("foo"));
-    assertEquals("bar", DtoQueryRequest.parseColumn("_e_t0_bar"));
-    assertEquals("BAR", DtoQueryRequest.parseColumn("_E_T0_BAR"));
-    assertEquals("baz", DtoQueryRequest.parseColumn("_e_t42_baz"));
-    assertEquals("BAZ", DtoQueryRequest.parseColumn("_E_T42_BAZ"));
+    assertEquals("bar", DtoQueryRequest.parseColumn("zx__t0_bar"));
+    assertEquals("BAR", DtoQueryRequest.parseColumn("ZX__T0_BAR"));
+    assertEquals("baz", DtoQueryRequest.parseColumn("zx__t42_baz"));
+    assertEquals("BAZ", DtoQueryRequest.parseColumn("ZX__T42_BAZ"));
 
     assertEquals("e_t42_nope", DtoQueryRequest.parseColumn("e_t42_nope"));
     assertEquals("_f_t42_nope", DtoQueryRequest.parseColumn("_f_t42_nope"));

From bb6ff866c76e068fd6030189e1df01f834b442d1 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Apr 2021 21:37:05 +1200
Subject: [PATCH 205/447] #2220 - DDL generation of nullable columns expected
 with nullable Embedded containing non null properties

---
 ebean-core/pom.xml                                        | 2 +-
 .../server/deploy/BeanPropertyAssocManySqlHelp.java       | 6 +++---
 .../server/deploy/visitor/BaseTablePropertyVisitor.java   | 6 ++++--
 .../server/deploy/visitor/BeanPropertyVisitor.java        | 4 ++--
 .../server/deploy/visitor/VisitProperties.java            | 2 +-
 .../java/org/tests/model/embedded/EEmbDatePeriod.java     | 4 ++++
 .../model/build/ModelBuildPropertyVisitor.java            | 8 ++++----
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 94820c06d..c07b3062c 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.6.1</version>
+      <version>12.8.4a</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
index 398713a18..06a2a2145 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
@@ -81,18 +81,18 @@ class BeanPropertyAssocManySqlHelp<T> {
 
     @Override
     public void visitOneImported(BeanPropertyAssocOne<?> p) {
-
+      // do nothing
     }
 
     @Override
-    public void visitScalar(BeanProperty p) {
+    public void visitScalar(BeanProperty p, boolean allowNonNull) {
       sb.append(",").append(p.getDbColumn());
       colCount++;
     }
 
     @Override
     public void visitEnd() {
-
+      // do nothing
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BaseTablePropertyVisitor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BaseTablePropertyVisitor.java
index cc23a5c1f..e6741d12a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BaseTablePropertyVisitor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BaseTablePropertyVisitor.java
@@ -44,9 +44,11 @@ public abstract class BaseTablePropertyVisitor implements BeanPropertyVisitor {
   public abstract void visitOneImported(BeanPropertyAssocOne<?> p);
 
   /**
-   * Override this method for normal scalar property.
+   * Override this method for normal scalar property. With allowNonNull
+   * used with properties of Embedded beans that can only be Nonnull when
+   * the Embedded bean is Nonnull.
    */
   @Override
-  public abstract void visitScalar(BeanProperty p);
+  public abstract void visitScalar(BeanProperty p, boolean allowNonNull);
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BeanPropertyVisitor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BeanPropertyVisitor.java
index 1cadc2b1b..dd0dd7c6e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BeanPropertyVisitor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/BeanPropertyVisitor.java
@@ -40,8 +40,8 @@ public interface BeanPropertyVisitor {
   void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne<?> embedded);
 
   /**
-   * Visit a scalar property.
+   * Visit a scalar property specify allowing non-null (e.g. embedded bean scalar properties).
    */
-  void visitScalar(BeanProperty p);
+  void visitScalar(BeanProperty p, boolean allowNonNull);
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java
index deab1104c..5363b0add 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java
@@ -72,7 +72,7 @@ public class VisitProperties {
 
     } else {
       // simple scalar type
-      pv.visitScalar(p);
+      pv.visitScalar(p, true);
     }
   }
 
diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java b/ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java
index 50cb225a3..2542a066b 100644
--- a/ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java
+++ b/ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java
@@ -1,12 +1,16 @@
 package org.tests.model.embedded;
 
+import io.ebean.annotation.NotNull;
+
 import javax.persistence.Embeddable;
 import java.util.Date;
 
 @Embeddable
 public class EEmbDatePeriod {
 
+  @NotNull
   Date date1;
+  @NotNull
   Date date2;
 
   public Date getDate1() {
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 7b13cf581..3a7457a56 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -175,7 +175,8 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
     if (p instanceof BeanPropertyAssocOne) {
       visitOneImported((BeanPropertyAssocOne<?>)p);
     } else {
-      visitScalar(p);
+      // only allow Nonnull if embedded is Nonnull
+      visitScalar(p, !embedded.isNullable());
     }
     if (embedded.isId()) {
       // compound primary key
@@ -259,8 +260,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
   }
 
   @Override
-  public void visitScalar(BeanProperty p) {
-
+  public void visitScalar(BeanProperty p, boolean allowNonNull) {
     if (p.isSecondaryTable()) {
       lastColumn = null;
       return;
@@ -292,7 +292,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       }
     } else {
       col.setDefaultValue(p.getDbColumnDefault());
-      if (!p.isNullable() || p.isDDLNotNull()) {
+      if (allowNonNull && (!p.isNullable() || p.isDDLNotNull())) {
         col.setNotnull(true);
       }
     }

From 9eb54da2dc29e03e495abedd84a97590ece3bc6e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Apr 2021 21:40:07 +1200
Subject: [PATCH 206/447] [maven-release-plugin] prepare release
 ebean-parent-12.8.3

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 92c01ccfb..1dfb09ea5 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index e3b77f33e..d02ceb219 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.3</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 488bce1cd..01aff5126 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.3-SNAPSHOT</version>
+        <version>12.8.3</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 41b6d4c6d..1bee819fd 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index c07b3062c..c395097e6 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.3</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 77feacd15..959230160 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 79278c962..3031bebb8 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 9c948ce06..311a6f776 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.3</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 8c841697c..a254289cf 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 798ccf976..252e28c54 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 793fab680..c238e7c7d 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index d7f7c563a..9b13477da 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 8881210b6..ddd0b9574 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 4b957878f..545078f3c 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3-SNAPSHOT</version>
+      <version>12.8.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 10f7d260d..61571ff85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.3-SNAPSHOT</version>
+  <version>12.8.3</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.8.3</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 5d6d29dc6..996feff79 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3-SNAPSHOT</version>
+    <version>12.8.3</version>
   </parent>
 
   <name>querybean generator</name>

From 5e893dd2ade2aac9c74ecb7234750bb859401fed Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 19 Apr 2021 21:40:16 +1200
Subject: [PATCH 207/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 1dfb09ea5..380438cc2 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index d02ceb219..590680c8a 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 01aff5126..aaa2b5961 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.3</version>
+        <version>12.8.4-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 1bee819fd..04497471c 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index c395097e6..dbde9f167 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 959230160..f94924830 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 3031bebb8..079eebec9 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 311a6f776..bcf9f10ff 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index a254289cf..4e1b6063b 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 252e28c54..ff6dd8754 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index c238e7c7d..01062abf1 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 9b13477da..c3ed1f57f 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index ddd0b9574..ba312953f 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 545078f3c..a556671bb 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.3</version>
+      <version>12.8.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 61571ff85..fb82113fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.3</version>
+  <version>12.8.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 996feff79..1ea632096 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.3</version>
+    <version>12.8.4-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From c60077174ed01d4babc0049a0beecc4ae70d0415 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Apr 2021 15:14:20 +1200
Subject: [PATCH 208/447] Tidy use of StringHelper replace() in BeanProperty,
 BaseTableDdl

---
 .../java/io/ebeaninternal/server/deploy/BeanProperty.java | 8 +++-----
 .../dbmigration/ddlgeneration/platform/BaseTableDdl.java  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 270415a22..d96a3d850 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -56,8 +56,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static io.ebean.util.StringHelper.replace;
-
 /**
  * Description of a property of a bean. Includes its deployment information such
  * as database column mapping information.
@@ -357,12 +355,12 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   private String tableAliasIntern(BeanDescriptor<?> descriptor, String s, boolean dbEncrypted, String dbColumn) {
     if (descriptor != null) {
-      s = replace(s, "${ta}.", "${}");
-      s = replace(s, "${ta}", "${}");
+      s = s.replace("${ta}.", "${}");
+      s = s.replace("${ta}", "${}");
       if (dbEncrypted) {
         s = dbEncryptFunction.getDecryptSql(s);
         String namedParam = ":encryptkey_" + descriptor.getBaseTable() + "___" + dbColumn;
-        s = replace(s, "?", namedParam);
+        s = s.replace("?", namedParam);
       }
     }
     return InternString.intern(s);
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 41e91274e..0e80c2676 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -150,7 +150,7 @@ public class BaseTableDdl implements TableDdl {
         buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine();
       }
       for (String ddlScript : before) {
-        buffer.appendStatement(translate(ddlScript, tableName, columnName, this.defaultValue));
+        buffer.appendStatement(translate(ddlScript, tableName, columnName, defaultValue));
       }
     }
 

From 4fb3b9cddc3c1d052c6509249011819df1c12f4b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Apr 2021 22:13:45 +1200
Subject: [PATCH 209/447] Tidy use of StringHelper replace() in BeanProperty,
 BaseTableDdl

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

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index d96a3d850..8793942b6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -354,7 +354,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   }
 
   private String tableAliasIntern(BeanDescriptor<?> descriptor, String s, boolean dbEncrypted, String dbColumn) {
-    if (descriptor != null) {
+    if (s != null && descriptor != null) {
       s = s.replace("${ta}.", "${}");
       s = s.replace("${ta}", "${}");
       if (dbEncrypted) {

From 42fc41975907274f44bb58bff35f1b1f573f8054 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 20 Apr 2021 22:23:33 +1200
Subject: [PATCH 210/447] #2221 - ebean-redis: bump jedis dependency to 3.6.0

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

diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 01062abf1..573fbcf3b 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <version>3.5.2</version>
+      <version>3.6.0</version>
     </dependency>
 
     <dependency>

From 74c7268d2fc73e439cc661beb6d9312d7758bea2 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 21 Apr 2021 18:57:03 +1200
Subject: [PATCH 211/447] Change such that filterMany can be included in the
 main query.

That is, currently a filterMany automatically marks that path as a fetchQuery path. This change turns that off and the filterMany path and predicates can then be included in the main query.

This is better for performance (to include the filterMany path in with the main query) when the query is a findEach and looking to return a large number of results.
---
 .../io/ebeaninternal/api/SpiExpression.java   |  5 ++
 .../ebeaninternal/api/SpiExpressionList.java  |  5 ++
 .../server/core/OrmQueryRequest.java          |  4 +-
 .../server/expression/AbstractExpression.java |  7 ++-
 .../expression/BetweenPropertyExpression.java | 10 +++-
 .../expression/DefaultExampleExpression.java  |  7 +++
 .../expression/DefaultExpressionList.java     |  7 +++
 .../expression/ExistsQueryExpression.java     |  5 ++
 .../server/expression/IdExpression.java       |  5 ++
 .../server/expression/JunctionExpression.java |  5 ++
 .../server/expression/LogicExpression.java    |  6 +++
 .../NestedPathWrapperExpression.java          |  5 ++
 .../expression/NonPrepareExpression.java      |  5 ++
 .../server/expression/NoopExpression.java     |  5 ++
 .../server/expression/NotExpression.java      |  5 ++
 .../server/querydefn/DefaultOrmQuery.java     |  1 +
 .../server/querydefn/OrmQueryDetail.java      | 45 +++++------------
 .../server/querydefn/OrmQueryProperties.java  | 22 ++++++--
 ...faultServer_createOrmQueryRequestTest.java | 36 ++++++++++++-
 .../org/tests/query/TestQueryFilterMany.java  | 50 +++++++++++--------
 20 files changed, 179 insertions(+), 61 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
index cad22c50a..007e9f29f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -105,4 +105,9 @@ public interface SpiExpression extends Expression {
    * Check for match to a natural key query returning false if it doesn't match.
    */
   boolean naturalKey(NaturalKeyQueryData<?> data);
+
+  /**
+   * Apply property prefix when filterMany expressions included into main query.
+   */
+  void prefixProperty(String path);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java
index 3cf5c2e64..c4764b30f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java
@@ -43,4 +43,9 @@ public interface SpiExpressionList<T> extends ExpressionList<T>, SpiExpression {
   default void applyRowLimits(SpiQuery<?> query) {
     // do nothing by default
   }
+
+  /**
+   * Apply property prefix when filterMany expressions included in main query.
+   */
+  void prefixProperty(String path);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 3ec5deac7..5548c88e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -219,10 +219,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    */
   @Override
   public void prepareQuery() {
+    secondaryQueries = query.convertJoins();
     beanDescriptor.prepareQuery(query);
     adapterPreQuery();
-    this.secondaryQueries = query.convertJoins();
-    this.queryPlanKey = query.prepare(this);
+    queryPlanKey = query.prepare(this);
   }
 
   public boolean isNativeSql() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
index 0ae5cd6fc..c3090e38f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
@@ -16,12 +16,17 @@ import io.ebeaninternal.api.NaturalKeyQueryData;
  */
 public abstract class AbstractExpression implements SpiExpression {
 
-  protected final String propName;
+  protected String propName;
 
   protected AbstractExpression(String propName) {
     this.propName = propName;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    this.propName = path + "." + propName;
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // by default can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
index 798908335..a50ec888f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
@@ -17,8 +17,8 @@ class BetweenPropertyExpression extends NonPrepareExpression {
 
   private static final String BETWEEN = " between ";
 
-  private final String lowProperty;
-  private final String highProperty;
+  private String lowProperty;
+  private String highProperty;
   private final Object value;
 
   BetweenPropertyExpression(String lowProperty, String highProperty, Object value) {
@@ -27,6 +27,12 @@ class BetweenPropertyExpression extends NonPrepareExpression {
     this.value = value;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    this.lowProperty = path + "." + lowProperty;
+    this.highProperty = path + "." + highProperty;
+  }
+
   protected String name(String propName) {
     return propName;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index c6fa5d087..aade99f5a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -88,6 +88,13 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
     }
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    for (SpiExpression exp : list) {
+      exp.prefixProperty(path);
+    }
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index c034b2992..ab80ae9e5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -126,6 +126,13 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     }
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    for (SpiExpression exp : list) {
+      exp.prefixProperty(path);
+    }
+  }
+
   @Override
   public Junction<T> toJunction() {
     return new JunctionExpression<>(Junction.Type.FILTER, this);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 8918bd05d..32ae2bccc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -36,6 +36,11 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
     this.subQuery = null;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    // do nothing
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
index 12910fb37..b5280b868 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
@@ -19,6 +19,11 @@ class IdExpression extends NonPrepareExpression implements SpiExpression {
     this.value = value;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    throw new IllegalStateException("Not allowed?");
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     context.writeId(value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index f048f1163..0aae30886 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -66,6 +66,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     this.exprList = exprList;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    exprList.prefixProperty(path);
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index 0fa0d9b37..482aac6e8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -57,6 +57,12 @@ abstract class LogicExpression implements SpiExpression {
     this.expTwo = (SpiExpression) expTwo;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    expOne.prefixProperty(path);
+    expTwo.prefixProperty(path);
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
index c7f5d193e..77f46828b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
@@ -24,6 +24,11 @@ class NestedPathWrapperExpression implements SpiExpression {
     this.delegate = delegate;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    // do nothing
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java
index 675e641ee..e384bbd1e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java
@@ -9,6 +9,11 @@ import io.ebeaninternal.api.NaturalKeyQueryData;
  */
 abstract class NonPrepareExpression implements SpiExpression {
 
+  @Override
+  public void prefixProperty(String path) {
+    // do nothing
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
index c95c8585b..28c9e3c78 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
@@ -17,6 +17,11 @@ class NoopExpression implements SpiExpression {
 
   protected static final NoopExpression INSTANCE = new NoopExpression();
 
+  @Override
+  public void prefixProperty(String path) {
+    // do nothing
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
index 29535cd95..60ade47b0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
@@ -22,6 +22,11 @@ final class NotExpression implements SpiExpression {
     this.exp = (SpiExpression) exp;
   }
 
+  @Override
+  public void prefixProperty(String path) {
+    exp.prefixProperty(path);
+  }
+
   @Override
   public boolean naturalKey(NaturalKeyQueryData<?> data) {
     // can't use naturalKey cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 867e16dfa..71fe9ff68 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1238,6 +1238,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * Prepare the expressions (compile sub-queries etc).
    */
   private void prepareExpressions(BeanQueryRequest<?> request) {
+    detail.prepareExpressions(request);
     if (whereExpressions != null) {
       whereExpressions.prepareExpression(request);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 6f96fbbea..6646746eb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
 import io.ebean.FetchConfig;
+import io.ebean.event.BeanQueryRequest;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
@@ -9,25 +10,16 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 
 import javax.persistence.PersistenceException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Represents the internal structure of an Object Relational query.
  * <p>
  * Holds the select() and join() details of a ORM query.
- * </p>
  * <p>
  * It is worth noting that for AutoTune a "tuned fetch info" builds an instance of OrmQueryDetail.
  * Tuning a query is a matter of replacing an instance of this class with one that has been tuned
  * with select() and join() set.
- * </p>
  */
 public class OrmQueryDetail implements Serializable {
 
@@ -81,7 +73,6 @@ public class OrmQueryDetail implements Serializable {
    * Return true if equal in terms of autoTune (select and fetch without property ordering).
    */
   public boolean isAutoTuneEqual(OrmQueryDetail otherDetail) {
-
     if (!isSameByAutoTune(baseProps, otherDetail.baseProps)) {
       return false;
     }
@@ -175,9 +166,7 @@ public class OrmQueryDetail implements Serializable {
   }
 
   private List<OrmQueryProperties> removeSecondaryQueries(boolean lazyQuery) {
-
     ArrayList<String> matchingPaths = new ArrayList<>(2);
-
     for (OrmQueryProperties chunk : fetchPaths.values()) {
       boolean match = lazyQuery ? chunk.isLazyFetch() : chunk.isQueryFetch();
       if (match) {
@@ -191,7 +180,6 @@ public class OrmQueryDetail implements Serializable {
 
     // sort into depth order to remove
     Collections.sort(matchingPaths);
-
     // the list of secondary queries
     ArrayList<OrmQueryProperties> props = new ArrayList<>();
 
@@ -225,14 +213,11 @@ public class OrmQueryDetail implements Serializable {
       OrmQueryProperties chunk = getChunk(split[0], true);
       chunk.addSecondaryQueryJoin(split[1]);
     }
-
     return props;
   }
 
   boolean tuneFetchProperties(OrmQueryDetail tunedDetail) {
-
     boolean tuned = false;
-
     OrmQueryProperties tunedRoot = tunedDetail.getChunk(null, false);
     if (tunedRoot != null) {
       tuned = true;
@@ -257,10 +242,7 @@ public class OrmQueryDetail implements Serializable {
   }
 
   /**
-   * Remove all joins and properties.
-   * <p>
-   * Typically for the row count query.
-   * </p>
+   * Remove all joins and properties. Typically for the row count query.
    */
   public void clear() {
     fetchPaths.clear();
@@ -306,7 +288,6 @@ public class OrmQueryDetail implements Serializable {
   }
 
   private void sortFetchPaths(BeanDescriptor<?> d, boolean addIds) {
-
     if (!fetchPaths.isEmpty()) {
       LinkedHashMap<String, OrmQueryProperties> sorted = new LinkedHashMap<>();
       for (OrmQueryProperties p : fetchPaths.values()) {
@@ -317,7 +298,6 @@ public class OrmQueryDetail implements Serializable {
   }
 
   private void sortFetchPaths(BeanDescriptor<?> d, OrmQueryProperties p, LinkedHashMap<String, OrmQueryProperties> sorted, boolean addId) {
-
     String path = p.getPath();
     if (!sorted.containsKey(path)) {
       String parentPath = p.getParentPath();
@@ -339,7 +319,6 @@ public class OrmQueryDetail implements Serializable {
             parentProp = new OrmQueryProperties(parentPath, Collections.emptySet());
           }
         }
-
         sortFetchPaths(d, parentProp, sorted, addId);
         sorted.put(path, p);
       }
@@ -350,14 +329,12 @@ public class OrmQueryDetail implements Serializable {
    * Mark 'fetch joins' to 'many' properties over to 'query joins' where needed.
    */
   void markQueryJoins(BeanDescriptor<?> beanDescriptor, String lazyLoadManyPath, boolean allowOne, boolean addIds) {
-
     if (fetchPaths.isEmpty()) {
       return;
     }
 
     // the name of the many fetch property if there is one
     String manyFetchProperty = null;
-
     // flag that is set once the many fetch property is chosen
     boolean fetchJoinFirstMany = allowOne;
 
@@ -375,6 +352,7 @@ public class OrmQueryDetail implements Serializable {
             // letting the first one remain a 'fetch join'
             fetchJoinFirstMany = false;
             manyFetchProperty = pair.getPath();
+            chunk.filterManyInline();
           } else {
             // convert this one over to a 'query join'
             chunk.markForQueryJoin();
@@ -388,7 +366,6 @@ public class OrmQueryDetail implements Serializable {
    * Sort the fetch entries taking into account fetchPreference on the path.
    */
   private List<FetchEntry> sortByFetchPreference(BeanDescriptor<?> desc) {
-
     List<FetchEntry> entries = new ArrayList<>(fetchPaths.size());
     int idx = 0;
     for (Map.Entry<String, OrmQueryProperties> entry : fetchPaths.entrySet()) {
@@ -452,11 +429,9 @@ public class OrmQueryDetail implements Serializable {
    * </p>
    */
   public void setDefaultSelectClause(BeanDescriptor<?> desc) {
-
     if (desc.hasDefaultSelectClause() && !hasSelectClause()) {
       baseProps = new OrmQueryProperties(null, desc.getDefaultSelectClause());
     }
-
     for (OrmQueryProperties joinProps : fetchPaths.values()) {
       if (!joinProps.hasSelectClause()) {
         BeanDescriptor<?> assocDesc = desc.getBeanDescriptor(joinProps.getPath());
@@ -506,7 +481,6 @@ public class OrmQueryDetail implements Serializable {
       props = new OrmQueryProperties(path);
       fetch(props);
       return props;
-
     } else {
       return props;
     }
@@ -516,9 +490,7 @@ public class OrmQueryDetail implements Serializable {
    * Return true if the fetch path is included.
    */
   public boolean includesPath(String path) {
-
     OrmQueryProperties chunk = fetchPaths.get(path);
-
     // may not have fetch properties if just +cache etc
     return chunk != null && !chunk.isCache();
   }
@@ -537,6 +509,15 @@ public class OrmQueryDetail implements Serializable {
     return fetchPaths.entrySet();
   }
 
+  /**
+   * Prepare filterMany expressions that are being included into the main query.
+   */
+  public void prepareExpressions(BeanQueryRequest<?> request) {
+    for (OrmQueryProperties value : fetchPaths.values()) {
+      value.prepareExpressions(request);
+    }
+  }
+
   private static class FetchEntry implements Comparable<FetchEntry> {
 
     private final int index;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 466bb3eb9..0a8b51465 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -4,6 +4,7 @@ import io.ebean.ExpressionFactory;
 import io.ebean.FetchConfig;
 import io.ebean.OrderBy;
 import io.ebean.Query;
+import io.ebean.event.BeanQueryRequest;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionFactory;
@@ -178,8 +179,6 @@ public class OrmQueryProperties implements Serializable {
       SpiExpressionFactory queryEf = (SpiExpressionFactory) rootQuery.getExpressionFactory();
       ExpressionFactory filterEf = queryEf.createExpressionFactory();// exprPath);
       filterMany = new FilterExpressionList(exprPath, filterEf, rootQuery);
-      // by default we need to make this a 'query join' now
-      markForQueryJoin = true;
     }
     return filterMany;
   }
@@ -194,6 +193,24 @@ public class OrmQueryProperties implements Serializable {
     return filterMany.trimPath(trimPath);
   }
 
+  /**
+   * Adjust filterMany expressions for inclusion in main query.
+   */
+  public void filterManyInline() {
+    if (filterMany != null){
+      filterMany.prefixProperty(path);
+    }
+  }
+
+  /**
+   * Prepare filterMany expressions for query plan key.
+   */
+  public void prepareExpressions(BeanQueryRequest<?> request) {
+    if (filterMany != null) {
+      filterMany.prepareExpression(request);
+    }
+  }
+
   /**
    * Return the filterMany expression list (can be null).
    */
@@ -206,7 +223,6 @@ public class OrmQueryProperties implements Serializable {
    */
   public void setFilterMany(SpiExpressionList<?> filterMany) {
     this.filterMany = filterMany;
-    this.markForQueryJoin = true;
   }
 
   /**
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
index 12c731115..1a5484f16 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
@@ -288,7 +288,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
   }
 
   @Test
-  public void test_removeJoinToMany_when_filterMany() {
+  public void test_filterMany_included() {
 
     Query<Order> query = Ebean.find(Order.class)
       .fetch("details")
@@ -301,6 +301,40 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
     OrmQueryRequest<Order> queryRequest = queryRequest(query);
     OrmQueryDetail detail = queryRequest.getQuery().getDetail();
 
+    assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer");
+  }
+
+  @Test
+  public void test_filterMany_excludedByOrdering() {
+
+    Query<Order> query = Ebean.find(Order.class)
+      .fetch("customer")
+      .fetch("customer.contacts")
+      .fetch("details")
+      .fetch("details.product")
+      .filterMany("details").eq("orderQuantity", 10)
+      .query();
+
+    OrmQueryRequest<Order> queryRequest = queryRequest(query);
+    OrmQueryDetail detail = queryRequest.getQuery().getDetail();
+
+    assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts");
+  }
+
+  @Test
+  public void test_filterMany_excludedExplicitly() {
+
+    Query<Order> query = Ebean.find(Order.class)
+      .fetchQuery("details")
+      .fetch("details.product")
+      .fetch("customer")
+      .fetch("customer.contacts")
+      .filterMany("details").eq("orderQuantity", 10)
+      .query();
+
+    OrmQueryRequest<Order> queryRequest = queryRequest(query);
+    OrmQueryDetail detail = queryRequest.getQuery().getDetail();
+
     assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts");
   }
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
index 976dac580..be58fb8c4 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -172,7 +172,6 @@ public class TestQueryFilterMany extends BaseTestCase {
     LoggedSqlCollector.start();
 
     Query<Customer> query = Ebean.find(Customer.class)
-      .fetch("orders")
       .filterMany("orders").raw("1=0")
       .where().isNotEmpty("orders")
       .query();
@@ -183,12 +182,10 @@ public class TestQueryFilterMany extends BaseTestCase {
     }
 
     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");
+    assertEquals(1, sqlList.size());
+    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id) and 1=0 order by t0.id");
   }
 
-
   @Test
   public void test_filterMany_in_findCount() {
 
@@ -212,7 +209,6 @@ public class TestQueryFilterMany extends BaseTestCase {
   public void test_filterMany_copy_findList() {
 
     ResetBasicData.reset();
-
     LoggedSqlCollector.start();
 
     Query<Customer> query = Ebean.find(Customer.class)
@@ -222,17 +218,35 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     query.copy().findList();
 
+    List<String> sqlList = LoggedSqlCollector.stop();
+    assertEquals(1, sqlList.size());
+    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where t1.status in (?) order by t0.id");
+  }
+
+  @Test
+  public void test_filterMany_fetchQuery() {
+
+    ResetBasicData.reset();
+    LoggedSqlCollector.start();
+
+    Query<Customer> query = Ebean.find(Customer.class)
+      .fetchQuery("orders") // explicitly fetch orders separately
+      .filterMany("orders").in("status", Order.Status.NEW)
+      .order().asc("id");
+
+    query.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");
+    assertThat(sqlList.get(1)).contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where t0.order_date is not null and (t0.kcustomer_id) in ");
+    assertThat(sqlList.get(1)).contains(" and t0.status in ");
   }
 
   @Test
   public void testDisjunction() {
 
     ResetBasicData.reset();
-
     LoggedSqlCollector.start();
 
     Ebean.find(Customer.class)
@@ -243,8 +257,8 @@ public class TestQueryFilterMany extends BaseTestCase {
       .findList();
 
     List<String> sql = LoggedSqlCollector.stop();
-    assertEquals(2, sql.size());
-    assertSql(sql.get(1)).contains("and (t0.status = ? or t0.order_date = ?");
+    assertEquals(1, sql.size());
+    assertSql(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.status = ? or t1.order_date = ?) order by t0.id");
   }
 
   @Test
@@ -259,12 +273,10 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
 
-    assertThat(sql).hasSize(3);
-    assertSql(sql.get(0)).contains(" from o_customer t0; --bind()");
-    platformAssertIn(sql.get(1), " from contact t0 where (t0.customer_id)");
-    assertSql(sql.get(1)).contains(" and t0.first_name is not null");
-    platformAssertIn(sql.get(2), " from contact_note t0 where (t0.contact_id)");
-    assertSql(sql.get(2)).contains(" and lower(t0.title) like");
+    assertThat(sql).hasSize(2);
+    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where t1.first_name is not null order by t0.id; --bind()");
+    platformAssertIn(sql.get(1), " from contact_note t0 where (t0.contact_id)");
+    assertSql(sql.get(1)).contains(" and lower(t0.title) like");
   }
 
   @Test
@@ -280,9 +292,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sql = LoggedSqlCollector.stop();
 
-    assertThat(sql).hasSize(2);
-    assertSql(sql.get(0)).contains(" from o_customer t0");
-    assertSql(sql.get(1)).contains("from contact t0 where ");
-    assertSql(sql.get(1)).contains("and (t0.first_name is not null and lower(t0.email) like ?");
+    assertThat(sql).hasSize(1);
+    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? escape'|' ) order by t0.id; --bind(rob%)");
   }
 }

From d6fdb4ee34129f4b98b35686b822c3c4154d77b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:37:55 +0000
Subject: [PATCH 212/447] Bump commons-io from 2.5 to 2.7 in /ebean-core

Bumps commons-io from 2.5 to 2.7.

Signed-off-by: dependabot[bot] <support@github.com>
---
 ebean-core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index dbde9f167..13732d513 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -282,7 +282,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.5</version>
+      <version>2.7</version>
       <scope>test</scope>
     </dependency>
 

From ad52711fe172e70d5ab2f649f163399f2dc4ce62 Mon Sep 17 00:00:00 2001
From: Brian Payne <bwpayne@gmail.com>
Date: Tue, 11 May 2021 08:52:08 -0700
Subject: [PATCH 213/447] Add test demonstrating soft-delete bug with optional
 relationship

---
 .../org/tests/model/softdelete/ESoftDelX.java | 54 +++++++++++++++++++
 .../org/tests/model/softdelete/ESoftDelY.java | 53 ++++++++++++++++++
 .../org/tests/model/softdelete/ESoftDelZ.java | 43 +++++++++++++++
 .../TestSoftDeleteOptionalRelationship.java   | 31 +++++++++++
 4 files changed, 181 insertions(+)
 create mode 100644 ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java

diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java
new file mode 100644
index 000000000..fbc3f9964
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java
@@ -0,0 +1,54 @@
+package org.tests.model.softdelete;
+
+import io.ebean.annotation.SoftDelete;
+
+import javax.persistence.*;
+import java.util.UUID;
+
+@Entity
+public class ESoftDelX {
+
+  @Id
+  private UUID id;
+
+  @OneToOne
+  private ESoftDelY y;
+
+  @ManyToOne
+  private ESoftDelZ organization;
+
+  @SoftDelete
+  boolean deleted;
+
+  public UUID getId() {
+    return id;
+  }
+
+  public void setId(UUID id) {
+    this.id = id;
+  }
+
+  public ESoftDelY getY() {
+    return y;
+  }
+
+  public void setY(ESoftDelY y) {
+    this.y = y;
+  }
+
+  public ESoftDelZ getOrganization() {
+    return organization;
+  }
+
+  public void setOrganization(ESoftDelZ organization) {
+    this.organization = organization;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java
new file mode 100644
index 000000000..a65cc75c1
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java
@@ -0,0 +1,53 @@
+package org.tests.model.softdelete;
+
+import io.ebean.annotation.SoftDelete;
+
+import javax.persistence.*;
+
+@Entity
+public class ESoftDelY {
+
+  @Id
+  private Long id;
+
+  @ManyToOne
+  private ESoftDelZ organization;
+
+  @OneToOne(mappedBy = "y")
+  private ESoftDelX x;
+
+  @SoftDelete
+  boolean deleted;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public ESoftDelZ getOrganization() {
+    return organization;
+  }
+
+  public void setOrganization(ESoftDelZ organization) {
+    this.organization = organization;
+  }
+
+  public ESoftDelX getX() {
+    return x;
+  }
+
+  public void setX(ESoftDelX x) {
+    this.x = x;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java b/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java
new file mode 100644
index 000000000..5ce11c175
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java
@@ -0,0 +1,43 @@
+package org.tests.model.softdelete;
+
+import io.ebean.annotation.SoftDelete;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.UUID;
+
+@Entity
+public class ESoftDelZ {
+
+  @Id
+  private Long id;
+
+  @SoftDelete
+  private boolean deleted;
+
+  private UUID uuid;
+
+  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 UUID getUuid() {
+    return uuid;
+  }
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
index fc925f62c..2488060d4 100644
--- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
+++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
@@ -1,9 +1,15 @@
 package org.tests.softdelete;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.tests.model.softdelete.ESoftDelMid;
+import io.ebean.Finder;
 import org.junit.Test;
+import org.tests.model.softdelete.ESoftDelY;
+import org.tests.model.softdelete.ESoftDelZ;
+
+import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,5 +30,30 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase {
     assertThat(bean.getTop()).isNull();
   }
 
+  @Test
+  public void testFindNullWhenMultiple() {
+    UUID uuid = UUID.randomUUID();
+    {
+      ESoftDelZ z = new ESoftDelZ();
+      z.setUuid(uuid);
+      DB.save(z);
+
+      ESoftDelY y = new ESoftDelY();
+      y.setOrganization(z);
+      y.setX(null);
+      DB.save(y);
+    }
+
+    Finder<Long, ESoftDelY> finder = new Finder<>(ESoftDelY.class);
+    ESoftDelY bean = finder
+      .query()
+      .where()
+      .eq("organization.uuid", uuid)
+      .isNull("x")
+      .findOne();
+
+    assertThat(bean).isNotNull();
+  }
+
 
 }

From 66f7f69ec70bc301d8effb18f01185b817064fdd Mon Sep 17 00:00:00 2001
From: Brian Payne <bwpayne@gmail.com>
Date: Wed, 12 May 2021 09:24:33 -0700
Subject: [PATCH 214/447] Fixed bug with soft-delete on one-to-one exported

---
 .../server/query/SqlTreeNodeExtraJoin.java            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 074457a30..7238224d7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -5,6 +5,7 @@ import io.ebean.bean.EntityBean;
 import io.ebean.core.type.ScalarType;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.TableJoin;
@@ -130,11 +131,19 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
       }
     }
 
+    boolean oneToOneExported = false;
+    if (assocBeanProperty instanceof BeanPropertyAssocOne) {
+      BeanPropertyAssocOne<?> oneToOneProp = (BeanPropertyAssocOne<?>) assocBeanProperty;
+      if (oneToOneProp.isOneToOneExported()) {
+        oneToOneExported = true;
+      }
+    }
+
     if (pathContainsMany) {
       // "promote" to left join as the path contains a many
       joinType = SqlJoinType.OUTER;
     }
-    if (!manyToMany) {
+    if (!manyToMany && !oneToOneExported) {
       if (assocBeanProperty.isFormula()) {
         // add joins for formula beans
         assocBeanProperty.appendFrom(ctx, joinType);

From eb00690b3034b970d4e7a1778d61eb0c305c82aa Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 20 May 2021 14:09:22 +1200
Subject: [PATCH 215/447] #2231 - Change OrderBy to not be final to support
 mocking via Mockito

---
 ebean-api/src/main/java/io/ebean/OrderBy.java | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/OrderBy.java b/ebean-api/src/main/java/io/ebean/OrderBy.java
index 820a76314..8b39fc19e 100644
--- a/ebean-api/src/main/java/io/ebean/OrderBy.java
+++ b/ebean-api/src/main/java/io/ebean/OrderBy.java
@@ -16,7 +16,7 @@ import java.util.Objects;
  * on the Query object.
  * </p>
  */
-public final class OrderBy<T> implements Serializable {
+public class OrderBy<T> implements Serializable {
 
   private static final long serialVersionUID = 9157089257745730539L;
 
@@ -69,7 +69,6 @@ public final class OrderBy<T> implements Serializable {
    * Add a property with ascending order to this OrderBy.
    */
   public Query<T> asc(String propertyName) {
-
     list.add(new Property(propertyName, true));
     return query;
   }
@@ -98,7 +97,6 @@ public final class OrderBy<T> implements Serializable {
     return query;
   }
 
-
   /**
    * Return true if the property is known to be contained in the order by clause.
    */
@@ -207,7 +205,6 @@ public final class OrderBy<T> implements Serializable {
     if (!(obj instanceof OrderBy<?>)) {
       return false;
     }
-
     OrderBy<?> e = (OrderBy<?>) obj;
     return e.list.equals(list);
   }
@@ -249,7 +246,7 @@ public final class OrderBy<T> implements Serializable {
   /**
    * A property and its ascending descending order.
    */
-  public static final class Property implements Serializable {
+  public static class Property implements Serializable {
 
     private static final long serialVersionUID = 1546009780322478077L;
 
@@ -415,13 +412,10 @@ public final class OrderBy<T> implements Serializable {
   }
 
   private void parse(String orderByClause) {
-
     if (orderByClause == null) {
       return;
     }
-
-    String[] chunks = orderByClause.split(",");
-    for (String chunk : chunks) {
+    for (String chunk : orderByClause.split(",")) {
       Property p = parseProperty(chunk);
       if (p != null) {
         list.add(p);
@@ -467,8 +461,7 @@ public final class OrderBy<T> implements Serializable {
     if (s.startsWith("desc")) {
       return false;
     }
-    String m = "Expecting [" + s + "] to be asc or desc?";
-    throw new RuntimeException(m);
+    throw new RuntimeException("Expecting [" + s + "] to be asc or desc?");
   }
 
   private boolean isEmptyString(String s) {

From b17593ba3cbf4a2c70967fbf0a93568607d10961 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 20 May 2021 21:44:07 +1200
Subject: [PATCH 216/447] No effective change - tidy BeanList, BeanMap, BeanSet
 internals

---
 ebean-api/src/main/java/io/ebean/common/BeanList.java | 3 +--
 ebean-api/src/main/java/io/ebean/common/BeanMap.java  | 1 -
 ebean-api/src/main/java/io/ebean/common/BeanSet.java  | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/common/BeanList.java b/ebean-api/src/main/java/io/ebean/common/BeanList.java
index 0aa774a81..ba0adca99 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanList.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanList.java
@@ -198,10 +198,9 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
     }
     if (list == null) {
       sb.append("deferred ");
-
     } else {
       sb.append("size[").append(list.size()).append("] ");
-      sb.append("list").append(list).append("");
+      sb.append("list").append(list);
     }
     return sb.toString();
   }
diff --git a/ebean-api/src/main/java/io/ebean/common/BeanMap.java b/ebean-api/src/main/java/io/ebean/common/BeanMap.java
index 09b37d38a..2b9ef350d 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanMap.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanMap.java
@@ -194,7 +194,6 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     }
     if (map == null) {
       sb.append("deferred ");
-
     } else {
       sb.append("size[").append(map.size()).append("]");
       sb.append(" map").append(map);
diff --git a/ebean-api/src/main/java/io/ebean/common/BeanSet.java b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
index 880ece106..0c6f0c508 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanSet.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
@@ -176,7 +176,6 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     }
     if (set == null) {
       sb.append("deferred ");
-
     } else {
       sb.append("size[").append(set.size()).append("]");
       sb.append(" set").append(set);

From 538361d5fd7bf1d6de80fa626803865ff14d0d6d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 21 May 2021 08:33:31 +1200
Subject: [PATCH 217/447] #2233 Failing test

---
 .../org/tests/lazyloadconf/AppConfig.java     | 36 +++++++
 .../tests/lazyloadconf/AppConfigControl.java  | 42 ++++++++
 .../java/org/tests/lazyloadconf/MyTest.java   | 97 +++++++++++++++++++
 .../org/tests/lazyloadconf/Relationship.java  | 35 +++++++
 4 files changed, 210 insertions(+)
 create mode 100644 ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java
 create mode 100644 ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java
 create mode 100644 ebean-core/src/test/java/org/tests/lazyloadconf/MyTest.java
 create mode 100644 ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java

diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java b/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java
new file mode 100644
index 000000000..999ef1aa0
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java
@@ -0,0 +1,36 @@
+package org.tests.lazyloadconf;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Cache
+@Table(name = "app_config")
+public class AppConfig {
+
+  @Id
+  @Column(name = "id")
+  private Integer id;
+
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "appConfig")
+  //@JoinColumn(name = "id", referencedColumnName = "id")
+  private List<AppConfigControl> items;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public List<AppConfigControl> getItems() {
+    return items;
+  }
+
+  public void setItems(List<AppConfigControl> items) {
+    this.items = items;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java b/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java
new file mode 100644
index 000000000..8da38cd59
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java
@@ -0,0 +1,42 @@
+package org.tests.lazyloadconf;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "app_config_control")
+public class AppConfigControl {
+
+  @Id
+  private Integer id;
+
+  private String name;
+
+  @ManyToOne
+  @JoinColumn(name = "config_id", referencedColumnName = "id")
+  private AppConfig appConfig;
+
+  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 AppConfig getAppConfig() {
+    return appConfig;
+  }
+
+  public void setAppConfig(AppConfig appConfig) {
+    this.appConfig = appConfig;
+  }
+}
+
diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/MyTest.java b/ebean-core/src/test/java/org/tests/lazyloadconf/MyTest.java
new file mode 100644
index 000000000..34ec36ea7
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/lazyloadconf/MyTest.java
@@ -0,0 +1,97 @@
+package org.tests.lazyloadconf;
+
+import io.ebean.Ebean;
+import io.ebean.Query;
+import org.junit.Test;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MyTest {
+
+  @Test
+  public void testRe() {
+
+    AppConfig globalAppConfig = new AppConfig();
+    globalAppConfig.setId(1);
+    globalAppConfig.setItems(new ArrayList<>());
+    AppConfigControl global = new AppConfigControl();
+    global.setId(1);
+    global.setName("global");
+    global.setAppConfig(globalAppConfig);
+    globalAppConfig.getItems().add(global);
+    Ebean.save(globalAppConfig);
+
+    AppConfig userAppConfig = new AppConfig();
+    userAppConfig.setId(2);
+    userAppConfig.setItems(new ArrayList<>());
+    AppConfigControl user = new AppConfigControl();
+    user.setId(2);
+    user.setName("user");
+    user.setAppConfig(userAppConfig);
+    userAppConfig.getItems().add(user);
+    Ebean.save(userAppConfig);
+
+    AppConfig otherAppConfig = new AppConfig();
+    otherAppConfig.setId(3);
+    otherAppConfig.setItems(new ArrayList<>());
+    Ebean.save(otherAppConfig);
+
+    Relationship globalRe = new Relationship();
+    globalRe.setId(1);
+    globalRe.setAppConfig(globalAppConfig);
+    Ebean.save(globalRe);
+
+    Relationship userRe = new Relationship();
+    userRe.setId(2);
+    userRe.setAppConfig(userAppConfig);
+    Ebean.save(userRe);
+
+    Relationship otherRe = new Relationship();
+    otherRe.setId(3);
+    otherRe.setAppConfig(otherAppConfig);
+    Ebean.save(otherRe);
+
+
+
+// Start business processing
+    Query<Relationship> relationshipQuery = Ebean.find(Relationship.class);
+    List<Relationship> relationshipList = relationshipQuery.where().idIn(1, 2, 3).findList();
+
+    assertThat(relationshipList.size()).isEqualTo(3);
+
+    Map<Integer, AppConfig> map = relationshipList.stream()
+      .map(Relationship::getAppConfig)
+      .map((ac) -> new AbstractMap.SimpleImmutableEntry<>(ac.getId(), ac))
+      .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+//    final List<AppConfig> items = DB.find(AppConfig.class)
+//      .fetch("items")
+//      .findList();
+
+    AppConfig g = map.get(1);
+    AppConfig u = map.get(2);
+    AppConfig o = map.get(3);
+    if(!u.getItems().isEmpty()){
+      g.setItems(u.getItems());
+    }
+
+    assertThat(g.getItems().size()).isEqualTo(1);
+
+// If this line of code is commented out, this test case will be successfully passed
+    assertThat(o.getItems().size()).isEqualTo(0);
+
+// org.junit.ComparisonFailure:
+// Expected :1
+// Actual :2
+    assertThat(g.getItems().size()).isEqualTo(1);
+
+    assertThat(g.getItems().get(0).getName()).isEqualTo("user");
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java b/ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java
new file mode 100644
index 000000000..f59e7677a
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java
@@ -0,0 +1,35 @@
+package org.tests.lazyloadconf;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.*;
+
+@Entity
+@Cache(enableBeanCache = true)
+@Table(name="app_config_re")
+public class Relationship {
+
+  @Id
+  private Integer id;
+
+  @ManyToOne
+  @JoinColumn(name="config_id",referencedColumnName="id")
+  private AppConfig appConfig;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public AppConfig getAppConfig() {
+    return appConfig;
+  }
+
+  public void setAppConfig(AppConfig appConfig) {
+    this.appConfig = appConfig;
+  }
+}
+

From 77c6f1cb9f97773abd41b13cc4eef950aef608b3 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 21 May 2021 08:44:04 +1200
Subject: [PATCH 218/447] #2233 Tidy failing test Ebean -> DB and rename test

---
 ...ava => BeanCollectionLazyLoadingTest.java} | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)
 rename ebean-core/src/test/java/org/tests/lazyloadconf/{MyTest.java => BeanCollectionLazyLoadingTest.java} (75%)

diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/MyTest.java b/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java
similarity index 75%
rename from ebean-core/src/test/java/org/tests/lazyloadconf/MyTest.java
rename to ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java
index 34ec36ea7..b0ef7592b 100644
--- a/ebean-core/src/test/java/org/tests/lazyloadconf/MyTest.java
+++ b/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java
@@ -1,6 +1,6 @@
 package org.tests.lazyloadconf;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.Test;
 
@@ -12,10 +12,10 @@ import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MyTest {
+public class BeanCollectionLazyLoadingTest {
 
   @Test
-  public void testRe() {
+  public void test() {
 
     AppConfig globalAppConfig = new AppConfig();
     globalAppConfig.setId(1);
@@ -25,7 +25,7 @@ public class MyTest {
     global.setName("global");
     global.setAppConfig(globalAppConfig);
     globalAppConfig.getItems().add(global);
-    Ebean.save(globalAppConfig);
+    DB.save(globalAppConfig);
 
     AppConfig userAppConfig = new AppConfig();
     userAppConfig.setId(2);
@@ -35,32 +35,31 @@ public class MyTest {
     user.setName("user");
     user.setAppConfig(userAppConfig);
     userAppConfig.getItems().add(user);
-    Ebean.save(userAppConfig);
+    DB.save(userAppConfig);
 
     AppConfig otherAppConfig = new AppConfig();
     otherAppConfig.setId(3);
     otherAppConfig.setItems(new ArrayList<>());
-    Ebean.save(otherAppConfig);
+    DB.save(otherAppConfig);
 
     Relationship globalRe = new Relationship();
     globalRe.setId(1);
     globalRe.setAppConfig(globalAppConfig);
-    Ebean.save(globalRe);
+    DB.save(globalRe);
 
     Relationship userRe = new Relationship();
     userRe.setId(2);
     userRe.setAppConfig(userAppConfig);
-    Ebean.save(userRe);
+    DB.save(userRe);
 
     Relationship otherRe = new Relationship();
     otherRe.setId(3);
     otherRe.setAppConfig(otherAppConfig);
-    Ebean.save(otherRe);
+    DB.save(otherRe);
 
 
-
-// Start business processing
-    Query<Relationship> relationshipQuery = Ebean.find(Relationship.class);
+    // Start business processing
+    Query<Relationship> relationshipQuery = DB.find(Relationship.class);
     List<Relationship> relationshipList = relationshipQuery.where().idIn(1, 2, 3).findList();
 
     assertThat(relationshipList.size()).isEqualTo(3);
@@ -70,25 +69,21 @@ public class MyTest {
       .map((ac) -> new AbstractMap.SimpleImmutableEntry<>(ac.getId(), ac))
       .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
-//    final List<AppConfig> items = DB.find(AppConfig.class)
-//      .fetch("items")
-//      .findList();
-
     AppConfig g = map.get(1);
     AppConfig u = map.get(2);
     AppConfig o = map.get(3);
-    if(!u.getItems().isEmpty()){
+    if (!u.getItems().isEmpty()) {
+      // a source of the problem came from invoking lazy loading here
+      // with the setItems call which is unnecessary due to being a ToMany
       g.setItems(u.getItems());
     }
 
     assertThat(g.getItems().size()).isEqualTo(1);
 
-// If this line of code is commented out, this test case will be successfully passed
+    // If this line of code is commented out, this test case will be successfully passed
     assertThat(o.getItems().size()).isEqualTo(0);
 
-// org.junit.ComparisonFailure:
-// Expected :1
-// Actual :2
+    // org.junit.ComparisonFailure: Expected :1 Actual :2
     assertThat(g.getItems().size()).isEqualTo(1);
 
     assertThat(g.getItems().get(0).getName()).isEqualTo("user");

From 79740accfa688d14988ee6ffe3f21276a8126e33 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 21 May 2021 08:48:42 +1200
Subject: [PATCH 219/447] #2233 Fix with setter on ToMany now not invoking lazy
 loading

- ebean-agent changed to not invoke preGetter on ToMany (just like Id)
- EntityBeanIntercept preSetterMany() changed to ensure loading flag set
---
 .../src/main/java/io/ebean/bean/EntityBeanIntercept.java  | 8 +++++++-
 ebean-bom/pom.xml                                         | 4 ++--
 ebean-core/pom.xml                                        | 2 +-
 ebean-ddl-generator/pom.xml                               | 2 +-
 kotlin-querybean-generator/pom.xml                        | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 12f3fda8f..0c2333026 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -85,6 +85,8 @@ public final class EntityBeanIntercept implements Serializable {
    */
   private static final byte FLAG_CHANGED_PROP = 2;
 
+  private static final byte FLAG_CHANGEDLOADED_PROP = 3;
+
   /**
    * Flags indicating if a property is a dirty embedded bean. Used to distinguish
    * between an embedded bean being completely overwritten and one of its
@@ -569,6 +571,10 @@ public final class EntityBeanIntercept implements Serializable {
     flags[propertyIndex] |= FLAG_CHANGED_PROP;
   }
 
+  private void setChangeLoaded(int propertyIndex) {
+    flags[propertyIndex] |= FLAG_CHANGEDLOADED_PROP;
+  }
+
   /**
    * Set that an embedded bean has had one of its properties changed.
    */
@@ -937,7 +943,7 @@ public final class EntityBeanIntercept implements Serializable {
       if (readOnly) {
         throw new IllegalStateException("This bean is readOnly");
       }
-      setChangedProperty(propertyIndex);
+      setChangeLoaded(propertyIndex);
     }
   }
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index aaa2b5961..edc2708cf 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,8 +18,8 @@
     <ebean-migration.version>12.4.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.8.2</ebean-agent.version>
-    <ebean-maven-plugin.version>12.8.2</ebean-maven-plugin.version>
+    <ebean-agent.version>12.8.4</ebean-agent.version>
+    <ebean-maven-plugin.version>12.8.4</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 13732d513..559d763ac 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.4</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index f94924830..0c5089130 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.4</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index a556671bb..99433a038 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -146,7 +146,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.2</version>
+        <version>12.8.4</version>
         <executions>
           <execution>
             <id>test</id>

From 676bac390ea018b895903bfaee026e57808cf9ee Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 21 May 2021 09:01:45 +1200
Subject: [PATCH 220/447] #2233 Followup change that unsets load buffer from
 BeanCollection

- Clears the buffer after it has been used to load BeanCollection's
- Sets the BeanCollection to use the server rather than the Load Buffer just in case there are subsequent calls for loading (which there should not be)
---
 .../io/ebeaninternal/api/LoadManyRequest.java     | 15 +++------------
 .../server/loadcontext/DLoadManyContext.java      |  9 ++++-----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index d7dc2f56a..aeb9ff7dd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -71,7 +71,6 @@ public class LoadManyRequest extends LoadRequest {
    * This for use when lazy loading is invoked on methods such as clear() and removeAll() where it
    * generally makes sense to only fetch the Id values as the other property information is not
    * used.
-   * </p>
    */
   private boolean isOnlyIds() {
     return onlyIds;
@@ -91,18 +90,16 @@ public class LoadManyRequest extends LoadRequest {
     return loadContext.getBatchSize();
   }
 
-  private List<Object> getParentIdList() {
-
+  private List<Object> parentIdList(SpiEbeanServer server) {
     List<Object> idList = new ArrayList<>();
-
     BeanPropertyAssocMany<?> many = getMany();
     for (BeanCollection<?> bc : batch) {
       idList.add(many.getParentId(bc.getOwnerBean()));
+      bc.setLoader(server); // don't use the load buffer again
     }
     if (many.getTargetDescriptor().isPadInExpression()) {
       BindPadding.padIds(idList);
     }
-
     return idList;
   }
 
@@ -111,9 +108,7 @@ public class LoadManyRequest extends LoadRequest {
   }
 
   public SpiQuery<?> createQuery(SpiEbeanServer server) {
-
     BeanPropertyAssocMany<?> many = getMany();
-
     SpiQuery<?> query = many.newQuery(server);
     String orderBy = many.getLazyFetchOrderBy();
     if (orderBy != null) {
@@ -128,7 +123,7 @@ public class LoadManyRequest extends LoadRequest {
     }
 
     query.setLazyLoadForParents(many);
-    many.addWhereParentIdIn(query, getParentIdList(), loadContext.isUseDocStore());
+    many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore());
     query.setPersistenceContext(loadContext.getPersistenceContext());
 
     String mode = isLazy() ? "+lazy" : "+query";
@@ -146,7 +141,6 @@ public class LoadManyRequest extends LoadRequest {
       // override to just select the Id values
       query.select(many.getTargetIdProperty());
     }
-
     return query;
   }
 
@@ -154,10 +148,8 @@ public class LoadManyRequest extends LoadRequest {
    * After the query execution check for empty collections and load L2 cache if desired.
    */
   public void postLoad() {
-
     BeanDescriptor<?> desc = loadContext.getBeanDescriptor();
     BeanPropertyAssocMany<?> many = getMany();
-
     // check for BeanCollection's that where never processed
     // in the +query or +lazy load due to no rows (predicates)
     for (BeanCollection<?> bc : batch) {
@@ -172,6 +164,5 @@ public class LoadManyRequest extends LoadRequest {
         desc.cacheManyPropPut(many, bc, parentId);
       }
     }
-
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index 5035f0802..5d2b781c7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -201,7 +201,6 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
 
     @Override
     public void loadMany(BeanCollection<?> bc, boolean onlyIds) {
-
       lock.lock();
       try {
         boolean useCache = !onlyIds && context.hitCache && context.property.isUseCache();
@@ -215,6 +214,7 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
               // find it using instance equality - avoiding equals() and potential deadlock issue
               if (list.get(i) == bc) {
                 list.remove(i);
+                bc.setLoader(context.parent.getEbeanServer());
                 return;
               }
             }
@@ -222,10 +222,9 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
           }
         }
 
-        // Should reduce the list by checking each beanCollection in the L2 first before executing the query
-
-        LoadManyRequest req = new LoadManyRequest(this, onlyIds, useCache);
-        context.parent.getEbeanServer().loadMany(req);
+        context.parent.getEbeanServer().loadMany(new LoadManyRequest(this, onlyIds, useCache));
+        // clear the buffer as all entries have been loaded
+        list.clear();
       } finally {
         lock.unlock();
       }

From 643b0499c44c9ec9b2215fdb83349d262ead8208 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 21 May 2021 16:09:15 +1200
Subject: [PATCH 221/447] #2233 Add ebean-version.mf so ebean-agent can sniff
 the internal version

This allows the ebean-agent to support the older behaviour. Devs using the latest IntelliJ ebean plugin will get the old behaviour unless they bump ebean-core to 12.9 or later.
---
 ebean-core/src/main/resources/META-INF/ebean-version.mf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ebean-core/src/main/resources/META-INF/ebean-version.mf

diff --git a/ebean-core/src/main/resources/META-INF/ebean-version.mf b/ebean-core/src/main/resources/META-INF/ebean-version.mf
new file mode 100644
index 000000000..6bcacf1d6
--- /dev/null
+++ b/ebean-core/src/main/resources/META-INF/ebean-version.mf
@@ -0,0 +1 @@
+ebean-version: 129

From 0da86a82ae74dd2f90c045fb1c842cf1d18ecae4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 21 May 2021 17:14:49 +1200
Subject: [PATCH 222/447] #2233 Bump to ebean-agent 12.9.0

---
 ebean-bom/pom.xml                  | 4 ++--
 ebean-core/pom.xml                 | 2 +-
 ebean-ddl-generator/pom.xml        | 2 +-
 kotlin-querybean-generator/pom.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index edc2708cf..6109effa9 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,8 +18,8 @@
     <ebean-migration.version>12.4.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.8.4</ebean-agent.version>
-    <ebean-maven-plugin.version>12.8.4</ebean-maven-plugin.version>
+    <ebean-agent.version>12.9.0</ebean-agent.version>
+    <ebean-maven-plugin.version>12.9.0</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 559d763ac..624e91c91 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.4</version>
+        <version>12.9.0</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 0c5089130..d063c222c 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.4</version>
+        <version>12.9.0</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 99433a038..e7967307e 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -146,7 +146,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.8.4</version>
+        <version>12.9.0</version>
         <executions>
           <execution>
             <id>test</id>

From 2a6108087ca01e5ba8ae192c2912cfe1c43ead83 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 21 May 2021 17:18:30 +1200
Subject: [PATCH 223/447] Bump version to 12.9.0-SNAPSHOT

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  4 ++--
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 |  8 ++++----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  |  8 ++++----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  2 +-
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 380438cc2..10e919049 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 590680c8a..1c7d48b4e 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 6109effa9..dc1478d34 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.8.4-SNAPSHOT</version>
+        <version>12.9.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 04497471c..e6589d839 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 624e91c91..16e400f91 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index d063c222c..6b16e9b2a 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 079eebec9..57372b097 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index bcf9f10ff..0fb961ac4 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 4e1b6063b..e000db688 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index ff6dd8754..57b01e349 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 573fbcf3b..c500e7508 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index c3ed1f57f..94cba52d6 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index ba312953f..d284c0bda 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index e7967307e..a475fdcc4 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.4-SNAPSHOT</version>
+      <version>12.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index fb82113fa..14f2e3f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.8.4-SNAPSHOT</version>
+  <version>12.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 1ea632096..d5d769ac4 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.8.4-SNAPSHOT</version>
+    <version>12.9.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 3c4d600187c2443016e56635d0b8afb7a6a1db39 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 23 May 2021 17:17:34 +1200
Subject: [PATCH 224/447] #2223 #2224 Support BeanMap modification via
 entrySet() and keySet()

---
 .../main/java/io/ebean/common/BeanMap.java    |  20 +-
 .../io/ebean/common/ModifyCollection.java     |   2 +-
 .../java/io/ebean/common/ModifyEntrySet.java  | 131 +++++++++
 .../java/io/ebean/common/ModifyKeySet.java    | 126 +++++++++
 .../main/java/io/ebean/common/ModifySet.java  |  24 --
 .../java/io/ebean/common/BeanMapTest.java     | 265 +++++++++++++++++-
 .../model/map/BeanMapOrphanRemovalTest.java   |  50 ++++
 .../test/java/org/tests/model/map/MpUser.java |  12 +-
 8 files changed, 572 insertions(+), 58 deletions(-)
 create mode 100644 ebean-api/src/main/java/io/ebean/common/ModifyEntrySet.java
 create mode 100644 ebean-api/src/main/java/io/ebean/common/ModifyKeySet.java
 delete mode 100644 ebean-api/src/main/java/io/ebean/common/ModifySet.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java

diff --git a/ebean-api/src/main/java/io/ebean/common/BeanMap.java b/ebean-api/src/main/java/io/ebean/common/BeanMap.java
index 2b9ef350d..643febc14 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanMap.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanMap.java
@@ -175,10 +175,6 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
 
   /**
    * Returns the map entrySet.
-   * <p>
-   * This is because the key values may need to be set against the details (so
-   * they don't need to be set twice).
-   * </p>
    */
   @Override
   public Collection<?> getActualEntries() {
@@ -242,17 +238,12 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   @Override
-  @SuppressWarnings({"unchecked"})
   public Set<Entry<K, E>> entrySet() {
     init();
     if (isReadOnly()) {
       return Collections.unmodifiableSet(map.entrySet());
     }
-    if (modifyListening) {
-      Set<Entry<K, E>> s = map.entrySet();
-      return new ModifySet(this, s);
-    }
-    return map.entrySet();
+    return modifyListening ? new ModifyEntrySet<>(this, map.entrySet()) : map.entrySet();
   }
 
   @Override
@@ -273,8 +264,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     if (isReadOnly()) {
       return Collections.unmodifiableSet(map.keySet());
     }
-    // we don't really care about modifications to the ketSet?
-    return map.keySet();
+    return modifyListening ? new ModifyKeySet<>(this, map.keySet()) : map.keySet();
   }
 
   @Override
@@ -345,11 +335,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     if (isReadOnly()) {
       return Collections.unmodifiableCollection(map.values());
     }
-    if (modifyListening) {
-      Collection<E> c = map.values();
-      return new ModifyCollection<>(this, c);
-    }
-    return map.values();
+    return modifyListening ? new ModifyCollection<>(this, map.values()) : map.values();
   }
 
   @Override
diff --git a/ebean-api/src/main/java/io/ebean/common/ModifyCollection.java b/ebean-api/src/main/java/io/ebean/common/ModifyCollection.java
index 05b203a2f..48f703ba8 100644
--- a/ebean-api/src/main/java/io/ebean/common/ModifyCollection.java
+++ b/ebean-api/src/main/java/io/ebean/common/ModifyCollection.java
@@ -25,7 +25,7 @@ class ModifyCollection<E> implements Collection<E> {
    * The owner is notified of the additions and removals.
    * </p>
    */
-  public ModifyCollection(BeanCollection<E> owner, Collection<E> c) {
+  ModifyCollection(BeanCollection<E> owner, Collection<E> c) {
     this.owner = owner;
     this.c = c;
   }
diff --git a/ebean-api/src/main/java/io/ebean/common/ModifyEntrySet.java b/ebean-api/src/main/java/io/ebean/common/ModifyEntrySet.java
new file mode 100644
index 000000000..174863a74
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/common/ModifyEntrySet.java
@@ -0,0 +1,131 @@
+package io.ebean.common;
+
+import java.util.*;
+
+/**
+ * Handles the Entry Set for BeanMap.
+ */
+class ModifyEntrySet<K, E> implements Set<Map.Entry<K, E>> {
+
+  private final BeanMap<K, E> owner;
+  private final Set<Map.Entry<K, E>> entrySet;
+
+  ModifyEntrySet(BeanMap<K, E> owner, Set<Map.Entry<K, E>> entrySet) {
+    this.owner = owner;
+    this.entrySet = entrySet;
+  }
+
+  @Override
+  public int size() {
+    return entrySet.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return entrySet.isEmpty();
+  }
+
+  @Override
+  public boolean contains(Object o) {
+    return entrySet.contains(o);
+  }
+
+  @Override
+  public Object[] toArray() {
+    return entrySet.toArray();
+  }
+
+  @Override
+  public <T> T[] toArray(T[] a) {
+    return entrySet.toArray(a);
+  }
+
+  @Override
+  public boolean containsAll(Collection<?> entries) {
+    return entrySet.containsAll(entries);
+  }
+
+  @Override
+  public void clear() {
+    owner.clear();
+  }
+
+  @Override
+  public boolean add(Map.Entry<K, E> entry) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends Map.Entry<K, E>> c) {
+    throw new UnsupportedOperationException();
+  }
+
+  @SuppressWarnings("rawtypes")
+  @Override
+  public boolean remove(Object o) {
+    if (o instanceof Map.Entry) {
+      Map.Entry entry = (Map.Entry) o;
+      final E val = owner.get(entry.getKey());
+      if (Objects.equals(val, entry.getValue())) {
+        owner.remove(entry.getKey());
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public boolean retainAll(Collection<?> entries) {
+    boolean modified = false;
+    final Iterator<Map.Entry<K, E>> it = iterator();
+    while (it.hasNext()) {
+      if (!entries.contains(it.next())) {
+        it.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+
+  @Override
+  public boolean removeAll(Collection<?> entries) {
+    boolean modified = false;
+    for (Object entry : entries) {
+      modified |= remove(entry);
+    }
+    return modified;
+  }
+
+  @Override
+  public Iterator<Map.Entry<K, E>> iterator() {
+    return new EntrySetIterator(new ArrayList<>(entrySet).iterator());
+  }
+
+  class EntrySetIterator implements Iterator<Map.Entry<K, E>> {
+
+    private final Iterator<Map.Entry<K, E>> iterator;
+    private Map.Entry<K, E> entry;
+
+    EntrySetIterator(Iterator<Map.Entry<K, E>> iterator) {
+      this.iterator = iterator;
+    }
+
+    @Override
+    public boolean hasNext() {
+      return iterator.hasNext();
+    }
+
+    @Override
+    public Map.Entry<K, E> next() {
+      entry = iterator.next();
+      return entry;
+    }
+
+    @Override
+    public void remove() {
+      owner.remove(entry.getKey());
+      iterator.remove();
+    }
+  }
+
+}
diff --git a/ebean-api/src/main/java/io/ebean/common/ModifyKeySet.java b/ebean-api/src/main/java/io/ebean/common/ModifyKeySet.java
new file mode 100644
index 000000000..e9f829b9b
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/common/ModifyKeySet.java
@@ -0,0 +1,126 @@
+package io.ebean.common;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * Handle the Key Set for BeanMap.
+ */
+class ModifyKeySet<E> implements Set<E> {
+
+  private final Set<E> keySet;
+  private final BeanMap<E, ?> owner;
+
+  ModifyKeySet(BeanMap<E, ?> owner, Set<E> keySet) {
+    this.owner = owner;
+    this.keySet = keySet;
+  }
+
+  @Override
+  public int size() {
+    return keySet.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return keySet.isEmpty();
+  }
+
+  @Override
+  public boolean contains(Object o) {
+    return keySet.contains(o);
+  }
+
+  @Override
+  public Object[] toArray() {
+    return keySet.toArray();
+  }
+
+  @Override
+  public <T> T[] toArray(T[] a) {
+    return keySet.toArray(a);
+  }
+
+  @Override
+  public boolean add(E key) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends E> keys) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean remove(Object o) {
+    return owner.remove(o) != null;
+  }
+
+  @Override
+  public boolean containsAll(Collection<?> keys) {
+    return keySet.containsAll(keys);
+  }
+
+  @Override
+  public void clear() {
+    owner.clear();
+  }
+
+  @Override
+  public Iterator<E> iterator() {
+    return new KeySetIterator<>(new ArrayList<>(keySet).iterator());
+  }
+
+  @Override
+  public boolean retainAll(Collection<?> keys) {
+    return keysMatch(keys, false);
+  }
+
+  @Override
+  public boolean removeAll(Collection<?> keys) {
+    return keysMatch(keys, true);
+  }
+
+  private boolean keysMatch(Collection<?> keys, boolean containsMatch) {
+    boolean changed = false;
+    final Iterator<E> iterator = iterator();
+    while (iterator.hasNext()) {
+      final E key = iterator.next();
+      if (keys.contains(key) == containsMatch) {
+        iterator.remove();
+        changed = true;
+      }
+    }
+    return changed;
+  }
+
+
+  class KeySetIterator<K> implements Iterator<K> {
+
+    private final Iterator<K> iterator;
+    private K key;
+
+    KeySetIterator(Iterator<K> iterator) {
+      this.iterator = iterator;
+    }
+
+    @Override
+    public boolean hasNext() {
+      return iterator.hasNext();
+    }
+
+    @Override
+    public K next() {
+      key = iterator.next();
+      return key;
+    }
+
+    @Override
+    public void remove() {
+      owner.remove(key);
+      iterator.remove();
+    }
+  }
+}
diff --git a/ebean-api/src/main/java/io/ebean/common/ModifySet.java b/ebean-api/src/main/java/io/ebean/common/ModifySet.java
deleted file mode 100644
index 1a0a2e1bf..000000000
--- a/ebean-api/src/main/java/io/ebean/common/ModifySet.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.ebean.common;
-
-import io.ebean.bean.BeanCollection;
-
-import java.util.Set;
-
-/**
- * Wraps a Set for the purposes of notifying removals and additions to the
- * BeanCollection owner.
- * <p>
- * This is required for persisting ManyToMany objects. Additions and removals
- * become inserts and deletes to the intersection table.
- * </p>
- */
-class ModifySet<E> extends ModifyCollection<E> implements Set<E> {
-
-  /**
-   * Create with an Owner that is notified of any additions or deletions.
-   */
-  public ModifySet(BeanCollection<E> owner, Set<E> s) {
-    super(owner, s);
-  }
-
-}
diff --git a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java
index 08a57e05a..003539a72 100644
--- a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java
+++ b/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java
@@ -2,18 +2,21 @@ package io.ebean.common;
 
 import io.ebean.bean.BeanCollection;
 import org.junit.Test;
+import org.tests.model.basic.EBasic;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 
+import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
 public class BeanMapTest {
 
-  Object object1 = new Object();
-  Object object2 = new Object();
-  Object object3 = new Object();
+  private final EBasic object1 = new EBasic("o1");
+  private final EBasic object2 = new EBasic("o2");
+  private final EBasic object3 = new EBasic("o3");
+  private final EBasic object4 = new EBasic("o4");
+  private final EBasic object5 = new EBasic("o5");
 
   private Map<String, Object> all() {
     Map<String, Object> all = new LinkedHashMap<>();
@@ -174,9 +177,7 @@ public class BeanMapTest {
   @Test
   public void testClear_given_someBeansInAdditions() throws Exception {
 
-    BeanMap<String, Object> map = new BeanMap<>();
-    map.put("1", object1);
-    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+    BeanMap<String, EBasic> map = newModifyListeningMap();
     map.put("2", object2);
     map.put("3", object3);
 
@@ -188,4 +189,252 @@ public class BeanMapTest {
     assertThat(map.getModifyAdditions()).isEmpty();
   }
 
+  @Test(expected = UnsupportedOperationException.class)
+  public void keySet_add_whenModifyListening() {
+    BeanMap<String, EBasic> map = newModifyListeningMap();
+    map.keySet().add("3");
+  }
+
+  @Test(expected = UnsupportedOperationException.class)
+  public void keySet_add() {
+    BeanMap<String, Object> map = new BeanMap<>();
+    map.keySet().add("3");
+  }
+
+  @Test(expected = UnsupportedOperationException.class)
+  public void keySet_addAll_whenModifyListening() {
+    BeanMap<String, EBasic> map = newModifyListeningMap();
+    map.keySet().addAll(asList("3", "4"));
+  }
+
+  @Test(expected = UnsupportedOperationException.class)
+  public void keySet_addAll() {
+    BeanMap<String, Object> map = new BeanMap<>();
+    map.keySet().addAll(asList("3", "4"));
+  }
+
+  @Test
+  public void keySet_remove() {
+
+    BeanMap<String, Object> map = new BeanMap<>();
+    map.put("1", object1);
+    map.put("2", object2);
+    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+
+    final Set<String> keySet = map.keySet();
+    keySet.remove("1");
+
+    assertThat(keySet.contains("1")).isFalse();
+    assertThat(map).doesNotContainKeys("1");
+    assertThat(map.get("1")).isNull();
+
+    assertThat(map.getModifyRemovals()).containsExactly(object1);
+  }
+
+  @Test
+  public void keySet_clear() {
+
+    BeanMap<String, Object> map = new BeanMap<>();
+    map.put("1", object1);
+    map.put("2", object2);
+    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+
+    final Set<String> keySet = map.keySet();
+    keySet.clear();
+
+    assertThat(map).isEmpty();
+    assertThat(keySet).isEmpty();
+
+    assertThat(map.getModifyRemovals()).containsExactly(object1, object2);
+  }
+
+  @Test
+  public void keySet_iterator_remove() {
+
+    BeanMap<String, Object> map = new BeanMap<>();
+    map.put("1", object1);
+    map.put("2", object2);
+    map.put("3", object3);
+    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+
+    final Set<String> keySet = map.keySet();
+    final Iterator<String> iterator = keySet.iterator();
+    while (iterator.hasNext()) {
+      final String key = iterator.next();
+      if (key.equals("2")) {
+        iterator.remove();
+      }
+    }
+
+    assertThat(map).hasSize(2);
+    assertThat(keySet).hasSize(2);
+    assertThat(keySet).containsExactly("1", "3");
+    assertThat(map).containsKeys("1", "3");
+
+    assertThat(map.getModifyRemovals()).containsExactly(object2);
+  }
+
+  @Test
+  public void keySet_removeAll() {
+
+    BeanMap<String, Object> map = new BeanMap<>();
+    map.put("1", object1);
+    map.put("2", object2);
+    map.put("3", object3);
+    map.put("4", object4);
+    map.put("5", object5);
+    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+
+    final Set<String> keySet = map.keySet();
+    final boolean changed = keySet.removeAll(asList("2", "3", "5"));
+
+    assertThat(changed).isTrue();
+    assertThat(map).hasSize(2);
+    assertThat(keySet).hasSize(2);
+    assertThat(keySet).containsExactly("1", "4");
+    assertThat(map).containsKeys("1", "4");
+
+    assertThat(map.getModifyRemovals()).containsExactly(object2, object3, object5);
+  }
+
+
+  @Test
+  public void keySet_retainAll() {
+
+    BeanMap<String, Object> map = new BeanMap<>();
+    map.put("1", object1);
+    map.put("2", object2);
+    map.put("3", object3);
+    map.put("4", object4);
+    map.put("5", object5);
+    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+
+    final Set<String> keySet = map.keySet();
+    final boolean changed = keySet.retainAll(asList("2", "3", "5"));
+
+    assertThat(changed).isTrue();
+    assertThat(map).hasSize(3);
+    assertThat(keySet).hasSize(3);
+    assertThat(keySet).containsExactly("2", "3", "5");
+    assertThat(map).containsKeys("2", "3", "5");
+
+    assertThat(map.getModifyRemovals()).containsExactly(object1, object4);
+  }
+
+  @Test(expected = UnsupportedOperationException.class)
+  public void values_add() {
+    BeanMap<String, EBasic> map = new BeanMap<>();
+    map.values().add(object3);
+  }
+
+  @Test(expected = UnsupportedOperationException.class)
+  public void values_addAll() {
+    BeanMap<String, EBasic> map = new BeanMap<>();
+    map.values().addAll(asList(object3, object5));
+  }
+
+  @Test(expected = UnsupportedOperationException.class)
+  public void entrySet_add() {
+    newModifyListeningMap()
+      .entrySet()
+      .add(new AbstractMap.SimpleEntry<>("3", object3));
+  }
+
+  @Test
+  public void entrySet_clear() {
+    final BeanMap<String, EBasic> map = newModifyListeningMap();
+    final Set<Map.Entry<String, EBasic>> entries = map.entrySet();
+    entries.clear();
+
+    assertThat(entries).isEmpty();
+    assertThat(map).isEmpty();
+    assertThat(map.getModifyRemovals()).containsExactly(object1);
+  }
+
+  @Test
+  public void entrySet_remove() {
+    final BeanMap<String, EBasic> map = newModifyListeningMap5();
+    final Set<Map.Entry<String, EBasic>> entries = map.entrySet();
+
+    assertThat(map).hasSize(5);
+
+    final boolean existed1 = entries.remove(new AbstractMap.SimpleEntry<>("1", object1));
+    assertThat(existed1).isTrue();
+
+    final boolean existed22 = entries.remove(new AbstractMap.SimpleEntry<>("22", object1));
+    assertThat(existed22).isFalse();
+
+    assertThat(map).hasSize(4);
+    assertThat(map.getModifyRemovals()).containsExactly(object1);
+  }
+
+  @Test
+  public void entrySet_remove_whenNotEqualValue() {
+    final BeanMap<String, EBasic> map = newModifyListeningMap5();
+    final Set<Map.Entry<String, EBasic>> entries = map.entrySet();
+
+    assertThat(map).hasSize(5);
+
+    final boolean modified = entries.remove(new AbstractMap.SimpleEntry<>("1", object2));
+    assertThat(modified).isFalse();
+
+    assertThat(map).hasSize(5);
+    assertThat(map.getModifyRemovals()).isNull();
+  }
+
+  @Test
+  public void entrySet_iterator_remove() {
+    final BeanMap<String, EBasic> map = newModifyListeningMap5();
+    final Set<Map.Entry<String, EBasic>> entries = map.entrySet();
+    final Iterator<Map.Entry<String, EBasic>> iterator = entries.iterator();
+    while (iterator.hasNext()) {
+      final Map.Entry<String, EBasic> entry = iterator.next();
+      if (entry.getKey().equals("2") || entry.getKey().equals("5")) {
+        iterator.remove();
+      }
+    }
+    assertThat(map).hasSize(3);
+    assertThat(entries).hasSize(3);
+    assertThat(map.getModifyRemovals()).containsExactly(object2, object5);
+  }
+
+  @Test
+  public void entrySet_removeAll() {
+    final BeanMap<String, EBasic> map = newModifyListeningMap5();
+    final Set<Map.Entry<String, EBasic>> entries = map.entrySet();
+
+    entries.removeAll(asList(new AbstractMap.SimpleEntry<>("1", object1), new AbstractMap.SimpleEntry<>("3", object4), new AbstractMap.SimpleEntry<>("4", object4)));
+    assertThat(map).hasSize(3);
+    assertThat(entries).hasSize(3);
+    assertThat(map.getModifyRemovals()).containsExactly(object1, object4);
+  }
+
+  @Test
+  public void entrySet_retainAll() {
+    final BeanMap<String, EBasic> map = newModifyListeningMap5();
+    final Set<Map.Entry<String, EBasic>> entries = map.entrySet();
+
+    entries.retainAll(asList(new AbstractMap.SimpleEntry<>("1", object1), new AbstractMap.SimpleEntry<>("3", object4), new AbstractMap.SimpleEntry<>("4", object4)));
+    assertThat(map).hasSize(2);
+    assertThat(entries).hasSize(2);
+    assertThat(map.getModifyRemovals()).containsExactly(object2, object3, object5);
+  }
+
+  private BeanMap<String, EBasic> newModifyListeningMap() {
+    BeanMap<String, EBasic> map = new BeanMap<>();
+    map.put("1", object1);
+    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+    return map;
+  }
+
+  private BeanMap<String, EBasic> newModifyListeningMap5() {
+    BeanMap<String, EBasic> map = new BeanMap<>();
+    map.put("1", object1);
+    map.put("2", object2);
+    map.put("3", object3);
+    map.put("4", object4);
+    map.put("5", object5);
+    map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
+    return map;
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java b/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java
new file mode 100644
index 000000000..48288e7a3
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java
@@ -0,0 +1,50 @@
+package org.tests.model.map;
+
+import io.ebean.DB;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class BeanMapOrphanRemovalTest {
+
+  @Test
+  public void keySet_retainAll() {
+
+    MpUser user = new MpUser();
+    user.setName("u1");
+    addRoles(user, "r1", "r2", "r3", "r4");
+    DB.save(user);
+
+    final MpUser user1 = DB.find(MpUser.class, user.getId());
+    final Map<String, MpRole> roles = user1.getRoles();
+    assertThat(roles).hasSize(4);
+
+
+    final Set<String> keySet = roles.keySet();
+    keySet.retainAll(Arrays.asList("r2", "r3"));
+
+    DB.save(user1);
+
+    final MpUser user2 = DB.find(MpUser.class, user.getId());
+    final Map<String, MpRole> roles2 = user2.getRoles();
+    assertThat(roles2).hasSize(2);
+  }
+
+  private void addRoles(MpUser user, String... roles){
+    for (String code : roles) {
+      MpRole role = newRole(code);
+      user.getRoles().put(role.getCode(), role);
+    }
+  }
+
+  private MpRole newRole(String code) {
+    MpRole role = new MpRole();
+    role.setCode(code);
+    return role;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/map/MpUser.java b/ebean-core/src/test/java/org/tests/model/map/MpUser.java
index 100e1e6a7..94edddb19 100644
--- a/ebean-core/src/test/java/org/tests/model/map/MpUser.java
+++ b/ebean-core/src/test/java/org/tests/model/map/MpUser.java
@@ -1,11 +1,7 @@
 package org.tests.model.map;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.MapKey;
-import javax.persistence.OneToMany;
-import java.util.HashMap;
+import javax.persistence.*;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 @Entity
@@ -16,9 +12,9 @@ public class MpUser {
 
   private String name;
 
-  @OneToMany(cascade = CascadeType.ALL)
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
   @MapKey(name = "code")
-  public Map<String, MpRole> roles = new HashMap<>();
+  private Map<String, MpRole> roles = new LinkedHashMap<>();
 
   public Long getId() {
     return id;

From 2158925d3ca77b9610c3ae03c244594d74ed6639 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 23 May 2021 21:28:11 +1200
Subject: [PATCH 225/447] #2202 - kotlin-maven-plugin issue with JDK 16

 InaccessibleObjectException: Unable to make protected void java.util.ResourceBundle.setParent(java.util.ResourceBundle) accessible: module java.base does not "opens java.util" to unnamed module @62732be7
---
 kotlin-querybean-generator/pom.xml | 75 +++++++++++++++---------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index a475fdcc4..917d4275a 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>kotlin-querybean-generator</artifactId>
 
   <properties>
-    <kotlin.version>1.4.31</kotlin.version>
+    <kotlin.version>1.5.0</kotlin.version>
   </properties>
 
   <dependencies>
@@ -81,43 +81,42 @@
   <build>
     <testSourceDirectory>src/test/kotlin</testSourceDirectory>
     <plugins>
-<!--      <plugin>-->
-<!--        <groupId>org.jetbrains.kotlin</groupId>-->
-<!--        <artifactId>kotlin-maven-plugin</artifactId>-->
-<!--        <version>${kotlin.version}</version>-->
-<!--        <executions>-->
-<!--          <execution>-->
-<!--            <id>test-compile</id>-->
-<!--            <phase>test-compile</phase>-->
-<!--            <goals>-->
-<!--              <goal>test-compile</goal>-->
-<!--            </goals>-->
-<!--          </execution>-->
-<!--          <execution>-->
-<!--            <id>test-kapt</id>-->
-<!--            <goals>-->
-<!--              <goal>test-kapt</goal>-->
-<!--            </goals>-->
-<!--            <configuration>-->
-<!--              <sourceDirs>-->
-<!--                <sourceDir>src/test/kotlin</sourceDir>-->
-<!--              </sourceDirs>-->
-<!--&lt;!&ndash;              <annotationProcessorPaths>&ndash;&gt;-->
-<!--&lt;!&ndash;                <annotationProcessorPath>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <groupId>io.ebean</groupId>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <artifactId>kotlin-querybean-generator</artifactId>&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                  <version>12.7.1</version>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;                  <version>12.8.0-SNAPSHOT</version>&ndash;&gt;-->
-<!--&lt;!&ndash;                </annotationProcessorPath>&ndash;&gt;-->
-<!--&lt;!&ndash;              </annotationProcessorPaths>&ndash;&gt;-->
-<!--            </configuration>-->
-<!--          </execution>-->
-<!--        </executions>-->
-<!--        <configuration>-->
-<!--          <jvmTarget>1.8</jvmTarget>-->
-<!--&lt;!&ndash;          <args></args>&ndash;&gt;-->
-<!--        </configuration>-->
-<!--      </plugin>-->
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <version>${kotlin.version}</version>
+        <executions>
+          <execution>
+            <id>test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>test-compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-kapt</id>
+            <goals>
+              <goal>test-kapt</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <sourceDir>src/test/kotlin</sourceDir>
+              </sourceDirs>
+              <annotationProcessorPaths>
+                <annotationProcessorPath>
+                  <groupId>io.ebean</groupId>
+                  <artifactId>kotlin-querybean-generator</artifactId>
+                  <version>12.8.2</version>
+                </annotationProcessorPath>
+              </annotationProcessorPaths>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <jvmTarget>1.8</jvmTarget>
+<!--          <args></args>-->
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>

From 01bce5cfa622af053545ce15f885d1a25a2e0337 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 23 May 2021 22:20:40 +1200
Subject: [PATCH 226/447] #2226 - Automatically determining join columns and
 ignoring PrimaryKeyJoinColumn.name Id warning when I want to use Id as a
 foreign key

Improve the message and dropping to INFO level.
---
 .../server/deploy/parse/AnnotationAssocOnes.java      | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index d313ce925..b5929d6a0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -54,7 +54,6 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
   }
 
   private void readAssocOne(DeployBeanPropertyAssocOne<?> prop) {
-
     ManyToOne manyToOne = get(prop, ManyToOne.class);
     if (manyToOne != null) {
       readManyToOne(manyToOne, prop);
@@ -183,7 +182,6 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
   }
 
   private void readManyToOne(ManyToOne propAnn, DeployBeanPropertyAssocOne<?> beanProp) {
-
     setCascadeTypes(propAnn.cascade(), beanProp.getCascadeInfo());
     setTargetType(propAnn.targetEntity(), beanProp);
     setBeanTable(beanProp);
@@ -194,7 +192,6 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
   }
 
   private void readOneToOne(OneToOne propAnn, DeployBeanPropertyAssocOne<?> prop) {
-
     prop.setOneToOne();
     prop.setDbInsertable(true);
     prop.setDbUpdateable(true);
@@ -223,21 +220,19 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
   }
 
   private void readPrimaryKeyJoin(PrimaryKeyJoinColumn primaryKeyJoin, DeployBeanPropertyAssocOne<?> prop) {
-
     if (!prop.isOneToOne()) {
       throw new IllegalStateException("Expecting property " + prop.getFullBeanName() + " with PrimaryKeyJoinColumn to be a OneToOne?");
     }
     prop.setPrimaryKeyJoin(true);
 
     if (!primaryKeyJoin.name().isEmpty()) {
-      log.warn("Automatically determining join columns and ignoring PrimaryKeyJoinColumn.name {} on {}", primaryKeyJoin.name(), prop.getFullBeanName());
+      log.info("Automatically determining join columns for @PrimaryKeyJoinColumn - ignoring PrimaryKeyJoinColumn.name attribute [{}] on {}", primaryKeyJoin.name(), prop.getFullBeanName());
     }
     if (!primaryKeyJoin.referencedColumnName().isEmpty()) {
-      log.warn("Automatically determining join columns and Ignoring PrimaryKeyJoinColumn.referencedColumnName {} on {}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
+      log.info("Automatically determining join columns for @PrimaryKeyJoinColumn - Ignoring PrimaryKeyJoinColumn.referencedColumnName attribute [{}] on {}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
     }
 
     BeanTable baseBeanTable = factory.getBeanTable(info.getDescriptor().getBeanType());
-
     String localPrimaryKey = baseBeanTable.getIdColumn();
     String foreignColumn = getBeanTable(prop).getIdColumn();
 
@@ -245,7 +240,6 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
   }
 
   private void readEmbedded(DeployBeanPropertyAssocOne<?> prop, Embedded embedded) {
-
     if (descriptor.isDocStoreOnly() && prop.getDocStoreDoc() == null) {
       prop.setDocStoreEmbedded("");
     }
@@ -257,7 +251,6 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
     } catch (NoSuchMethodError e) {
       // using standard JPA API without prefix option, maybe in EE container
     }
-
     readEmbeddedAttributeOverrides(prop);
   }
 

From 4c317f11ae097acd5414bf7414b2e592b1ee3d68 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 23 May 2021 22:21:05 +1200
Subject: [PATCH 227/447] Add additional test for PrimaryKeyJoinColumn

---
 .../tests/model/onetoone/calcd/CalcDData.java | 46 +++++++++++++++++++
 .../model/onetoone/calcd/CalcDInput.java      | 42 +++++++++++++++++
 .../TestOneToOnePrimaryKeyJoinMapping.java    | 26 +++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java

diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java
new file mode 100644
index 000000000..eef657be5
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java
@@ -0,0 +1,46 @@
+package org.tests.model.onetoone.calcd;
+
+import io.ebean.Model;
+import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.DbForeignKey;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "calcd_data")
+public class CalcDData extends Model {
+
+  @Id
+  private Integer id;
+
+  @OneToOne(optional = false, cascade = CascadeType.ALL)
+  @DbForeignKey(onDelete = ConstraintMode.CASCADE)
+  @PrimaryKeyJoinColumn//(name = "Id", referencedColumnName = "Id")
+  private CalcDInput input;
+
+  private final String name;
+
+  public CalcDData(String name) {
+    this.name = name;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public CalcDInput getInput() {
+    return input;
+  }
+
+  public void setInput(CalcDInput input) {
+    this.input = input;
+  }
+
+  public String getName() {
+    return name;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java
new file mode 100644
index 000000000..00704eb27
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java
@@ -0,0 +1,42 @@
+package org.tests.model.onetoone.calcd;
+
+import io.ebean.Model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "calcd_input")
+public class CalcDInput extends Model {
+
+  @Id
+  private Integer id;
+
+  @OneToOne(optional = false, fetch = FetchType.EAGER, orphanRemoval = true, mappedBy = "input")
+  private CalcDData data;
+
+  private final String name;
+
+  public CalcDInput(String name) {
+    this.name = name;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public CalcDData getData() {
+    return data;
+  }
+
+  public void setData(CalcDData data) {
+    this.data = data;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java
new file mode 100644
index 000000000..9e1aa68f0
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java
@@ -0,0 +1,26 @@
+package org.tests.model.onetoone.calcd;
+
+import io.ebean.DB;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToOnePrimaryKeyJoinMapping {
+
+  @Test
+  public void test() {
+
+    CalcDInput inputs = new CalcDInput("input0");
+
+    CalcDData data = new CalcDData("data0");
+    inputs.setData(data);
+    inputs.save();
+
+    CalcDInput found = DB.find(CalcDInput.class, inputs.getId());
+
+    assertThat(found).isNotNull();
+    assertThat(found.getName()).isEqualTo("input0");
+    assertThat(found.getData().getName()).isEqualTo("data0");
+
+  }
+}

From 622a90c7d5dd27b2cb477df635611314e100688d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 23 May 2021 23:00:34 +1200
Subject: [PATCH 228/447] No effective change - tidy whitespace in
 TransactionManager

---
 .../transaction/TransactionManager.java       | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index b71868e5d..0728eebac 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -53,7 +53,6 @@ import java.util.concurrent.atomic.AtomicLong;
  * Manages transactions.
  * <p>
  * Keeps the Cache and Cluster in sync when transactions are committed.
- * </p>
  */
 public class TransactionManager implements SpiTransactionManager {
 
@@ -198,8 +197,6 @@ public class TransactionManager implements SpiTransactionManager {
     this.txnMain = metricFactory.createTimedMetric("txn.main");
     this.txnReadOnly = metricFactory.createTimedMetric("txn.readonly");
     this.txnNamed = metricFactory.createTimedMetricMap("txn.named.");
-    // Add gauges for db pool size
-
     scopeManager.register(this);
   }
 
@@ -304,20 +301,16 @@ public class TransactionManager implements SpiTransactionManager {
    * There is a potential optimisation available when read committed is the default
    * isolation level. If it is, then Connections used only for queries do not require
    * commit or rollback but instead can just be put back into the pool via close().
-   * </p>
    * <p>
    * If the Isolation level is higher (say SERIALIZABLE) then Connections used
    * just for queries do need to be committed or rollback after the query.
-   * </p>
    */
   OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly) {
-
     // first check for a system property 'override'
     String systemPropertyValue = System.getProperty("ebean.transaction.onqueryonly");
     if (systemPropertyValue != null) {
       return OnQueryOnly.valueOf(systemPropertyValue.trim().toUpperCase());
     }
-
     // default to rollback if not defined on the platform
     return dbPlatformOnQueryOnly == null ? OnQueryOnly.COMMIT : dbPlatformOnQueryOnly;
   }
@@ -359,9 +352,7 @@ public class TransactionManager implements SpiTransactionManager {
    * Wrap an externally supplied Connection with a known transaction id.
    */
   private SpiTransaction wrapExternalConnection(String id, Connection c) {
-
     ExternalJdbcTransaction t = new ExternalJdbcTransaction(id, true, c, this);
-
     // set the default batch mode
     t.setBatchMode(persistBatch);
     t.setBatchOnCascade(persistBatchOnCascade);
@@ -409,7 +400,6 @@ public class TransactionManager implements SpiTransactionManager {
    */
   @Override
   public void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
-
     try {
       if (txnLogger.isDebug()) {
         String msg = transaction.getLogPrefix() + "Rollback";
@@ -418,7 +408,6 @@ public class TransactionManager implements SpiTransactionManager {
         }
         txnLogger.debug(msg);
       }
-
     } catch (Exception ex) {
       logger.error("Error while notifying TransactionEventListener of rollback event", ex);
     }
@@ -445,7 +434,6 @@ public class TransactionManager implements SpiTransactionManager {
   }
 
   private void formatThrowable(Throwable e, StringBuilder sb) {
-
     sb.append(e.toString());
     StackTraceElement[] stackTrace = e.getStackTrace();
     if (stackTrace.length > 0) {
@@ -468,11 +456,9 @@ public class TransactionManager implements SpiTransactionManager {
       if (txnLogger.isDebug()) {
         txnLogger.debug(transaction.getLogPrefix() + "Commit");
       }
-
       PostCommitProcessing postCommit = new PostCommitProcessing(clusterManager, this, transaction);
       postCommit.notifyLocalCache();
       backgroundExecutor.execute(postCommit.backgroundNotify());
-
     } catch (Exception ex) {
       logger.error("NotifyOfCommit failed. L2 Cache potentially not notified.", ex);
     }
@@ -488,7 +474,6 @@ public class TransactionManager implements SpiTransactionManager {
   }
 
   private void externalModificationEvent(TransactionEventTable tableEvents) {
-
     TransactionEvent event = new TransactionEvent();
     event.add(tableEvents);
 
@@ -501,25 +486,21 @@ public class TransactionManager implements SpiTransactionManager {
    * Notify local BeanPersistListeners etc of events from another server in the cluster.
    */
   public void remoteTransactionEvent(RemoteTransactionEvent remoteEvent) {
-
     if (clusterLogger.isDebugEnabled()) {
       clusterLogger.debug("processing {}", remoteEvent);
     }
-
     CacheChangeSet changeSet = new CacheChangeSet();
 
     RemoteTableMod tableMod = remoteEvent.getRemoteTableMod();
     if (tableMod != null) {
       changeSet.addInvalidate(tableMod.getTables());
     }
-
     List<TableIUD> tableIUDList = remoteEvent.getTableIUDList();
     if (tableIUDList != null) {
       for (TableIUD tableIUD : tableIUDList) {
         beanDescriptorManager.cacheNotify(tableIUD, changeSet);
       }
     }
-
     // note DeleteById is written as BeanPersistIds and getBeanPersistList()
     // processes both Bean IUD and DeleteById
     List<BeanPersistIds> beanPersistList = remoteEvent.getBeanPersistList();
@@ -528,7 +509,6 @@ public class TransactionManager implements SpiTransactionManager {
         persistIds.notifyCache(changeSet);
       }
     }
-
     changeSet.apply();
   }
 
@@ -543,10 +523,8 @@ public class TransactionManager implements SpiTransactionManager {
    * Prepare and then send/log the changeSet.
    */
   void sendChangeLog(final ChangeSet changeSet) {
-
     // can set userId, userIpAddress & userContext if desired
     if (changeLogPrepare.prepare(changeSet)) {
-
       if (changeLogAsync) {
         // call the log method in background
         backgroundExecutor.execute(() -> changeLogListener.log(changeSet));
@@ -653,9 +631,7 @@ public class TransactionManager implements SpiTransactionManager {
    * Begin a scoped transaction.
    */
   public ScopedTransaction beginScopedTransaction(TxScope txScope) {
-
     txScope = initTxScope(txScope);
-
     ScopedTransaction txnContainer = getActiveScoped();
 
     boolean setToScope;
@@ -678,7 +654,6 @@ public class TransactionManager implements SpiTransactionManager {
     if (nestedSavepoint && (type == TxType.REQUIRED || type == TxType.REQUIRES_NEW)) {
       createTransaction = true;
       transaction = createSavepoint(transaction, this);
-
     } else {
       createTransaction = isCreateNewTransaction(transaction, type);
       if (createTransaction) {
@@ -748,32 +723,26 @@ public class TransactionManager implements SpiTransactionManager {
    * Determine whether to create a new transaction or not.
    * <p>
    * This will also potentially throw exceptions for MANDATORY and NEVER types.
-   * </p>
    */
   private boolean isCreateNewTransaction(SpiTransaction current, TxType type) {
     switch (type) {
       case REQUIRED:
       case SUPPORTS:
         return current == null;
-
       case REQUIRES_NEW:
         return true;
-
       case MANDATORY:
         if (current == null) {
           throw new PersistenceException("Transaction missing when MANDATORY");
         }
         return false;
-
       case NEVER:
         if (current != null) {
           throw new PersistenceException("Transaction exists for Transactional NEVER");
         }
         return true; // always use NoTransaction instance
-
       case NOT_SUPPORTED:
         return true; // always use NoTransaction instance
-
       default:
         throw new RuntimeException("Should never get here?");
     }

From 850f1c1469253ec0c680247724261bbd0388757a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 23 May 2021 23:08:38 +1200
Subject: [PATCH 229/447] [maven-release-plugin] prepare release
 ebean-parent-12.9.0

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 10e919049..e329d4f8e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 1c7d48b4e..d58436ad9 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index dc1478d34..26e65f569 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.0-SNAPSHOT</version>
+        <version>12.9.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index e6589d839..c83c12657 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 16e400f91..294126146 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 6b16e9b2a..51d288d68 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 57372b097..1858ca78a 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 0fb961ac4..174af5f49 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index e000db688..86ddf6ab5 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 57b01e349..fe67071c0 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index c500e7508..dd8d1d5bf 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 94cba52d6..cd17d895d 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index d284c0bda..510e0a78f 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 917d4275a..76d9c49de 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0-SNAPSHOT</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 14f2e3f08..d96af125b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.0-SNAPSHOT</version>
+  <version>12.9.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index d5d769ac4..4bbbd7cf6 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0-SNAPSHOT</version>
+    <version>12.9.0</version>
   </parent>
 
   <name>querybean generator</name>

From 47bd2ff03d34128f069df13c6d3581b8a4b125aa Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 23 May 2021 23:08:47 +1200
Subject: [PATCH 230/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index e329d4f8e..250066b16 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index d58436ad9..8aadc2cb8 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 26e65f569..bc4b1c60d 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index c83c12657..2cc5360a1 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 294126146..582ea91a8 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 51d288d68..548d4a6bb 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 1858ca78a..e4fe48811 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 174af5f49..7be57fd2c 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 86ddf6ab5..837464a0b 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index fe67071c0..91a109c24 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index dd8d1d5bf..e051ea21b 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index cd17d895d..dbf417b93 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 510e0a78f..ac9ee412e 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 76d9c49de..ab6342a77 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index d96af125b..fc8e0db25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.0</version>
+  <version>12.9.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 4bbbd7cf6..3c6a182a2 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.0</version>
+    <version>12.9.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 16832ac67a3994ace10108caaaf9bd461b54ea71 Mon Sep 17 00:00:00 2001
From: Ben Kempe <ben@vowel.ai>
Date: Mon, 24 May 2021 23:47:55 +0200
Subject: [PATCH 231/447] add test testSelectOneToOneDisjunction

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

diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
index 28b8b0dbd..5d895adbc 100644
--- a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
+++ b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
@@ -5,6 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.Expr;
 import io.ebean.Query;
 import org.junit.Test;
+import org.tests.basic.one2one.Wheel;
 import org.tests.model.basic.MRole;
 import org.tests.model.basic.MUser;
 
@@ -82,6 +83,24 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
     assertThat(sql).contains("where (t0.user_name = ? or u1.roleid = ?)");
   }
 
+  @Test
+  public void testSelectOneToOneDisjunction() {
+    Ebean.beginTransaction();
+    try {
+      Query<Wheel> query = Ebean.find(Wheel.class)
+              .select("id")
+              .where().or()
+              .ge("tire.id", 100)
+              .lt("tire.id", 100)
+              .endOr().query();
+      query.findList();
+      String sql = sqlOf(query);
+      assertThat(sql).contains("join");
+    } finally {
+      Ebean.rollbackTransaction();
+    }
+  }
+
   private void queryOrExpression(Integer roleid) {
 
     Query<MUser> query = Ebean.find(MUser.class)

From bf2420702cfccc6c8c3321e44e693ad1b238cd9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Tue, 1 Jun 2021 17:19:38 +0200
Subject: [PATCH 232/447] FIX: set ddl-generator version to a repo-available
 version

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

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 582ea91a8..accc9e877 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.8.4a</version>
+      <version>12.9.0</version>
       <scope>test</scope>
     </dependency>
 

From 348c075a1478f1d92b3922b99ae0b4d264dbd8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Tue, 1 Jun 2021 17:56:47 +0200
Subject: [PATCH 233/447] FIX: Build for java8

---
 ebean-core/pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index accc9e877..eabc9a68f 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -119,6 +119,15 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
+         and not require a separate module for it -->
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.199</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>jta</artifactId>
@@ -214,15 +223,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
-         and not require a separate module for it -->
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.4.199</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.xerial</groupId>
       <artifactId>sqlite-jdbc</artifactId>

From 6697aecd48e95fd461d2c97fc29f8455c325149a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Jun 2021 17:16:50 +1200
Subject: [PATCH 234/447] #2238 - Select with disjunction of expressions over
 OneToOne relationship missing join clause

Noting that there might be a better fix. The addJoin() at line 151 is suppressed as it is a duplicate for this case of a !oneToOneExported so a better fix might be to only add the soft delete clause when the join as actually added (not suppressed as a duplicate).
---
 .../ebeaninternal/server/query/SqlTreeNodeExtraJoin.java | 4 ++--
 .../softdelete/TestSoftDeleteOptionalRelationship.java   | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 7238224d7..1b31ee08c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -143,13 +143,13 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
       // "promote" to left join as the path contains a many
       joinType = SqlJoinType.OUTER;
     }
-    if (!manyToMany && !oneToOneExported) {
+    if (!manyToMany) {
       if (assocBeanProperty.isFormula()) {
         // add joins for formula beans
         assocBeanProperty.appendFrom(ctx, joinType);
       }
       joinType = assocBeanProperty.addJoin(joinType, prefix, ctx);
-      if (assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) {
+      if (!oneToOneExported && assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) {
         ctx.append(" and ").append(assocBeanProperty.getSoftDeletePredicate(ctx.getTableAlias(prefix)));
       }
     }
diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
index 2488060d4..b4e320b21 100644
--- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
+++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
@@ -3,12 +3,14 @@ package org.tests.softdelete;
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
 import org.tests.model.softdelete.ESoftDelMid;
 import io.ebean.Finder;
 import org.junit.Test;
 import org.tests.model.softdelete.ESoftDelY;
 import org.tests.model.softdelete.ESoftDelZ;
 
+import java.util.List;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -44,6 +46,8 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase {
       DB.save(y);
     }
 
+    LoggedSqlCollector.start();
+
     Finder<Long, ESoftDelY> finder = new Finder<>(ESoftDelY.class);
     ESoftDelY bean = finder
       .query()
@@ -53,7 +57,10 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase {
       .findOne();
 
     assertThat(bean).isNotNull();
+
+    final List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = false where");
   }
 
-
 }

From b189e67b4cf3040f48c98ffee7b0685b6eeba315 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Jun 2021 17:35:19 +1200
Subject: [PATCH 235/447] #2241 - Offline DDL migration generation for H2
 requires H2 Driver

---
 .../dbmigration/ddlgeneration/platform/H2HistoryDdl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
index bb474c1e4..2e7f97e2c 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
@@ -12,7 +12,7 @@ import java.io.IOException;
  */
 public class H2HistoryDdl extends DbTriggerBasedHistoryDdl {
 
-  private static final String TRIGGER_CLASS = H2HistoryTrigger.class.getName();
+  private static final String TRIGGER_CLASS = "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
 
   H2HistoryDdl() {
     this.sysPeriodType = "timestamp";

From c9120be347aadd413371d46f974b2aa41630fa96 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Jun 2021 17:37:37 +1200
Subject: [PATCH 236/447] No effective change - tidy only H2HistoryTrigger and
 H2HistoryDdl

---
 .../config/dbplatform/h2/H2HistoryTrigger.java      | 13 +++----------
 .../ddlgeneration/platform/H2HistoryDdl.java        |  7 -------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java
index 785e24a0c..323dd1120 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java
@@ -4,11 +4,7 @@ import org.h2.api.Trigger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
+import java.sql.*;
 import java.util.Arrays;
 
 /**
@@ -43,7 +39,6 @@ public class H2HistoryTrigger implements Trigger {
 
   @Override
   public void init(Connection conn, String schemaName, String triggerName, String tableName, boolean before, int type) throws SQLException {
-
     // get the columns for the table
     ResultSet rs = conn.getMetaData().getColumns(null, schemaName, tableName, null);
 
@@ -79,7 +74,6 @@ public class H2HistoryTrigger implements Trigger {
 
   @Override
   public void fire(Connection connection, Object[] oldRow, Object[] newRow) throws SQLException {
-
     if (oldRow != null) {
       // a delete or update event
       Timestamp now = new Timestamp(System.currentTimeMillis());
@@ -99,7 +93,6 @@ public class H2HistoryTrigger implements Trigger {
    * Insert the data into the history table.
    */
   private void insertIntoHistory(Connection connection, Object[] oldRow) throws SQLException {
-
     try (PreparedStatement stmt = connection.prepareStatement(insertHistorySql)) {
       for (int i = 0; i < oldRow.length; i++) {
         stmt.setObject(i + 1, oldRow[i]);
@@ -110,11 +103,11 @@ public class H2HistoryTrigger implements Trigger {
 
   @Override
   public void close() throws SQLException {
-
+    // do nothing
   }
 
   @Override
   public void remove() throws SQLException {
-
+    // do nothing
   }
 }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
index 2e7f97e2c..5bd58adeb 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import io.ebean.config.dbplatform.h2.H2HistoryTrigger;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.model.MTable;
@@ -22,31 +21,25 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl {
 
   @Override
   protected void dropTriggers(DdlBuffer buffer, String baseTable) throws IOException {
-
     buffer.append("drop trigger ").append(updateTriggerName(baseTable)).endOfStatement();
   }
 
   @Override
   protected void createTriggers(DdlWrite writer, MTable table) throws IOException {
-
     String baseTableName = table.getName();
     DdlBuffer apply = writer.applyHistoryTrigger();
-
     addCreateTrigger(apply, updateTriggerName(baseTableName), baseTableName);
   }
 
   @Override
   protected void updateHistoryTriggers(DbTriggerUpdate update) throws IOException {
-
     recreateHistoryView(update);
-
     DdlBuffer buffer = update.historyTriggerBuffer();
     dropTriggers(buffer, update.getBaseTable());
     addCreateTrigger(buffer, updateTriggerName(update.getBaseTable()), update.getBaseTable());
   }
 
   private void addCreateTrigger(DdlBuffer apply, String triggerName, String baseTable) throws IOException {
-
     // Note that this does not take into account the historyTable name (excepts _history suffix) and
     // does not take into account excluded columns (all columns included in history)
     apply

From ae4f50e7b3a1b15fe3a0f97a9ec01803518f72e7 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Jun 2021 17:46:31 +1200
Subject: [PATCH 237/447] #2236 - Auto-tune does not work / throws
 RuntimeException (Regression from 12.7.1)

Note we are missing a test on ProfileManager but doing this for now.
---
 .../server/autotune/service/ProfileManager.java        | 10 +---------
 .../server/autotune/service/ProfileOriginTest.java     | 10 +++++-----
 .../ebeaninternal/server/querydefn/OrmQueryDetail.java |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
index f334208f9..170a3a406 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
@@ -46,7 +46,6 @@ public class ProfileManager implements ProfilingListener {
 
   @Override
   public boolean isProfileRequest(ObjectGraphNode origin, SpiQuery<?> query) {
-
     ProfileOrigin profileOrigin = profileMap.get(origin.getOriginQueryPoint().getKey());
     if (profileOrigin == null) {
       profileMap.put(origin.getOriginQueryPoint().getKey(), createProfileOrigin(origin, query));
@@ -61,12 +60,11 @@ public class ProfileManager implements ProfilingListener {
    * <p>
    * For new profiling entries it is useful to compare the profiling against the current
    * query detail that is specified in the code (as the query might already be manually optimised).
-   * </p>
    */
   private ProfileOrigin createProfileOrigin(ObjectGraphNode origin, SpiQuery<?> query) {
     ProfileOrigin profileOrigin = new ProfileOrigin(origin.getOriginQueryPoint(), queryTuningAddVersion, profilingBase, profilingRate);
     // set the current query detail (fetch group) so that we can compare against profiling for new entries
-    profileOrigin.setOriginalQuery(query.getDetail().toString());
+    profileOrigin.setOriginalQuery(query.getDetail().asString());
     return profileOrigin;
   }
 
@@ -77,7 +75,6 @@ public class ProfileManager implements ProfilingListener {
    */
   @Override
   public void collectQueryInfo(ObjectGraphNode node, long beans, long micros) {
-
     if (node != null) {
       ObjectGraphOrigin origin = node.getOriginQueryPoint();
       if (origin != null) {
@@ -92,11 +89,9 @@ public class ProfileManager implements ProfilingListener {
    * <p>
    * This is sent to use from a EntityBeanIntercept when the finalise method
    * is called on the bean.
-   * </p>
    */
   @Override
   public void collectNodeUsage(NodeUsageCollector usageCollector) {
-
     ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.getNode().getOriginQueryPoint());
     profileOrigin.collectUsageInfo(usageCollector);
   }
@@ -114,16 +109,13 @@ public class ProfileManager implements ProfilingListener {
    * Collect all the profiling information.
    */
   public AutoTuneCollection profilingCollection(boolean reset) {
-
     AutoTuneCollection req = new AutoTuneCollection();
-
     for (ProfileOrigin origin : profileMap.values()) {
       BeanDescriptor<?> desc = server.getBeanDescriptorById(origin.getOrigin().getBeanType());
       if (desc != null) {
         origin.profilingCollection(desc, req, reset);
       }
     }
-
     return req;
   }
 
diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
index c3995d215..b1f982024 100644
--- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
+++ b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
@@ -27,7 +27,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asStringDebug().trim()).isEqualTo("fetch customer (name)");
+    assertThat(detail.asString().trim()).isEqualTo("fetch customer (name)");
   }
 
   @Test
@@ -46,7 +46,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asStringDebug()).isEqualTo("select (orderDate) fetch customer (name)");
+    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)");
   }
 
   @Test
@@ -64,7 +64,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asStringDebug().trim()).isEqualTo("select (orderDate,customer)");
+    assertThat(detail.asString().trim()).isEqualTo("select (orderDate,customer)");
   }
 
   @Test
@@ -87,7 +87,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asStringDebug()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
+    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
   }
 
 
@@ -116,7 +116,7 @@ public class ProfileOriginTest extends BaseTestCase {
     po.collectUsageInfo(c);
 
     OrmQueryDetail detail = po.buildDetail(desc);
-    assertThat(detail.asStringDebug()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)");
+    assertThat(detail.asString()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)");
   }
 
   private NodeUsageCollector node(String path) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 6646746eb..2fabfdd79 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -100,7 +100,7 @@ public class OrmQueryDetail implements Serializable {
   /**
    * Return the detail in string form.
    */
-  public String asStringDebug() {
+  public String asString() {
     StringBuilder sb = new StringBuilder();
     if (baseProps.hasProperties()) {
       baseProps.asStringDebug("select ", sb);

From ce5f1b25f5402f05cbc8f3dae311940fafc057f2 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Jun 2021 17:50:46 +1200
Subject: [PATCH 238/447] Bump ebean-maven-plugin to 12.9.1

---
 ebean-bom/pom.xml                  | 2 +-
 ebean-core/pom.xml                 | 2 +-
 ebean-ddl-generator/pom.xml        | 2 +-
 kotlin-querybean-generator/pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index bc4b1c60d..1dfdafb52 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -19,7 +19,7 @@
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
     <ebean-agent.version>12.9.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.9.0</ebean-maven-plugin.version>
+    <ebean-maven-plugin.version>12.9.1</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index eabc9a68f..aad54f60e 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 548d4a6bb..3056cb064 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index ab6342a77..6e081b514 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -145,7 +145,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.9.0</version>
+        <version>12.9.1</version>
         <executions>
           <execution>
             <id>test</id>

From 64405ade5204b20caeff42bfd00e1428f93bf0e5 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Jun 2021 17:59:11 +1200
Subject: [PATCH 239/447] [maven-release-plugin] prepare release
 ebean-parent-12.9.1

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 250066b16..286f7ae58 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 8aadc2cb8..17084e262 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 1dfdafb52..5ea0b74cf 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.1-SNAPSHOT</version>
+        <version>12.9.1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 2cc5360a1..d35cfa676 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index aad54f60e..1ba09d035 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.1</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 3056cb064..86f69ec5c 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index e4fe48811..1d69bcc30 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 7be57fd2c..e4af2cc57 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 837464a0b..8352cef21 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 91a109c24..fb83cca3e 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index e051ea21b..61ee622d9 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index dbf417b93..e35fd1d9f 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index ac9ee412e..0aacf1dc3 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 6e081b514..2b3522a64 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1-SNAPSHOT</version>
+      <version>12.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index fc8e0db25..05caa74f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.1-SNAPSHOT</version>
+  <version>12.9.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 3c6a182a2..c30aae273 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1-SNAPSHOT</version>
+    <version>12.9.1</version>
   </parent>
 
   <name>querybean generator</name>

From 612295fb9dee24a189d201daa6ff27fd8c82d166 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Jun 2021 17:59:21 +1200
Subject: [PATCH 240/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 286f7ae58..1d382e05c 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 17084e262..b8908e306 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 5ea0b74cf..94223e4be 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.1</version>
+        <version>12.9.2-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index d35cfa676..d7ea19e6f 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 1ba09d035..8f0b27243 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 86f69ec5c..6397c239b 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 1d69bcc30..45e433741 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index e4af2cc57..17aa58fdb 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 8352cef21..74ea548c1 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index fb83cca3e..2994c396d 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 61ee622d9..12187d225 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e35fd1d9f..66aeb2e78 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 0aacf1dc3..c8f3462d4 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 2b3522a64..20bf130a3 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.1</version>
+      <version>12.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 05caa74f3..af7bc24b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.1</version>
+  <version>12.9.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index c30aae273..1e59c8065 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.1</version>
+    <version>12.9.2-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 4613f63c6613358656c9a4f2798f2ceb21b4b6f2 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 12:57:56 +1200
Subject: [PATCH 241/447] Refactor internals DataReader remove
 resetColumnPosition()

- Move the reset of position to the DataReader.next() method
- Tidy up use of wasNull() in RsetDataReader
---
 .../java/io/ebean/core/type/DataReader.java   |  2 -
 .../server/core/AbstractSqlQueryRequest.java  | 22 +++----
 .../server/core/DtoQueryRequest.java          |  5 +-
 .../server/core/RelationalQueryRequest.java   |  5 ++
 .../io/ebeaninternal/server/query/CQuery.java |  4 --
 .../query/CQueryFetchSingleAttribute.java     |  1 -
 .../server/type/RsetDataReader.java           | 57 +++----------------
 7 files changed, 25 insertions(+), 71 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java b/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java
index 45fba0e0e..a8ace12be 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java
@@ -11,8 +11,6 @@ public interface DataReader {
 
   boolean next() throws SQLException;
 
-  void resetColumnPosition();
-
   void incrementPos(int increment);
 
   byte[] getBinaryBytes() throws SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index c12534146..3c1050faf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -1,13 +1,8 @@
 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.SpiQuery;
-import io.ebeaninternal.api.SpiSqlBinding;
-import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.lib.Str;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.TrimLogSql;
@@ -83,11 +78,6 @@ public abstract class AbstractSqlQueryRequest {
     return transaction.isLogSql();
   }
 
-  /**
-   * Set the resultSet and associated query plan if known.
-   */
-  abstract void setResultSet(ResultSet resultSet, Object queryPlanKey) throws SQLException;
-
   /**
    * Return the bindLog for this request.
    */
@@ -95,12 +85,15 @@ public abstract class AbstractSqlQueryRequest {
     return bindLog;
   }
 
+  /**
+   * Set the resultSet and associated query plan if known.
+   */
+  abstract void setResultSet(ResultSet resultSet, Object queryPlanKey) throws SQLException;
+
   /**
    * Return true if we can navigate to the next row.
    */
-  public boolean next() throws SQLException {
-    return resultSet.next();
-  }
+  public abstract boolean next() throws SQLException;
 
   protected abstract void requestComplete();
 
@@ -113,7 +106,6 @@ public abstract class AbstractSqlQueryRequest {
     JdbcClose.close(pstmt);
   }
 
-
   /**
    * Prepare the SQL taking into account named bind parameters.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 2372ed7c3..b988c83b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -110,9 +110,12 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
     return queryEngine.findList(this);
   }
 
+  public boolean next() throws SQLException {
+    return dataReader.next();
+  }
+
   @SuppressWarnings("unchecked")
   public T readNextBean() throws SQLException {
-    dataReader.resetColumnPosition();
     return (T) plan.readRow(dataReader);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 7850139c7..9f1413031 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -139,6 +139,11 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     rows++;
   }
 
+  @Override
+  public boolean next() throws SQLException {
+    return resultSet.next();
+  }
+
   public <T> List<T> mapList(RowMapper<T> mapper) throws SQLException {
     List<T> list = new ArrayList<>();
     while (next()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 9f30e9a29..49182242e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -486,14 +486,11 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * Return true if we can move to the next resultSet row.
    */
   private boolean moveToNextRow() throws SQLException {
-
     if (!dataReader.next()) {
       noMoreRows = true;
       return false;
     }
-
     rowCount++;
-    dataReader.resetColumnPosition();
     return true;
   }
 
@@ -502,7 +499,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   boolean readBean() throws SQLException {
-
     boolean result = hasNext();
     updateExecutionStatistics();
     return result;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 45fabfde7..9fd7278cc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -111,7 +111,6 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
           value = new CountedValue<>(value, dataReader.getLong());
         }
         result.add(value);
-        dataReader.resetColumnPosition();
         rowCount++;
       }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
index 3448251d5..9763a5667 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
@@ -43,12 +43,8 @@ public class RsetDataReader implements DataReader {
 
   @Override
   public boolean next() throws SQLException {
-    return rset.next();
-  }
-
-  @Override
-  public void resetColumnPosition() {
     pos = 0;
+    return rset.next();
   }
 
   @Override
@@ -75,7 +71,6 @@ public class RsetDataReader implements DataReader {
     return rset.getBigDecimal(pos());
   }
 
-
   @Override
   public InputStream getBinaryStream() throws SQLException {
     return rset.getBinaryStream(pos());
@@ -84,19 +79,13 @@ public class RsetDataReader implements DataReader {
   @Override
   public Boolean getBoolean() throws SQLException {
     boolean v = rset.getBoolean(pos());
-    if (rset.wasNull()) {
-      return null;
-    }
-    return v;
+    return rset.wasNull() ? null : v;
   }
 
   @Override
   public Byte getByte() throws SQLException {
     byte v = rset.getByte(pos());
-    if (rset.wasNull()) {
-      return null;
-    }
-    return v;
+    return rset.wasNull() ? null : v;
   }
 
   @Override
@@ -117,62 +106,42 @@ public class RsetDataReader implements DataReader {
   @Override
   public Double getDouble() throws SQLException {
     double v = rset.getDouble(pos());
-    if (rset.wasNull()) {
-      return null;
-    }
-    return v;
+    return rset.wasNull() ? null : v;
   }
 
   @Override
   public Float getFloat() throws SQLException {
     float v = rset.getFloat(pos());
-    if (rset.wasNull()) {
-      return null;
-    }
-    return v;
+    return rset.wasNull() ? null : v;
   }
 
   @Override
   public Integer getInt() throws SQLException {
     int v = rset.getInt(pos());
-    if (rset.wasNull()) {
-      return null;
-    }
-    return v;
+    return rset.wasNull() ? null : v;
   }
 
-
   @Override
   public Long getLong() throws SQLException {
     long v = rset.getLong(pos());
-    if (rset.wasNull()) {
-      return null;
-    }
-    return v;
+    return rset.wasNull() ? null : v;
   }
 
-
   public Ref getRef() throws SQLException {
     return rset.getRef(pos());
   }
 
-
   @Override
   public Short getShort() throws SQLException {
     short s = rset.getShort(pos());
-    if (rset.wasNull()) {
-      return null;
-    }
-    return s;
+    return rset.wasNull() ? null : s;
   }
 
-
   @Override
   public String getString() throws SQLException {
     return rset.getString(pos());
   }
 
-
   @Override
   public Time getTime() throws SQLException {
     Calendar cal = dataTimeZone.getTimeZone();
@@ -196,14 +165,10 @@ public class RsetDataReader implements DataReader {
   @Override
   public String getStringFromStream() throws SQLException {
     Reader reader = rset.getCharacterStream(pos());
-    if (reader == null) {
-      return null;
-    }
-    return readStringLob(reader);
+    return reader == null ? null : readStringLob(reader);
   }
 
   protected String readStringLob(Reader reader) throws SQLException {
-
     char[] buffer = new char[clobBufferSize];
     int readLength;
     StringBuilder out = new StringBuilder(stringInitialSize);
@@ -215,7 +180,6 @@ public class RsetDataReader implements DataReader {
     } catch (IOException e) {
       throw new SQLException("IOException reading Clob " + e.getMessage());
     }
-
     return out.toString();
   }
 
@@ -226,19 +190,16 @@ public class RsetDataReader implements DataReader {
   }
 
   protected byte[] getBinaryLob(InputStream in) throws SQLException {
-
     if (in == null) {
       return null;
     }
     try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-
       byte[] buf = new byte[bufferSize];
       int len;
       while ((len = in.read(buf, 0, buf.length)) != -1) {
         out.write(buf, 0, len);
       }
       byte[] data = out.toByteArray();
-
       if (data.length == 0) {
         data = null;
       }

From 3add4472ef09f101fca17384ff523c98f070e77d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 14:58:08 +1200
Subject: [PATCH 242/447] Refactor internals
 DefaultRelationalQueryEngine.findListMapper()

- Remove findListMapper() method
- Introduce RowReader interface
- Combine findList internals for both SqlRow and RowMapper use
---
 .../server/core/RelationalQueryEngine.java    |  11 +-
 .../server/core/RelationalQueryRequest.java   |  31 ++----
 .../ebeaninternal/server/core/RowReader.java  |  14 +++
 .../query/DefaultRelationalQueryEngine.java   | 105 ++++++------------
 .../querydefn/DefaultRelationalQuery.java     |  19 +++-
 .../tests/query/sqlquery/SqlQueryTests.java   |   3 +-
 6 files changed, 76 insertions(+), 107 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/core/RowReader.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index 40f6d1a3c..86a439def 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -20,17 +20,17 @@ public interface RelationalQueryEngine {
   /**
    * Find a list of beans using relational query.
    */
-  List<SqlRow> findList(RelationalQueryRequest request);
+  <T> List<T> findList(RelationalQueryRequest request, RowReader<T> reader);
 
   /**
    * Find each query using relational query.
    */
-  void findEach(RelationalQueryRequest request, Consumer<SqlRow> consumer);
+  <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Consumer<T> consumer);
 
   /**
    * Find each while query using relational query.
    */
-  void findEach(RelationalQueryRequest request, Predicate<SqlRow> consumer);
+  <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer);
 
   /**
    * Find single attribute.
@@ -47,11 +47,6 @@ public interface RelationalQueryEngine {
    */
   <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.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 9f1413031..c0371e546 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -1,10 +1,6 @@
 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;
+import io.ebean.*;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlBinding;
 
@@ -63,7 +59,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   <T> List<T> findListMapper(RowMapper<T> mapper) {
     flushJdbcBatchOnQuery();
-    return queryEngine.findListMapper(this, mapper);
+    return queryEngine.findList(this, () -> mapper.map(resultSet, rows++));
   }
 
   <T> T findOneMapper(RowMapper<T> mapper) {
@@ -83,17 +79,17 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   public void findEach(Consumer<SqlRow> consumer) {
     flushJdbcBatchOnQuery();
-    queryEngine.findEach(this, consumer);
+    queryEngine.findEach(this, this::createNewRow, consumer);
   }
 
   public void findEachWhile(Predicate<SqlRow> consumer) {
     flushJdbcBatchOnQuery();
-    queryEngine.findEach(this, consumer);
+    queryEngine.findEach(this, this::createNewRow, consumer);
   }
 
   public List<SqlRow> findList() {
     flushJdbcBatchOnQuery();
-    return queryEngine.findList(this);
+    return queryEngine.findList(this, this::createNewRow);
   }
 
   /**
@@ -135,21 +131,14 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     return resultSet;
   }
 
-  public void incrementRows() {
-    rows++;
-  }
-
   @Override
   public boolean next() throws SQLException {
-    return resultSet.next();
-  }
-
-  public <T> List<T> mapList(RowMapper<T> mapper) throws SQLException {
-    List<T> list = new ArrayList<>();
-    while (next()) {
-      list.add(mapper.map(resultSet, rows++));
+    if (!resultSet.next()) {
+      return false;
+    } else {
+      rows++;
+      return true;
     }
-    return list;
   }
 
   public <T> T mapOne(RowMapper<T> mapper) throws SQLException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RowReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RowReader.java
new file mode 100644
index 000000000..2a7d0b119
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RowReader.java
@@ -0,0 +1,14 @@
+package io.ebeaninternal.server.core;
+
+import java.sql.SQLException;
+
+/**
+ * Read a row building a result for that row.
+ */
+public interface RowReader<T> {
+
+  /**
+   * Build and return a result for a row.
+   */
+  T read() throws SQLException;
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index f49df1d20..655c0863a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebean.RowConsumer;
 import io.ebean.RowMapper;
 import io.ebean.SqlRow;
+import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.MetricFactory;
@@ -10,10 +11,10 @@ import io.ebean.metric.TimedMetricMap;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.RelationalQueryEngine;
 import io.ebeaninternal.server.core.RelationalQueryRequest;
+import io.ebeaninternal.server.core.RowReader;
 import io.ebeaninternal.server.persist.Binder;
 
 import javax.persistence.PersistenceException;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -59,12 +60,11 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   }
 
   @Override
-  public void findEach(RelationalQueryRequest request, Predicate<SqlRow> consumer) {
-
+  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer) {
     try {
       request.executeSql(binder, SpiQuery.Type.ITERATE);
       while (request.next()) {
-        if (!consumer.test(readRow(request))) {
+        if (!consumer.test(reader.read())) {
           break;
         }
       }
@@ -79,12 +79,11 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   }
 
   @Override
-  public void findEach(RelationalQueryRequest request, Consumer<SqlRow> consumer) {
-
+  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Consumer<T> consumer) {
     try {
       request.executeSql(binder, SpiQuery.Type.ITERATE);
       while (request.next()) {
-        consumer.accept(readRow(request));
+        consumer.accept(reader.read());
       }
       request.logSummary();
 
@@ -112,22 +111,6 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
-  @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(errMsg(e.getMessage(), request.getSql()), e);
-
-    } finally {
-      request.close();
-    }
-  }
-
   @Override
   public void findEachRow(RelationalQueryRequest request, RowConsumer consumer) {
     try {
@@ -143,51 +126,17 @@ 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(errMsg(e.getMessage(), request.getSql()), e);
-
-    } finally {
-      request.close();
-    }
-  }
-
   @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);
-
+      final DataReader dataReader = binder.createDataReader(request.getResultSet());
       T value = null;
-      if (request.next()) {
-        request.incrementRows();
-        value = scalarType.read(binder.createDataReader(request.getResultSet()));
+      if (dataReader.next()) {
+        value = scalarType.read(dataReader);
       }
-
       request.logSummary();
       return value;
 
@@ -199,16 +148,17 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public List<SqlRow> findList(RelationalQueryRequest request) {
-
+  public <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls) {
+    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
     try {
-      request.executeSql(binder, SpiQuery.Type.LIST);
-      List<SqlRow> rows = new ArrayList<>();
-      while (request.next()) {
-        rows.add(readRow(request));
+      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
+      final DataReader dataReader = binder.createDataReader(request.getResultSet());
+      List<T> rows = new ArrayList<>();
+      while (dataReader.next()) {
+        rows.add(scalarType.read(dataReader));
       }
-
       request.logSummary();
       return rows;
 
@@ -220,11 +170,22 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
-  /**
-   * Read the row from the ResultSet and return as a MapBean.
-   */
-  private SqlRow readRow(RelationalQueryRequest request) throws SQLException {
-    return request.createNewRow();
+  @Override
+  public <T> List<T> findList(RelationalQueryRequest request, RowReader<T> reader) {
+    try {
+      request.executeSql(binder, SpiQuery.Type.LIST);
+      List<T> rows = new ArrayList<>();
+      while (request.next()) {
+        rows.add(reader.read());
+      }
+      request.logSummary();
+      return rows;
+    } catch (Exception e) {
+      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index ec5b3c01a..4cf446d0f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -23,9 +23,9 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
 
   private final transient SpiEbeanServer server;
 
-  private String label;
+  private final String query;
 
-  private String query;
+  private String label;
 
   private int firstRow;
 
@@ -208,19 +208,25 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return query;
   }
 
-  <T> T mapperFindOne(RowMapper<T> mapper) {
+  private <T> T mapperFindOne(RowMapper<T> mapper) {
     return server.findOneMapper(this, mapper);
   }
 
-  <T> List<T> mapperFindList(RowMapper<T> mapper) {
+  private <T> List<T> mapperFindList(RowMapper<T> mapper) {
     return server.findListMapper(this, mapper);
   }
 
+  private <T> void mapperFindEach(RowMapper<T> mapper, Consumer<T> consumer) {
+    server.findEachRow(this, (resultSet, rowNum) -> consumer.accept(mapper.map(resultSet, rowNum)));
+  }
+
+  @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
   public <T> TypeQuery<T> mapToScalar(Class<T> attributeType) {
     return new Scalar(attributeType);
   }
 
+  @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
   public <T> TypeQuery<T> mapTo(RowMapper<T> mapper) {
     return new Mapper(mapper);
@@ -272,5 +278,10 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     public List<T> findList() {
       return mapperFindList(mapper);
     }
+
+    //@Override
+    public void findEach(Consumer<T> consumer) {
+      mapperFindEach(mapper, consumer);
+    }
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index c79f07d21..7745b4ca6 100644
--- a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -2,7 +2,6 @@ package org.tests.query.sqlquery;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.Ebean;
 import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
@@ -361,7 +360,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    int expectedRows = Ebean.find(Order.class).findCount();
+    int expectedRows = DB.find(Order.class).findCount();
 
     final AtomicInteger count = new AtomicInteger();
 

From 1df2ccb1c6e84754f799ef8ecd60baabe1694bf5 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 15:19:35 +1200
Subject: [PATCH 243/447] Refactor internals DefaultRelationalQueryEngine
 remove unnecessary method

- Remove findEach() method that took RowReader<T> and Consumer<T>
- Use findEachRow() instead
---
 .../server/core/RelationalQueryEngine.java    | 25 +++++------
 .../server/core/RelationalQueryRequest.java   |  2 +-
 .../query/DefaultRelationalQueryEngine.java   | 42 ++++++-------------
 3 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index 86a439def..4e34a3894 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -22,16 +22,21 @@ public interface RelationalQueryEngine {
    */
   <T> List<T> findList(RelationalQueryRequest request, RowReader<T> reader);
 
-  /**
-   * Find each query using relational query.
-   */
-  <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Consumer<T> consumer);
-
   /**
    * Find each while query using relational query.
    */
   <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer);
 
+  /**
+   * Find each via raw consumer.
+   */
+  void findEachRow(RelationalQueryRequest request, RowConsumer mapper);
+
+  /**
+   * Find one via mapper.
+   */
+  <T> T findOneMapper(RelationalQueryRequest request, RowMapper<T> mapper);
+
   /**
    * Find single attribute.
    */
@@ -42,16 +47,6 @@ 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 each via raw consumer.
-   */
-  void findEachRow(RelationalQueryRequest request, RowConsumer mapper);
-
   /**
    * Collect SQL query execution statistics.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index c0371e546..250186c2d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -79,7 +79,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   public void findEach(Consumer<SqlRow> consumer) {
     flushJdbcBatchOnQuery();
-    queryEngine.findEach(this, this::createNewRow, consumer);
+    queryEngine.findEachRow(this, (resultSet, rowNum) -> consumer.accept(createNewRow()));
   }
 
   public void findEachWhile(Predicate<SqlRow> consumer) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index 655c0863a..b150c9c4b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -17,7 +17,6 @@ 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;
 
 /**
@@ -60,14 +59,10 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   }
 
   @Override
-  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer) {
+  public void findEachRow(RelationalQueryRequest request, RowConsumer consumer) {
     try {
       request.executeSql(binder, SpiQuery.Type.ITERATE);
-      while (request.next()) {
-        if (!consumer.test(reader.read())) {
-          break;
-        }
-      }
+      request.mapEach(consumer);
       request.logSummary();
 
     } catch (Exception e) {
@@ -79,11 +74,13 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   }
 
   @Override
-  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Consumer<T> consumer) {
+  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer) {
     try {
       request.executeSql(binder, SpiQuery.Type.ITERATE);
       while (request.next()) {
-        consumer.accept(reader.read());
+        if (!consumer.test(reader.read())) {
+          break;
+        }
       }
       request.logSummary();
 
@@ -112,12 +109,15 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   }
 
   @Override
-  public void findEachRow(RelationalQueryRequest request, RowConsumer consumer) {
+  public <T> List<T> findList(RelationalQueryRequest request, RowReader<T> reader) {
     try {
       request.executeSql(binder, SpiQuery.Type.LIST);
-      request.mapEach(consumer);
+      List<T> rows = new ArrayList<>();
+      while (request.next()) {
+        rows.add(reader.read());
+      }
       request.logSummary();
-
+      return rows;
     } catch (Exception e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
 
@@ -170,22 +170,4 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
-  @Override
-  public <T> List<T> findList(RelationalQueryRequest request, RowReader<T> reader) {
-    try {
-      request.executeSql(binder, SpiQuery.Type.LIST);
-      List<T> rows = new ArrayList<>();
-      while (request.next()) {
-        rows.add(reader.read());
-      }
-      request.logSummary();
-      return rows;
-    } catch (Exception e) {
-      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
-
-    } finally {
-      request.close();
-    }
-  }
-
 }

From f3af43a9ceb2606b067ab711ac49eb53f84f562e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 15:49:48 +1200
Subject: [PATCH 244/447] Add support for findEach() on SqlQuery with RowMapper
 and scalar result

---
 .../src/main/java/io/ebean/SqlQuery.java      |  5 +++
 .../io/ebeaninternal/api/SpiEbeanServer.java  |  5 +++
 .../server/core/DefaultServer.java            |  5 +++
 .../server/core/RelationalQueryEngine.java    |  9 ++++-
 .../server/core/RelationalQueryRequest.java   | 12 ++++--
 .../query/DefaultRelationalQueryEngine.java   | 24 ++++++++++-
 .../querydefn/DefaultRelationalQuery.java     | 11 ++++-
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  4 ++
 .../tests/query/sqlquery/SqlQueryTests.java   | 40 +++++++++++++++++++
 9 files changed, 107 insertions(+), 8 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/SqlQuery.java b/ebean-api/src/main/java/io/ebean/SqlQuery.java
index 8b5452ee7..46b26c90a 100644
--- a/ebean-api/src/main/java/io/ebean/SqlQuery.java
+++ b/ebean-api/src/main/java/io/ebean/SqlQuery.java
@@ -365,5 +365,10 @@ public interface SqlQuery extends Serializable {
      * Return the list of values.
      */
     List<T> findList();
+
+    /**
+     * Find streaming the result effectively consuming a row at a time.
+     */
+    void findEach(Consumer<T> consumer);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index deb9c281c..a2e572904 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -234,6 +234,11 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
    */
   <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls);
 
+  /**
+   * SqlQuery find single attribute streaming the result to a consumer.
+   */
+  <T> void findSingleAttributeEach(SpiSqlQuery query, Class<T> cls, Consumer<T> consumer);
+
   /**
    * SqlQuery find one with mapper.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 6595d9816..81c16cf41 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1606,6 +1606,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return executeSqlQuery((req) -> req.findOneMapper(mapper), query);
   }
 
+  @Override
+  public <T> void findSingleAttributeEach(SpiSqlQuery query, Class<T> cls, Consumer<T> consumer) {
+    executeSqlQuery((req) -> req.findSingleAttributeEach(cls, consumer), query);
+  }
+
   @Override
   public <T> List<T> findSingleAttributeList(SpiSqlQuery query, Class<T> cls) {
     return executeSqlQuery((req) -> req.findSingleAttributeList(cls), query);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
index 4e34a3894..e9d18797a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -30,12 +30,12 @@ public interface RelationalQueryEngine {
   /**
    * Find each via raw consumer.
    */
-  void findEachRow(RelationalQueryRequest request, RowConsumer mapper);
+  void findEach(RelationalQueryRequest request, RowConsumer mapper);
 
   /**
    * Find one via mapper.
    */
-  <T> T findOneMapper(RelationalQueryRequest request, RowMapper<T> mapper);
+  <T> T findOne(RelationalQueryRequest request, RowMapper<T> mapper);
 
   /**
    * Find single attribute.
@@ -47,6 +47,11 @@ public interface RelationalQueryEngine {
    */
   <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls);
 
+  /**
+   * Find single attribute streaming the result to a consumer.
+   */
+  <T> void findSingleAttributeEach(RelationalQueryRequest request, Class<T> cls, Consumer<T> consumer);
+
   /**
    * Collect SQL query execution statistics.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 250186c2d..9a0ceb153 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -53,7 +53,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   boolean findEachRow(RowConsumer mapper) {
     flushJdbcBatchOnQuery();
-    queryEngine.findEachRow(this, mapper);
+    queryEngine.findEach(this, mapper);
     return true;
   }
 
@@ -64,7 +64,13 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   <T> T findOneMapper(RowMapper<T> mapper) {
     flushJdbcBatchOnQuery();
-    return queryEngine.findOneMapper(this, mapper);
+    return queryEngine.findOne(this, mapper);
+  }
+
+  public <T> boolean findSingleAttributeEach(Class<T> cls, Consumer<T> consumer) {
+    flushJdbcBatchOnQuery();
+    queryEngine.findSingleAttributeEach(this, cls, consumer);
+    return true;
   }
 
   public <T> List<T> findSingleAttributeList(Class<T> cls) {
@@ -79,7 +85,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   public void findEach(Consumer<SqlRow> consumer) {
     flushJdbcBatchOnQuery();
-    queryEngine.findEachRow(this, (resultSet, rowNum) -> consumer.accept(createNewRow()));
+    queryEngine.findEach(this, (resultSet, rowNum) -> consumer.accept(createNewRow()));
   }
 
   public void findEachWhile(Predicate<SqlRow> consumer) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index b150c9c4b..78b9717d9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -17,6 +17,7 @@ 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;
 
 /**
@@ -59,7 +60,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   }
 
   @Override
-  public void findEachRow(RelationalQueryRequest request, RowConsumer consumer) {
+  public void findEach(RelationalQueryRequest request, RowConsumer consumer) {
     try {
       request.executeSql(binder, SpiQuery.Type.ITERATE);
       request.mapEach(consumer);
@@ -93,7 +94,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
   }
 
   @Override
-  public <T> T findOneMapper(RelationalQueryRequest request, RowMapper<T> mapper) {
+  public <T> T findOne(RelationalQueryRequest request, RowMapper<T> mapper) {
     try {
       request.executeSql(binder, SpiQuery.Type.BEAN);
       T value = request.mapOne(mapper);
@@ -170,4 +171,23 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
     }
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> void findSingleAttributeEach(RelationalQueryRequest request, Class<T> cls, Consumer<T> consumer) {
+    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
+    try {
+      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
+      final DataReader dataReader = binder.createDataReader(request.getResultSet());
+      while (dataReader.next()) {
+        consumer.accept(scalarType.read(dataReader));
+      }
+      request.logSummary();
+
+    } catch (Exception e) {
+      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
+
+    } finally {
+      request.close();
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index 4cf446d0f..182b1cfd4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -254,6 +254,15 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     public List<T> findList() {
       return findSingleAttributeList(type);
     }
+
+    @Override
+    public void findEach(Consumer<T> consumer) {
+      scalarFindEach(type, consumer);
+    }
+  }
+
+  private <T> void scalarFindEach(Class<T> type, Consumer<T> consumer) {
+    server.findSingleAttributeEach(this, type, consumer);
   }
 
   private class Mapper<T> implements SqlQuery.TypeQuery<T> {
@@ -279,7 +288,7 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
       return mapperFindList(mapper);
     }
 
-    //@Override
+    @Override
     public void findEach(Consumer<T> consumer) {
       mapperFindEach(mapper, consumer);
     }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 03ed3362f..71e73b59f 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -493,6 +493,10 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <T> void findSingleAttributeEach(SpiSqlQuery query, Class<T> cls, Consumer<T> consumer) {
+  }
+
   @Override
   public <T> T findOneMapper(SpiSqlQuery query, RowMapper<T> mapper) {
     return null;
diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 7745b4ca6..572ebf39e 100644
--- a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -39,6 +39,28 @@ public class SqlQueryTests extends BaseTestCase {
     assertThat(lineAmounts).isNotEmpty();
   }
 
+  @Test
+  public void findSingleAttributeEach_decimal() {
+
+    ResetBasicData.reset();
+
+    String sql = "select (unit_price * order_qty) from o_order_detail where unit_price > ? order by (unit_price * order_qty) desc";
+
+    AtomicLong counter = new AtomicLong();
+    AtomicLong inc = new AtomicLong();
+
+    DB.sqlQuery(sql)
+      .setParameter(3)
+      .mapToScalar(BigDecimal.class)
+      .findEach(val -> {
+        counter.incrementAndGet();
+        inc.addAndGet(val.longValue());
+      });
+
+    assertThat(inc.get()).isGreaterThan(counter.get());
+    assertThat(counter.get()).isGreaterThan(0);
+  }
+
   @Test
   public void findSingleDecimal() {
 
@@ -141,6 +163,24 @@ public class SqlQueryTests extends BaseTestCase {
 
   private static final CustMapper CUST_MAPPER = new CustMapper();
 
+  @Test
+  public void findEach_mapper() {
+
+    ResetBasicData.reset();
+
+    String sql = "select id, name, status from o_customer where name is not null";
+
+    AtomicInteger counter = new AtomicInteger();
+    DB.sqlQuery(sql)
+      .mapTo(CUST_MAPPER)
+      .findEach(custDto -> {
+        counter.incrementAndGet();
+        assertThat(custDto.name).isNotNull();
+      });
+
+    assertThat(counter.get()).isGreaterThan(0);
+  }
+
   @Test
   public void findOne_mapper() {
 

From c8345ce09365d1a5b03cf59645fdd74b27c187d1 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 16:21:15 +1200
Subject: [PATCH 245/447] No functional change - refactor internal toStream()
 to use closure rather than explicit Runnable type for closing the stream

Conceptually javac closure might be better than an extra explicit type here
---
 .../ebeaninternal/server/core/DefaultServer.java | 16 +---------------
 .../org/tests/query/TestQueryFindStream.java     | 12 +++++++++---
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 81c16cf41..c39addd6a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1444,21 +1444,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   private <T> Stream<T> toStream(QueryIterator<T> queryIterator) {
-    return stream(spliteratorUnknownSize(queryIterator, Spliterator.ORDERED), false)
-      .onClose(new QueryIteratorClose(queryIterator));
-  }
-
-  private static class QueryIteratorClose implements Runnable {
-    private final QueryIterator<?> iterator;
-
-    private QueryIteratorClose(QueryIterator<?> iterator) {
-      this.iterator = iterator;
-    }
-
-    @Override
-    public void run() {
-      iterator.close();
-    }
+    return stream(spliteratorUnknownSize(queryIterator, Spliterator.ORDERED), false).onClose(queryIterator::close);
   }
 
   @Override
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java
index b05ada969..c4a852f38 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java
@@ -39,9 +39,7 @@ public class TestQueryFindStream extends BaseTestCase {
 
   @Test
   public void findLargeStream_basic() {
-
     ResetBasicData.reset();
-
     try (Stream<Customer> stream = DB.find(Customer.class)
       .findLargeStream()) {
 
@@ -61,8 +59,16 @@ public class TestQueryFindStream extends BaseTestCase {
   }
 
   @Test
-  public void manualTest_findSteam_when_streamNotClosed_connectionLeak() {
+  public void manualTest_findSteam_when_closeWithResources() {
+    // confirm manually the stream is closed via try with resources block
+    try (Stream<Customer> stream = DB.find(Customer.class).findStream()) {
+      // silly assert
+      assertThat(stream.hashCode()).isNotZero();
+    }
+  }
 
+  @Test
+  public void manualTest_findSteam_when_streamNotClosed_connectionLeak() {
     Stream<Customer> stream = DB.find(Customer.class).findStream();
     // remember a steam MUST be closed or we leak resources
     // comment out the close(); below to leak a connection

From 678743cc10312afc86a14fb3fd43aa72484b8139 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 21:59:19 +1200
Subject: [PATCH 246/447] Use upper case E for class name of generated
 _Ebean$ModuleInfo

---
 .../io/ebean/querybean/generator/SimpleModuleInfoWriter.java    | 2 +-
 .../io/ebean/querybean/generator/SimpleModuleInfoWriter.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index 04d1c270c..a5683165d 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -24,7 +24,7 @@ class SimpleModuleInfoWriter {
   SimpleModuleInfoWriter(ProcessingContext processingContext) {
     this.processingContext = processingContext;
     this.factoryPackage = processingContext.getFactoryPackage();
-    this.factoryShortName = "_ebean$ModuleInfo";
+    this.factoryShortName = "_Ebean$ModuleInfo";
     this.factoryFullName = factoryPackage + "." + factoryShortName;
   }
 
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index e7e2826eb..e9f8c30f0 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -24,7 +24,7 @@ class SimpleModuleInfoWriter {
   SimpleModuleInfoWriter(ProcessingContext processingContext) {
     this.processingContext = processingContext;
     this.factoryPackage = processingContext.getFactoryPackage();
-    this.factoryShortName = "_ebean$ModuleInfo";
+    this.factoryShortName = "_Ebean$ModuleInfo";
     this.factoryFullName = factoryPackage + "." + factoryShortName;
   }
 

From 0b87ae5eac20bdc6a8121549563ddee306f28008 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 23:38:10 +1200
Subject: [PATCH 247/447] No effective change - tidy BindParams

---
 .../src/main/java/io/ebeaninternal/api/BindParams.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index a45d98e6d..afb1e44b8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -155,7 +155,6 @@ public class BindParams implements Serializable {
    * Set an In Out parameter using position.
    */
   public void setParameter(int position, Object value, int outType) {
-
     Param p = getParam(position);
     p.setInValue(value);
     p.setOutType(outType);
@@ -178,8 +177,8 @@ public class BindParams implements Serializable {
    * Using position set the In value of a parameter. Note that for nulls you
    * must use setNullParameter.
    */
+  @SuppressWarnings("rawtypes")
   public void setParameter(int position, Object value) {
-
     Param p = getParam(position);
     if (value instanceof Collection) {
       // use of postgres ANY with positioned parameter
@@ -214,7 +213,6 @@ public class BindParams implements Serializable {
    * Set a named In Out parameter.
    */
   public void setParameter(String name, Object value, int outType) {
-
     Param p = getParam(name);
     p.setInValue(value);
     p.setOutType(outType);
@@ -232,7 +230,6 @@ public class BindParams implements Serializable {
    * Set a named In parameter that is not null.
    */
   public Param setParameter(String name, Object value) {
-
     Param p = getParam(name);
     p.setInValue(value);
     return p;
@@ -299,7 +296,6 @@ public class BindParams implements Serializable {
    * Return true if the bind hash and count has not changed.
    */
   public boolean isSameBindHash() {
-
     if (bindHash == null) {
       bindHash = calcQueryPlanHash();
       return false;
@@ -330,10 +326,6 @@ public class BindParams implements Serializable {
 
     private final StringBuilder preparedSql;
 
-    public OrderedList() {
-      this(new ArrayList<>());
-    }
-
     public OrderedList(List<Param> paramList) {
       this.paramList = paramList;
       this.preparedSql = new StringBuilder();

From 33ac1923ff1f96c744abb9aae36b02a5aa078ac4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 9 Jun 2021 23:40:48 +1200
Subject: [PATCH 248/447] No effective change - refactor move Str into
 server.util package

Allows the removal of io.ebeaninternal.server.lib package as that was the only thing in there.
---
 .../server/core/AbstractSqlQueryRequest.java        |  2 +-
 .../server/core/PersistRequestUpdateSql.java        |  2 +-
 .../java/io/ebeaninternal/server/lib/package.html   | 13 -------------
 .../server/persist/dml/DmlHandler.java              |  2 +-
 .../io/ebeaninternal/server/query/CQueryEngine.java |  2 +-
 .../io/ebeaninternal/server/query/CQueryPlan.java   |  2 +-
 .../server/transaction/JdbcTransaction.java         |  2 +-
 .../server/transaction/SavepointTransaction.java    |  2 +-
 .../io/ebeaninternal/server/{lib => util}/Str.java  |  3 +--
 9 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/lib/package.html
 rename ebean-core/src/main/java/io/ebeaninternal/server/{lib => util}/Str.java (96%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 3c1050faf..8a5e9214d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.core;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.*;
-import io.ebeaninternal.server.lib.Str;
+import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.TrimLogSql;
 import io.ebeaninternal.server.util.BindParamsParser;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 80471f5aa..f16a9d7cd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/ebean-core/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.Str;
+import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.PersistExecute;
 import io.ebeaninternal.server.persist.TrimLogSql;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/package.html b/ebean-core/src/main/java/io/ebeaninternal/server/lib/package.html
deleted file mode 100644
index a114cce65..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/package.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<HTML>
-<HEAD>
-  <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-  <TITLE>AvajeLib</TITLE>
-</HEAD>
-<Body BGCOLOR="#ffffff">
-Core services for an application.
-<P>
-  Core services including Logging, Deployment properties and Background thread for
-  running frequent tasks.
-</P>
-</Body>
-</HTML>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index ac870b65e..189613808 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/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.Str;
+import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.BatchedPstmt;
 import io.ebeaninternal.server.persist.BatchedPstmtHolder;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 6e4804ca6..c632c9aeb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -16,7 +16,7 @@ import io.ebeaninternal.server.core.DiffHelp;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.lib.Str;
+import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.Binder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 86e8d209d..295cbe7c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -13,7 +13,7 @@ import io.ebeaninternal.api.SpiQueryBindCapture;
 import io.ebeaninternal.api.SpiQueryPlan;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
-import io.ebeaninternal.server.lib.Str;
+import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataBindCapture;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 7d3b3ddf1..9f59c44bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/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.Str;
+import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.BatchedSqlException;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index b50122f5c..dafaa05b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/ebean-core/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.Str;
+import io.ebeaninternal.server.util.Str;
 
 import javax.persistence.PersistenceException;
 import java.sql.Connection;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/Str.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/Str.java
similarity index 96%
rename from ebean-core/src/main/java/io/ebeaninternal/server/lib/Str.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/util/Str.java
index 02b3d9e37..56788dc98 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/Str.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/Str.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.lib;
+package io.ebeaninternal.server.util;
 
 /**
  * String utility for adding strings together.
@@ -11,7 +11,6 @@ public class Str {
    * Append strings together.
    */
   public static String add(String s0, String s1, String... args) {
-
     // determine a decent buffer size
     int len = 16 + s0.length();
     if (s1 != null) {

From 4fd462b1c8cf4f8fc0ac1f30940a6680e52b59b5 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 13:34:33 +1200
Subject: [PATCH 249/447] #2244 - ENH: Add SQL Server support for transparent
 encryption via EncryptByPassPhrase, DecryptByPassPhrase

---
 .../config/dbplatform/AbstractDbEncrypt.java  |  6 ---
 .../config/dbplatform/h2/H2DbEncrypt.java     |  2 -
 .../dbplatform/mysql/MySqlDbEncrypt.java      |  2 -
 .../dbplatform/oracle/OracleDbEncrypt.java    |  1 -
 .../sqlserver/SqlServerBasePlatform.java      |  1 +
 .../sqlserver/SqlServerDbEncrypt.java         | 46 +++++++++++++++++++
 .../org/tests/basic/encrypt/TestEncrypt.java  |  6 +--
 .../org/tests/model/basic/EBasicEncrypt.java  |  2 +-
 8 files changed, 51 insertions(+), 15 deletions(-)
 create mode 100644 ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerDbEncrypt.java

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java
index be2c0941e..6f8e27556 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java
@@ -9,9 +9,6 @@ import java.sql.Types;
  * functions for varchar, date and timestamp. If they are left null then that is
  * treated as though that data type can not be encrypted in the DB and will
  * instead use java client encryption.
- * </p>
- *
- * @author rbygrave
  */
 public abstract class AbstractDbEncrypt implements DbEncrypt {
 
@@ -47,13 +44,10 @@ public abstract class AbstractDbEncrypt implements DbEncrypt {
       case Types.CHAR:
       case Types.LONGVARCHAR:
         return varcharEncryptFunction;
-
       case Types.DATE:
         return dateEncryptFunction;
-
       case Types.TIMESTAMP:
         return timestampEncryptFunction;
-
       default:
         return null;
     }
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java
index ec7b1d9a7..f3eeeffa0 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java
@@ -5,8 +5,6 @@ import io.ebean.config.dbplatform.DbEncryptFunction;
 
 /**
  * H2 encryption support via encrypt decrypt function.
- *
- * @author rbygrave
  */
 public class H2DbEncrypt extends AbstractDbEncrypt {
 
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java
index 2a22d8ab2..f8717936b 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java
@@ -5,8 +5,6 @@ import io.ebean.config.dbplatform.DbEncryptFunction;
 
 /**
  * MySql aes_encrypt aes_decrypt based encryption support.
- *
- * @author rbygrave
  */
 public class MySqlDbEncrypt extends AbstractDbEncrypt {
 
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java
index e1194ac37..2eae251a9 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java
@@ -60,7 +60,6 @@ public class OracleDbEncrypt extends AbstractDbEncrypt {
    * @param decryptFunction the decrypt stored procedure
    */
   public OracleDbEncrypt(String encryptFunction, String decryptFunction) {
-
     this.varcharEncryptFunction = new OraVarcharFunction(encryptFunction, decryptFunction);
     this.dateEncryptFunction = new OraDateFunction(encryptFunction, decryptFunction);
   }
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
index 8a9c5b4be..4490c148d 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java
@@ -25,6 +25,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     this.platform = Platform.SQLSERVER;
     // disable persistBatchOnCascade mode for
     // SQL Server unless we are using sequences
+    this.dbEncrypt = new SqlServerDbEncrypt();
     this.persistBatchOnCascade = PersistBatch.NONE;
     this.idInExpandedForm = true;
     this.selectCountWithAlias = true;
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerDbEncrypt.java
new file mode 100644
index 000000000..5647483cd
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerDbEncrypt.java
@@ -0,0 +1,46 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.config.dbplatform.AbstractDbEncrypt;
+import io.ebean.config.dbplatform.DbEncryptFunction;
+
+/**
+ * SQL Server EncryptByPassPhrase DecryptByPassPhrase based encryption support.
+ */
+public class SqlServerDbEncrypt extends AbstractDbEncrypt {
+
+  public SqlServerDbEncrypt() {
+    this.varcharEncryptFunction = new VarcharFunction();
+    this.dateEncryptFunction = new DateFunction();
+  }
+
+  @Override
+  public boolean isBindEncryptDataFirst() {
+    return false;
+  }
+
+  private static class VarcharFunction implements DbEncryptFunction {
+
+    @Override
+    public String getDecryptSql(String columnWithTableAlias) {
+      return "convert(nvarchar,DecryptByPassPhrase(?," + columnWithTableAlias + "))";
+    }
+
+    @Override
+    public String getEncryptBindSql() {
+      return "EncryptByPassPhrase(?,?)";
+    }
+  }
+
+  private static class DateFunction implements DbEncryptFunction {
+
+    @Override
+    public String getDecryptSql(String columnWithTableAlias) {
+      return "cast(convert(nvarchar,DecryptByPassPhrase(?," + columnWithTableAlias + ")) as date)";
+    }
+
+    @Override
+    public String getEncryptBindSql() {
+      return "EncryptByPassPhrase(?,format(?,'yyyy-MM-dd'))";
+    }
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
index 80b4c9061..fb80fcabb 100644
--- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
+++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
@@ -22,7 +22,7 @@ public class TestEncrypt extends BaseTestCase {
 
 
   @Test
-  @ForPlatform(Platform.H2) // only run this on H2 - PGCrypto not happy on CI server
+  @ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server
   public void testQueryBind() {
 
     LoggedSqlCollector.start();
@@ -36,7 +36,7 @@ public class TestEncrypt extends BaseTestCase {
   }
 
   @Test
-  @ForPlatform(Platform.H2) // only run this on H2 - PGCrypto not happy on CI server
+  @ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server
   public void testQueryJoin() {
 
     LoggedSqlCollector.start();
@@ -99,7 +99,7 @@ public class TestEncrypt extends BaseTestCase {
   }
 
   @Test
-  @ForPlatform(Platform.H2)
+  @ForPlatform({Platform.H2, Platform.SQLSERVER})
   public void test() {
 
     DB.find(EBasicEncrypt.class).delete();
diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java
index 859212781..31cbcab7a 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java
@@ -28,7 +28,7 @@ public class EBasicEncrypt {
   @Encrypted(dbLength = 80)
   String description;
 
-  @Encrypted(dbLength = 20)
+  @Encrypted(dbLength = 80)
   Date dob;
 
   @Enumerated(EnumType.ORDINAL)

From 37dff62fa9ed60f54b81793996d8c125eee8456c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 14:55:31 +1200
Subject: [PATCH 250/447] #2246 - ENH: Add DtoQuery findStream() and
 findIterate()

---
 .../src/main/java/io/ebean/DtoQuery.java      | 21 ++++++
 .../src/main/java/io/ebean/QueryIterator.java |  2 +-
 .../io/ebeaninternal/api/SpiEbeanServer.java  | 21 +++---
 .../server/core/DefaultServer.java            | 26 ++++---
 .../server/core/DtoQueryRequest.java          |  6 ++
 .../server/query/DtoQueryEngine.java          | 11 +++
 .../server/query/DtoQueryIterator.java        | 55 +++++++++++++++
 .../server/querydefn/DefaultDtoQuery.java     | 12 ++++
 .../src/test/java/io/ebean/DtoQuery2Test.java | 70 +++++++++++++++++++
 .../ebeaninternal/api/TDSpiEbeanServer.java   | 10 +++
 10 files changed, 216 insertions(+), 18 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java

diff --git a/ebean-api/src/main/java/io/ebean/DtoQuery.java b/ebean-api/src/main/java/io/ebean/DtoQuery.java
index 33f439b93..95ad6eff5 100644
--- a/ebean-api/src/main/java/io/ebean/DtoQuery.java
+++ b/ebean-api/src/main/java/io/ebean/DtoQuery.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 /**
  * Query for performing native SQL queries that return DTO Bean's.
@@ -45,6 +46,26 @@ public interface DtoQuery<T> {
   @Nonnull
   List<T> findList();
 
+  /**
+   * Execute the query iterating a row at a time.
+   * <p>
+   * Note that the QueryIterator holds resources related to the underlying
+   * resultSet and potentially connection and MUST be closed. We should use
+   * QueryIterator in a <em>try with resource block</em>.
+   */
+  @Nonnull
+  QueryIterator<T> findIterate();
+
+  /**
+   * Execute the query returning a Stream.
+   * <p>
+   * Note that the Stream holds resources related to the underlying
+   * resultSet and potentially connection and MUST be closed. We should use
+   * the Stream in a <em>try with resource block</em>.
+   */
+  @Nonnull
+  Stream<T> findStream();
+
   /**
    * Execute the query iterating a row at a time.
    * <p>
diff --git a/ebean-api/src/main/java/io/ebean/QueryIterator.java b/ebean-api/src/main/java/io/ebean/QueryIterator.java
index c158e62c6..2ac789073 100644
--- a/ebean-api/src/main/java/io/ebean/QueryIterator.java
+++ b/ebean-api/src/main/java/io/ebean/QueryIterator.java
@@ -56,7 +56,7 @@ import java.util.Iterator;
  *
  * @param <T> the type of entity bean in the iteration
  */
-public interface QueryIterator<T> extends Iterator<T>, java.io.Closeable {
+public interface QueryIterator<T> extends Iterator<T>, AutoCloseable {
 
   /**
    * Returns <tt>true</tt> if the iteration has more elements.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index a2e572904..daf6418d0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -1,14 +1,6 @@
 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;
-import io.ebean.RowMapper;
-import io.ebean.Transaction;
-import io.ebean.TxScope;
+import io.ebean.*;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.CallOrigin;
 import io.ebean.config.DatabaseConfig;
@@ -25,6 +17,7 @@ import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 /**
  * Service Provider extension to EbeanServer.
@@ -254,6 +247,16 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
    */
   void findEachRow(SpiSqlQuery query, RowConsumer consumer);
 
+  /**
+   * DTO findIterate query.
+   */
+  <T> QueryIterator<T> findDtoIterate(SpiDtoQuery<T> query);
+
+  /**
+   * DTO findStream query.
+   */
+  <T> Stream<T> findDtoStream(SpiDtoQuery<T> query);
+
   /**
    * DTO findList query.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index c39addd6a..231f0b718 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1433,14 +1433,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Nonnull
   @Override
   public <T> Stream<T> findStream(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, transaction);
-    try {
-      request.initTransIfRequired();
-      return toStream(request.findIterate());
-    } catch (RuntimeException ex) {
-      request.endTransIfRequired();
-      throw ex;
-    }
+    return toStream(findIterate(query, transaction));
   }
 
   private <T> Stream<T> toStream(QueryIterator<T> queryIterator) {
@@ -1640,6 +1633,23 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public <T> QueryIterator<T> findDtoIterate(SpiDtoQuery<T> query) {
+    DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
+    try {
+      request.initTransIfRequired();
+      return request.findIterate();
+    } catch (RuntimeException ex) {
+      request.endTransIfRequired();
+      throw ex;
+    }
+  }
+
+  @Override
+  public <T> Stream<T> findDtoStream(SpiDtoQuery<T> query) {
+    return toStream(findDtoIterate(query));
+  }
+
   @Override
   public <T> List<T> findDtoList(SpiDtoQuery<T> query) {
     DtoQueryRequest<T> request = new DtoQueryRequest<>(this, dtoQueryEngine, query);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index b988c83b5..f4cdbc236 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.QueryIterator;
 import io.ebean.core.type.DataReader;
 import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -90,6 +91,11 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
     }
   }
 
+  public QueryIterator<T> findIterate() {
+    flushJdbcBatchOnQuery();
+    return queryEngine.findIterate(this);
+  }
+
   public void findEach(Consumer<T> consumer) {
     flushJdbcBatchOnQuery();
     queryEngine.findEach(this, consumer);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
index bbd111f1c..46de28b8b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
@@ -1,10 +1,12 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.QueryIterator;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.DtoQueryRequest;
 import io.ebeaninternal.server.persist.Binder;
 
 import javax.persistence.PersistenceException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -34,6 +36,15 @@ public class DtoQueryEngine {
     }
   }
 
+  public <T> QueryIterator<T> findIterate(DtoQueryRequest<T> request) {
+    try {
+      request.executeSql(binder, SpiQuery.Type.ITERATE);
+      return new DtoQueryIterator<>(request);
+    } catch (SQLException e) {
+      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
+    }
+  }
+
   public <T> void findEach(DtoQueryRequest<T> request, Consumer<T> consumer) {
      try {
       request.executeSql(binder, SpiQuery.Type.ITERATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
new file mode 100644
index 000000000..cb22fdd3a
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
@@ -0,0 +1,55 @@
+package io.ebeaninternal.server.query;
+
+import io.ebean.QueryIterator;
+import io.ebeaninternal.server.core.DtoQueryRequest;
+
+import javax.persistence.PersistenceException;
+import java.sql.SQLException;
+
+class DtoQueryIterator<T> implements QueryIterator<T> {
+
+  private final DtoQueryRequest<T> request;
+  private boolean closed;
+
+  DtoQueryIterator(DtoQueryRequest<T> request) {
+    this.request = request;
+  }
+
+  @Override
+  public boolean hasNext() {
+    boolean result = false;
+    try {
+      result = request.next();
+      return result;
+    } catch (SQLException e) {
+      throw new PersistenceException(e);
+    } finally {
+      if (!result) {
+        close();
+      }
+    }
+  }
+
+  @Override
+  public T next() {
+    try {
+      return request.readNextBean();
+    } catch (SQLException e) {
+      throw new PersistenceException(e);
+    }
+  }
+
+  @Override
+  public void close() {
+    if (!closed) {
+      closed = true;
+      request.close();
+      request.endTransIfRequired();
+    }
+  }
+
+  @Override
+  public void remove() {
+    throw new IllegalStateException("remove() not allowed");
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index d5877572a..9afcb961f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.querydefn;
 
 import io.ebean.DtoQuery;
 import io.ebean.ProfileLocation;
+import io.ebean.QueryIterator;
 import io.ebean.Transaction;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiDtoQuery;
@@ -15,6 +16,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 /**
  * Default implementation of DtoQuery.
@@ -112,6 +114,16 @@ public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
     server.findDtoEachWhile(this, consumer);
   }
 
+  @Override
+  public QueryIterator<T> findIterate() {
+    return server.findDtoIterate(this);
+  }
+
+  @Override
+  public Stream<T> findStream() {
+    return server.findDtoStream(this);
+  }
+
   @Override
   public List<T> findList() {
     return server.findDtoList(this);
diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java
index 679fddd63..ba30e9a5c 100644
--- a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java
+++ b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java
@@ -6,10 +6,13 @@ import org.ebeantest.LoggedSqlCollector;
 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 java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -30,6 +33,73 @@ public class DtoQuery2Test extends BaseTestCase {
     assertThat(list).isNotEmpty();
   }
 
+  @Test
+  public void dto_findIterator_closeWithResources() {
+    ResetBasicData.reset();
+
+    int counter = 0;
+    try (QueryIterator<DCust> iterator = server()
+      .findDto(DCust.class, "select id, name from o_customer where id > ?")
+      .setParameter(0)
+      .findIterate()) {
+
+      if (iterator.hasNext()) {
+        counter++;
+      }
+    }
+
+    assertThat(counter).isEqualTo(1);
+  }
+
+  @Test
+  public void dto_findIterator() {
+    ResetBasicData.reset();
+    final int expectedCount = server().find(Customer.class).findCount();
+
+    LoggedSqlCollector.start();
+    int counter = 0;
+    try (final QueryIterator<DCust> iterator = server().findDto(DCust.class, "select id, name from o_customer where id > :id")
+      .setParameter("id", 0)
+      .findIterate()) {
+
+      while (iterator.hasNext()) {
+        final DCust cust = iterator.next();
+        counter++;
+        assertThat(cust).isNotNull();
+        assertThat(cust.getName()).isNotNull();
+      }
+    }
+
+    assertThat(counter).isEqualTo(expectedCount);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
+  }
+
+  @Test
+  public void dto_findStream() {
+    ResetBasicData.reset();
+    final int expectedCount = server().find(Customer.class).findCount();
+
+    LoggedSqlCollector.start();
+
+    try (final Stream<DCust> stream =
+           server()
+             .findDto(DCust.class, "select id, name from o_customer where id > ?")
+             .setParameter(0)
+             .findStream()) {
+
+      final List<String> names = stream
+        .map(DCust::getName)
+        .collect(Collectors.toList());
+
+      assertThat(names.size()).isEqualTo(expectedCount);
+    }
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
+  }
+
   @Test
   public void dto_findEach_constructorMatch() {
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 71e73b59f..f0f0c0779 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -453,6 +453,16 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   public <T> void findDtoEachWhile(SpiDtoQuery<T> query, Predicate<T> consumer) {
   }
 
+  @Override
+  public <T> QueryIterator<T> findDtoIterate(SpiDtoQuery<T> query) {
+    return null;
+  }
+
+  @Override
+  public <T> Stream<T> findDtoStream(SpiDtoQuery<T> query) {
+    return null;
+  }
+
   @Override
   public <T> List<T> findDtoList(SpiDtoQuery<T> query) {
     return null;

From 9be1dcff6c9369081e4950a26a54b68ffca334c0 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 19:00:35 +1200
Subject: [PATCH 251/447] Tidy internals ScalarTypeJsonObjectMapper, no
 functional change

---
 .../server/type/ScalarTypeJsonObjectMapper.java          | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index fc88f10da..b001e5ddf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -142,7 +142,7 @@ public class ScalarTypeJsonObjectMapper {
 
     private final ObjectMapper objectReader;
 
-    private JavaType deserType;
+    private final JavaType deserType;
 
     private final String pgType;
 
@@ -224,12 +224,7 @@ public class ScalarTypeJsonObjectMapper {
         if (value == null) {
           binder.setNull(Types.VARCHAR); // use varchar, otherwise SqlServer/db2 will fail with 'Invalid JDBC data type 5.001.'
         } else {
-          try {
-            String json = objectWriter.writeValueAsString(value);
-            binder.setString(json);
-          } catch (JsonProcessingException e) {
-            throw new SQLException("Unable to create JSON", e);
-          }
+          binder.setString(formatValue(value));
         }
       }
     }

From 3c36b434494f4bfe2031ee7c863beb647dfa959f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 19:26:56 +1200
Subject: [PATCH 252/447] No effective change - tidy EntityBeanIntercept

---
 .../io/ebean/bean/EntityBeanIntercept.java    | 61 ++++++-------------
 1 file changed, 20 insertions(+), 41 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 0c2333026..4695c4112 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -32,39 +32,47 @@ public final class EntityBeanIntercept implements Serializable {
   private static final int STATE_REFERENCE = 1;
   private static final int STATE_LOADED = 2;
 
+  /**
+   * Used when a bean is partially filled.
+   */
+  private static final byte FLAG_LOADED_PROP = 1;
+  private static final byte FLAG_CHANGED_PROP = 2;
+  private static final byte FLAG_CHANGEDLOADED_PROP = 3;
+  /**
+   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
+   * between an embedded bean being completely overwritten and one of its
+   * embedded properties being made dirty.
+   */
+  private static final byte FLAG_EMBEDDED_DIRTY = 4;
+  /**
+   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
+   * 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 transient final ReentrantLock lock = new ReentrantLock();
-
   private transient NodeUsageCollector nodeUsageCollector;
-
   private transient PersistenceContext persistenceContext;
-
   private transient BeanLoader beanLoader;
-
   private transient PreGetterCallback preGetterCallback;
 
   private String ebeanServerName;
-
   private boolean deletedFromCollection;
 
   /**
    * The actual entity bean that 'owns' this intercept.
    */
   private final EntityBean owner;
-
   private EntityBean embeddedOwner;
   private int embeddedOwnerIndex;
-
   /**
    * One of NEW, REF, UPD.
    */
   private int state;
-
   private boolean forceUpdate;
-
   private boolean readOnly;
-
   private boolean dirty;
-
   /**
    * Flag set to disable lazy loading - typically for SQL "report" type entity beans.
    */
@@ -74,37 +82,9 @@ public final class EntityBeanIntercept implements Serializable {
    * Flag set when lazy loading failed due to the underlying bean being deleted in the DB.
    */
   private boolean lazyLoadFailure;
-
-  /**
-   * Used when a bean is partially filled.
-   */
-  private static final byte FLAG_LOADED_PROP = 1;
-
-  /**
-   * Set of changed properties.
-   */
-  private static final byte FLAG_CHANGED_PROP = 2;
-
-  private static final byte FLAG_CHANGEDLOADED_PROP = 3;
-
-  /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
-   * between an embedded bean being completely overwritten and one of its
-   * embedded properties being made dirty.
-   */
-  private static final byte FLAG_EMBEDDED_DIRTY = 4;
-
-  /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
-   * 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 boolean loadedFromCache;
+  private final byte[] flags;
   private Object[] origValues;
   private Exception[] loadErrors;
   private int lazyLoadProperty = -1;
@@ -983,7 +963,6 @@ public final class EntityBeanIntercept implements Serializable {
     }
   }
 
-
   /**
    * Check for primitive boolean.
    */

From adfc54200fba0bd94ee42f15bc8ca66db1639f43 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 19:27:42 +1200
Subject: [PATCH 253/447] No effective change - extract JacksonTypeHelper for
 ScalarTypeJsonObjectMapper

---
 .../server/type/JacksonTypeHelper.java        | 46 +++++++++++++++++++
 .../type/ScalarTypeJsonObjectMapper.java      | 35 ++------------
 2 files changed, 49 insertions(+), 32 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java
new file mode 100644
index 000000000..1e1db244d
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java
@@ -0,0 +1,46 @@
+package io.ebeaninternal.server.type;
+
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.introspect.AnnotatedField;
+
+class JacksonTypeHelper {
+
+  private final AnnotatedField field;
+  private final ObjectMapper objectMapper;
+  private final JavaType javaType;
+  private final DeserializationConfig deserConfig;
+  private final AnnotationIntrospector ai;
+
+  JacksonTypeHelper(AnnotatedField field, ObjectMapper objectMapper) {
+    this.field = field;
+    this.objectMapper = objectMapper;
+    this.javaType = field.getType();
+    this.deserConfig = objectMapper.getDeserializationConfig();
+    this.ai = deserConfig.getAnnotationIntrospector();
+  }
+
+  JavaType type() {
+    if (ai == null || javaType == null || javaType.hasRawClass(Object.class)) {
+      return javaType;
+    } else {
+      try {
+        return ai.refineDeserializationType(deserConfig, field, javaType);
+      } catch (JsonMappingException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  ObjectWriter objectWriter() {
+    if (ai == null || javaType == null || javaType.hasRawClass(Object.class)) {
+      return objectMapper.writerFor(javaType);
+    } else {
+      try {
+        JavaType serType = ai.refineSerializationType(objectMapper.getSerializationConfig(), field, javaType);
+        return objectMapper.writerFor(serType);
+      } catch (JsonMappingException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index b001e5ddf..3cf05d9c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -3,13 +3,9 @@ package io.ebeaninternal.server.type;
 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 io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataBinder;
@@ -156,34 +152,9 @@ public class ScalarTypeJsonObjectMapper {
       this.pgType = pgType;
       this.docType = docType;
       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);
-       }
+      final JacksonTypeHelper helper = new JacksonTypeHelper(field, objectMapper);
+      this.deserType = helper.type();
+      this.objectWriter = helper.objectWriter();
     }
 
     /**

From 87ffcbf23e70c6c83c32afbff4f8e69ba5001336 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 19:45:27 +1200
Subject: [PATCH 254/447] No effective change - tidy CQuery

---
 .../io/ebeaninternal/server/query/CQuery.java | 43 ++-----------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 49182242e..0fb7e9dcf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -2,13 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.QueryIterator;
 import io.ebean.Version;
-import io.ebean.bean.BeanCollection;
-import io.ebean.bean.EntityBean;
-import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.bean.NodeUsageCollector;
-import io.ebean.bean.NodeUsageListener;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.bean.PersistenceContext;
+import io.ebean.bean.*;
 import io.ebean.core.type.DataReader;
 import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.util.JdbcClose;
@@ -19,12 +13,7 @@ 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.BeanCollectionHelpFactory;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import io.ebeaninternal.server.deploy.DbReadContext;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.deploy.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,11 +23,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -47,11 +32,9 @@ import java.util.concurrent.locks.ReentrantLock;
  * The SqlSelect is based on a tree (Object Graph). The tree is traversed to see
  * what parts are included in the tree according to the value of
  * find.getInclude();
- * </p>
  * <p>
  * The tree structure is flattened into a SqlSelectChain. The SqlSelectChain is
  * the key object used in reading the flat resultSet back into Objects.
- * </p>
  */
 public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTransactionEvent {
 
@@ -205,19 +188,15 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     this.query = request.getQuery();
     this.queryMode = query.getMode();
     this.lazyLoadManyProperty = query.getLazyLoadMany();
-
     this.readOnly = request.isReadOnly();
     this.disableLazyLoading = query.isDisableLazyLoading();
-
     this.objectGraphNode = query.getParentNode();
     this.profilingListener = query.getProfilingListener();
     this.autoTuneProfiling = profilingListener != null;
     this.profilingListenerRef = autoTuneProfiling ? new WeakReference<>(profilingListener) : null;
-
     // set the generated sql back to the query
     // so its available to the user...
     query.setGeneratedSql(queryPlan.getSql());
-
     SqlTree sqlTree = queryPlan.getSqlTree();
     this.rootNode = sqlTree.getRootNode();
     this.manyProperty = sqlTree.getManyProperty();
@@ -373,7 +352,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * Close the resources.
    * <p>
    * The JDBC resultSet and statement need to be closed. Its important that this method is called.
-   * </p>
    */
   public void close() {
     try {
@@ -405,14 +383,12 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
   @Override
   public void setLazyLoadedChildBean(EntityBean bean, Object lazyLoadParentId) {
-
     if (lazyLoadParentId != null) {
       if (!lazyLoadParentId.equals(this.lazyLoadParentId)) {
         // get the appropriate parent bean from the persistence context
         this.lazyLoadParentBean = (EntityBean) lazyLoadManyProperty.getBeanDescriptor().contextGet(getPersistenceContext(), lazyLoadParentId);
         this.lazyLoadParentId = lazyLoadParentId;
       }
-
       // add the loadedBean to the appropriate collection of lazyLoadParentBean
       lazyLoadManyProperty.addBeanToCollectionWithCreate(lazyLoadParentBean, bean, true);
     }
@@ -423,10 +399,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * <p>
    * If the query includes a many then the first object in the returned array is
    * the one/master and the second the many/detail.
-   * </p>
    */
   private boolean readNextBean() throws SQLException {
-
     if (!moveToNextRow()) {
       if (currentBean == null) {
         nextBean = null;
@@ -440,7 +414,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     }
 
     loadedBeanCount++;
-
     if (manyProperty == null) {
       // only single resultSet row required to build object so we are done
       // read a single resultSet row into single bean
@@ -535,20 +508,16 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * Read version beans and their effective dates.
    */
   List<Version<T>> readVersions() throws SQLException {
-
     List<Version<T>> versionList = new ArrayList<>();
-
     Version<T> version;
     while ((version = readNextVersion()) != null) {
       versionList.add(version);
     }
-
     updateExecutionStatistics();
     return versionList;
   }
 
   private Version<T> readNextVersion() throws SQLException {
-
     if (moveToNextRow()) {
       return rootNode.loadVersion(this);
     }
@@ -692,7 +661,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * Should we create profileNodes for beans created in this query.
    * <p>
    * This is true for all queries except lazy load bean queries.
-   * </p>
    */
   @Override
   public boolean isAutoTuneProfiling() {
@@ -703,13 +671,11 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   private String getPath(String propertyName) {
-
     if (currentPrefix == null) {
       return propertyName;
     } else if (propertyName == null) {
       return currentPrefix;
     }
-
     String path = currentPathMap.get(propertyName);
     if (path != null) {
       return path;
@@ -720,7 +686,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
   @Override
   public void profileBean(EntityBeanIntercept ebi, String prefix) {
-
     ObjectGraphNode node = request.getGraphContext().getObjectGraphNode(prefix);
     ebi.setNodeUsageCollector(new NodeUsageCollector(node, profilingListenerRef));
   }
@@ -745,7 +710,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * a find many query with read auditing so build the ReadEvent and log it.
    */
   void auditFindMany() {
-
     if (auditIds != null && !auditIds.isEmpty()) {
       // get the id values of the underlying collection
       ReadEvent futureReadEvent = query.getFutureFetchAudit();
@@ -783,7 +747,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    * Add the id to the audit id buffer and flush if needed in batches of 100.
    */
   private void auditNextBean() {
-
     if (auditIds == null) {
       auditIds = new ArrayList<>(100);
     }

From 9ee891dc66d9aae3f05068ddabec9a60e98d6096 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 20:09:34 +1200
Subject: [PATCH 255/447] #2247 - Refactor internals - Change
 DefaultTypeManager from class.newInstance() to
 class.getDeclaredConstructor().newInstance()

---
 .../server/type/DefaultTypeManager.java       | 56 ++++---------------
 1 file changed, 11 insertions(+), 45 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 7a2d82baa..8e62235a4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -3,11 +3,7 @@ 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;
-import io.ebean.annotation.EnumValue;
-import io.ebean.annotation.Platform;
+import io.ebean.annotation.*;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.JsonConfig;
 import io.ebean.config.PlatformConfig;
@@ -34,48 +30,19 @@ import org.slf4j.LoggerFactory;
 import javax.persistence.AttributeConverter;
 import javax.persistence.EnumType;
 import java.io.File;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 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;
+import java.net.*;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.time.DayOfWeek;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.Month;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Currency;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.UUID;
+import java.time.*;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -722,20 +689,18 @@ public final class DefaultTypeManager implements TypeManager {
       try {
         ScalarType<?> scalarType;
         if (objectMapper == null) {
-          scalarType = cls.newInstance();
+          scalarType = cls.getDeclaredConstructor().newInstance();
         } else {
           try {
             // first try objectMapper constructor
-            Constructor<? extends ScalarType<?>> constructor = cls.getConstructor(ObjectMapper.class);
-            scalarType = constructor.newInstance((ObjectMapper) objectMapper);
+            scalarType = cls.getDeclaredConstructor(ObjectMapper.class).newInstance(objectMapper);
           } catch (NoSuchMethodException e) {
-            scalarType = cls.newInstance();
+            scalarType = cls.getDeclaredConstructor().newInstance();
           }
         }
         addCustomType(scalarType);
       } catch (Exception e) {
-        String msg = "Error loading ScalarType [" + cls.getName() + "]";
-        logger.error(msg, e);
+        logger.error("Error loading ScalarType [" + cls.getName() + "]", e);
       }
     }
   }
@@ -768,7 +733,7 @@ public final class DefaultTypeManager implements TypeManager {
         if (wrappedType == null) {
           throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
         }
-        ScalarTypeConverter converter = foundType.newInstance();
+        ScalarTypeConverter converter = foundType.getDeclaredConstructor().newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, converter);
         logger.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType);
         add(stw);
@@ -793,7 +758,7 @@ public final class DefaultTypeManager implements TypeManager {
         if (wrappedType == null) {
           throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
         }
-        AttributeConverter converter = foundType.newInstance();
+        AttributeConverter converter = foundType.getDeclaredConstructor().newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, new AttributeConverterAdapter(converter));
         logger.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType);
         add(stw);
@@ -1027,6 +992,7 @@ public final class DefaultTypeManager implements TypeManager {
     nativeMap.put(Types.TIMESTAMP, timestampType);
   }
 
+  @SuppressWarnings("rawtypes")
   private void addInetAddressType(ScalarType scalarType) {
     addType(InetAddress.class, scalarType);
     addType(Inet4Address.class, scalarType);

From 441f51ed7916a5cdf605fc0217ec8203391a2090 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 20:30:07 +1200
Subject: [PATCH 256/447] #2247 - Refactor internals - Change
 DefaultTypeManager - tidy

---
 .../server/type/DefaultTypeManager.java       | 69 +++----------------
 1 file changed, 10 insertions(+), 59 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 8e62235a4..5f8a64699 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -49,77 +49,50 @@ import java.util.concurrent.ConcurrentHashMap;
  * Default implementation of TypeManager.
  * <p>
  * Manages the list of ScalarType that is available.
- * </p>
  */
 public final class DefaultTypeManager implements TypeManager {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultTypeManager.class);
 
   private final ConcurrentHashMap<Class<?>, ScalarType<?>> typeMap;
-
   private final ConcurrentHashMap<Integer, ScalarType<?>> nativeMap;
-
   private final ConcurrentHashMap<String, ScalarType<?>> logicalMap;
 
   private final DefaultTypeFactory extraTypeFactory;
 
   private final ScalarType<?> hstoreType = new ScalarTypePostgresHstore();
-
   private final ScalarTypeFile fileType = new ScalarTypeFile();
-
   private final ScalarType<?> charType = new ScalarTypeChar();
-
   private final ScalarType<?> charArrayType = new ScalarTypeCharArray();
-
   private final ScalarType<?> longVarcharType = new ScalarTypeLongVarchar();
-
   private final ScalarType<?> clobType = new ScalarTypeClob();
-
   private final ScalarType<?> byteType = new ScalarTypeByte();
-
   private final ScalarType<?> binaryType = new ScalarTypeBytesBinary();
-
   private final ScalarType<?> blobType = new ScalarTypeBytesBlob();
-
   private final ScalarType<?> varbinaryType = new ScalarTypeBytesVarbinary();
-
   private final ScalarType<?> longVarbinaryType = new ScalarTypeBytesLongVarbinary();
-
   private final ScalarType<?> shortType = new ScalarTypeShort();
-
   private final ScalarType<?> integerType = ScalarTypeInteger.INSTANCE;
-
   private final ScalarType<?> longType = new ScalarTypeLong();
-
   private final ScalarType<?> doubleType = new ScalarTypeDouble();
-
   private final ScalarType<?> floatType = new ScalarTypeFloat();
-
   private final ScalarType<?> bigDecimalType = new ScalarTypeBigDecimal();
-
   private final ScalarType<?> timeType = new ScalarTypeTime();
-
   private final ScalarType<?> urlType = new ScalarTypeURL();
   private final ScalarType<?> uriType = new ScalarTypeURI();
   private final ScalarType<?> localeType = new ScalarTypeLocale();
   private final ScalarType<?> currencyType = new ScalarTypeCurrency();
   private final ScalarType<?> timeZoneType = new ScalarTypeTimeZone();
-
   private final ScalarType<?> stringType = ScalarTypeString.INSTANCE;
-
   private final ScalarType<?> classType = new ScalarTypeClass();
 
   private final JsonConfig.DateTime jsonDateTime;
   private final JsonConfig.Date jsonDate;
 
   private final Object objectMapper;
-
   private final boolean objectMapperPresent;
-
   private final boolean postgres;
-
   private final boolean offlineMigrationGeneration;
-
   private final EnumType defaultEnumType;
 
   // OPTIONAL ScalarTypes registered if Jackson/JsonNode is in the classpath
@@ -158,7 +131,6 @@ public final class DefaultTypeManager implements TypeManager {
     this.typeMap = new ConcurrentHashMap<>();
     this.nativeMap = new ConcurrentHashMap<>();
     this.logicalMap = new ConcurrentHashMap<>();
-
     this.objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
     this.objectMapper = (objectMapperPresent) ? initObjectMapper(config) : null;
 
@@ -166,16 +138,13 @@ public final class DefaultTypeManager implements TypeManager {
     this.postgres = isPostgres(config.getDatabasePlatform());
     this.arrayTypeListFactory = arrayTypeListFactory(config.getDatabasePlatform());
     this.arrayTypeSetFactory = arrayTypeSetFactory(config.getDatabasePlatform());
-
     this.offlineMigrationGeneration = DbOffline.isGenerateMigration();
-
     this.defaultEnumType = config.getDefaultEnumType();
 
     initialiseStandard(config);
     initialiseJavaTimeTypes(config);
     initialiseJodaTypes(config);
     initialiseJacksonTypes(config);
-
     loadTypesFromProviders(config, objectMapper);
     loadGeoTypeBinder(config);
 
@@ -555,8 +524,7 @@ public final class DefaultTypeManager implements TypeManager {
   private ScalarTypeEnum<?> createEnumScalarType2(Class<?> enumType) {
     boolean integerType = true;
     Map<String, String> nameValueMap = new LinkedHashMap<>();
-    Field[] fields = enumType.getDeclaredFields();
-    for (Field field : fields) {
+    for (Field field : enumType.getDeclaredFields()) {
       EnumValue enumValue = AnnotationUtil.get(field, EnumValue.class);
       if (enumValue != null) {
         nameValueMap.put(field.getName(), enumValue.value());
@@ -619,8 +587,7 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private ScalarTypeEnum<?> createEnumScalarTypePerExtentions(Class<? extends Enum<?>> enumType) {
-    Method[] methods = enumType.getMethods();
-    for (Method method : methods) {
+    for (Method method : enumType.getMethods()) {
       DbEnumValue dbValue = AnnotationUtil.get(method, DbEnumValue.class);
       if (dbValue != null) {
         boolean integerValues = DbEnumType.INTEGER == dbValue.storage();
@@ -635,7 +602,6 @@ public final class DefaultTypeManager implements TypeManager {
    * Create the Mapping of Enum fields to DB values using EnumValue annotations.
    * <p>
    * Return null if the EnumValue annotations are not present/used.
-   * </p>
    */
   private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType, int length, boolean withConstraint) {
     Map<String, String> nameValueMap = new LinkedHashMap<>();
@@ -664,11 +630,11 @@ public final class DefaultTypeManager implements TypeManager {
     EnumToDbValueMap<?> beanDbMap = EnumToDbValueMap.create(integerType);
     int maxValueLen = 0;
     for (Map.Entry<String, String> entry : nameValueMap.entrySet()) {
-      String name = entry.getKey();
+      String name = entry.getKey().trim();
       String value = entry.getValue();
       maxValueLen = Math.max(maxValueLen, value.length());
-      Object enumValue = Enum.valueOf(enumType, name.trim());
-      beanDbMap.add(enumValue, value, name.trim());
+      Object enumValue = Enum.valueOf(enumType, name);
+      beanDbMap.add(enumValue, value, name);
     }
     if (dbColumnLength == 0 && !integerType) {
       dbColumnLength = maxValueLen;
@@ -678,11 +644,6 @@ public final class DefaultTypeManager implements TypeManager {
 
   /**
    * Automatically find any ScalarTypes by searching through the class path.
-   * <p>
-   * In avaje.properties define a list of packages in which ScalarTypes are
-   * found. This will search for any class that implements the ScalarType
-   * interface and register it with this TypeManager.
-   * </p>
    */
   private void initialiseCustomScalarTypes(BootupClasses bootupClasses) {
     for (Class<? extends ScalarType<?>> cls : bootupClasses.getScalarTypes()) {
@@ -720,8 +681,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   private void initialiseScalarConverters(BootupClasses bootupClasses) {
-    List<Class<? extends ScalarTypeConverter<?, ?>>> foundTypes = bootupClasses.getScalarConverters();
-    for (Class<? extends ScalarTypeConverter<?, ?>> foundType : foundTypes) {
+    for (Class<? extends ScalarTypeConverter<?, ?>> foundType : bootupClasses.getScalarConverters()) {
       try {
         Class<?>[] paramTypes = TypeReflectHelper.getParams(foundType, ScalarTypeConverter.class);
         if (paramTypes.length != 2) {
@@ -745,8 +705,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   private void initialiseAttributeConverters(BootupClasses bootupClasses) {
-    List<Class<? extends AttributeConverter<?, ?>>> foundTypes = bootupClasses.getAttributeConverters();
-    for (Class<? extends AttributeConverter<?, ?>> foundType : foundTypes) {
+    for (Class<? extends AttributeConverter<?, ?>> foundType : bootupClasses.getAttributeConverters()) {
       try {
         Class<?>[] paramTypes = TypeReflectHelper.getParams(foundType, AttributeConverter.class);
         if (paramTypes.length != 2) {
@@ -855,23 +814,16 @@ public final class DefaultTypeManager implements TypeManager {
 
     nativeMap.put(DbPlatformType.HSTORE, hstoreType);
 
-    ScalarType<?> utilDateType = extraTypeFactory.createUtilDate(jsonDateTime, jsonDate);
-    addType(java.util.Date.class, utilDateType);
-
-    ScalarType<?> calType = extraTypeFactory.createCalendar(jsonDateTime);
-    addType(Calendar.class, calType);
-
-    ScalarType<?> mathBigIntType = extraTypeFactory.createMathBigInteger();
-    addType(BigInteger.class, mathBigIntType);
+    addType(java.util.Date.class, extraTypeFactory.createUtilDate(jsonDateTime, jsonDate));
+    addType(Calendar.class, extraTypeFactory.createCalendar(jsonDateTime));
+    addType(BigInteger.class, extraTypeFactory.createMathBigInteger());
 
     ScalarTypeBool booleanType = extraTypeFactory.createBoolean();
     addType(Boolean.class, booleanType);
     addType(boolean.class, booleanType);
-
     // register the boolean literals to the platform for DDL default values
     databasePlatform.setDbTrueLiteral(booleanType.getDbTrueLiteral());
     databasePlatform.setDbFalseLiteral(booleanType.getDbFalseLiteral());
-
     // always register Types.BOOLEAN to our boolean type
     nativeMap.put(Types.BOOLEAN, booleanType);
     if (booleanType.getJdbcType() == Types.BIT) {
@@ -880,7 +832,6 @@ public final class DefaultTypeManager implements TypeManager {
     }
 
     PlatformConfig.DbUuid dbUuid = config.getPlatformConfig().getDbUuid();
-
     if (offlineMigrationGeneration || (databasePlatform.isNativeUuidType() && dbUuid.useNativeType())) {
       addType(UUID.class, new ScalarTypeUUIDNative());
     } else {

From 8ba66af878a4e788a16d77011ebdcc298d1c61d3 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 10 Jun 2021 22:11:45 +1200
Subject: [PATCH 257/447] Modify test TestQueryDefaultBatchSize to show use of
 ProfileLocation

---
 .../tests/query/lazy/TestQueryDefaultBatchSize.java    | 10 ++++++++++
 ebean-core/src/test/resources/ebean.properties         |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java
index a8685f985..e1d9afd02 100644
--- a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java
+++ b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java
@@ -2,6 +2,7 @@ package org.tests.query.lazy;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import io.ebean.ProfileLocation;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
@@ -13,12 +14,18 @@ import java.util.List;
 
 public class TestQueryDefaultBatchSize extends BaseTestCase {
 
+  private static final ProfileLocation loc0 = ProfileLocation.create();
+  private static final ProfileLocation loc1 = ProfileLocation.create();
+  private static final ProfileLocation loc2 = ProfileLocation.create();
+  private static final ProfileLocation loc3 = ProfileLocation.create();
+
   @Test
   public void test_findEach() {
 
     ResetBasicData.reset();
 
     Ebean.find(Order.class)
+      .setProfileLocation(loc0)
       .setLazyLoadBatchSize(2)
       .findEach(bean -> doStuff(bean));
   }
@@ -29,6 +36,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase {
     ResetBasicData.reset();
 
     Ebean.find(Order.class)
+      .setProfileLocation(loc1)
       .fetch("details", "id")
       .fetch("details.product", "sku")
       .fetch("customer")
@@ -44,6 +52,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase {
 
     List<Order> orders =
       Ebean.find(Order.class)
+        .setProfileLocation(loc2)
         .setLazyLoadBatchSize(2)
         .findList();
 
@@ -59,6 +68,7 @@ public class TestQueryDefaultBatchSize extends BaseTestCase {
 
     List<Order> orders =
       Ebean.find(Order.class)
+        .setProfileLocation(loc3)
         .fetch("details", "id")
         .fetch("details.product", "sku")
         .fetch("customer")
diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-core/src/test/resources/ebean.properties
index aa1210739..49aae2a31 100644
--- a/ebean-core/src/test/resources/ebean.properties
+++ b/ebean-core/src/test/resources/ebean.properties
@@ -26,7 +26,7 @@ datasource.default=h2
 #datasource.h2.capturestacktrace=true
 
 ebean.dumpMetricsOnShutdown=true
-ebean.dumpMetricsOptions=sql,hash
+ebean.dumpMetricsOptions=sql,hash,loc
 #ebean.queryPlan.thresholdMicros=1000
 ebean.queryPlan.enable=true
 

From 4e088a40d9d6fb6df72bbe45e944dc6611c6ea0b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 11 Jun 2021 00:08:03 +1200
Subject: [PATCH 258/447] Refactor DbJson Jackson handling adding
 DatabaseConfig.setJsonDirtyByDefault()

Adds the ability to change the default "jsonDirtyByDefault" configuration setting used with DbJson Jackson properties. Currently these default to being assumed dirty and this allows us to change that to be assumed not dirty (which is very likely the better default).
---
 .../java/io/ebean/config/DatabaseConfig.java  | 29 +++++-
 .../server/type/CheckMarkedDirty.java         | 26 -----
 .../server/type/DefaultTypeManager.java       |  7 +-
 .../server/type/ScalarTypeJsonCollection.java |  2 +-
 .../server/type/ScalarTypeJsonMap.java        |  2 +-
 .../type/ScalarTypeJsonObjectMapper.java      | 67 +++++--------
 .../server/type/ScalarTypePostgresHstore.java |  2 +-
 .../server/type/TypeJsonManager.java          | 98 +++++++++++++++++++
 .../io/ebean/config/ServerConfigTest.java     |  5 +
 .../org/tests/json/TestDbJson_Jackson3.java   |  3 +
 10 files changed, 166 insertions(+), 75 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/CheckMarkedDirty.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index be2ac6c1f..bc3ae587f 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -193,6 +193,12 @@ public class DatabaseConfig {
    */
   private JsonConfig.Include jsonInclude = JsonConfig.Include.ALL;
 
+  /**
+   * When true then by default DbJson beans are assumed to be dirty.
+   * I believe we want to change this default to false in the future.
+   */
+  private boolean jsonDirtyByDefault = true;
+
   /**
    * The database platform name. Used to imply a DatabasePlatform to use.
    */
@@ -737,6 +743,26 @@ public class DatabaseConfig {
     this.jsonInclude = jsonInclude;
   }
 
+  /**
+   * Return true if DbJson beans are assumed dirty by default.
+   * <p>
+   * That is, when true beans that do not implement ModifyAwareType are by
+   * default assumed to be dirty and included in updates.
+   */
+  public boolean isJsonDirtyByDefault() {
+    return jsonDirtyByDefault;
+  }
+
+  /**
+   * Set to false if we want DbJson beans to not be assumed to be dirty.
+   * <p>
+   * That is, when true beans that do not implement ModifyAwareType are by
+   * default assumed to be dirty and included in updates.
+   */
+  public void setJsonDirtyByDefault(boolean jsonDirtyByDefault) {
+    this.jsonDirtyByDefault = jsonDirtyByDefault;
+  }
+
   /**
    * Return the name of the Database.
    */
@@ -2909,6 +2935,7 @@ public class DatabaseConfig {
     jsonInclude = p.getEnum(JsonConfig.Include.class, "jsonInclude", jsonInclude);
     jsonDateTime = p.getEnum(JsonConfig.DateTime.class, "jsonDateTime", jsonDateTime);
     jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);
+    jsonDirtyByDefault = p.getBoolean("jsonDirtyByDefault", jsonDirtyByDefault);
 
     runMigration = p.getBoolean("migration.run", runMigration);
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
@@ -3369,7 +3396,7 @@ public class DatabaseConfig {
     this.loadModuleInfo = loadModuleInfo;
   }
 
-    public enum UuidVersion {
+  public enum UuidVersion {
     VERSION4,
     VERSION1,
     VERSION1RND
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/CheckMarkedDirty.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/CheckMarkedDirty.java
deleted file mode 100644
index 321a35fec..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/CheckMarkedDirty.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import io.ebean.ModifyAwareType;
-
-/**
- * Check dirty state of json value which might be modify aware.
- */
-class CheckMarkedDirty {
-
-  /**
-   * Return true if the value should be considered dirty (and included in an update).
-   */
-  static boolean isDirty(Object value) {
-    if (value instanceof ModifyAwareType) {
-      ModifyAwareType modifyAware = (ModifyAwareType) value;
-      if (modifyAware.isMarkedDirty()) {
-        // reset the dirty state (consider not dirty after update)
-        modifyAware.setMarkedDirty(false);
-        return true;
-      } else {
-        return false;
-      }
-    }
-    return true;
-  }
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 5f8a64699..82c3ff46a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -92,6 +92,7 @@ public final class DefaultTypeManager implements TypeManager {
   private final Object objectMapper;
   private final boolean objectMapperPresent;
   private final boolean postgres;
+  private final TypeJsonManager jsonManager;
   private final boolean offlineMigrationGeneration;
   private final EnumType defaultEnumType;
 
@@ -131,11 +132,11 @@ public final class DefaultTypeManager implements TypeManager {
     this.typeMap = new ConcurrentHashMap<>();
     this.nativeMap = new ConcurrentHashMap<>();
     this.logicalMap = new ConcurrentHashMap<>();
+    this.postgres = isPostgres(config.getDatabasePlatform());
     this.objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
     this.objectMapper = (objectMapperPresent) ? initObjectMapper(config) : null;
-
+    this.jsonManager = (objectMapperPresent) ? new TypeJsonManager(postgres, objectMapper, config.isJsonDirtyByDefault()) : null;
     this.extraTypeFactory = new DefaultTypeFactory(config);
-    this.postgres = isPostgres(config.getDatabasePlatform());
     this.arrayTypeListFactory = arrayTypeListFactory(config.getDatabasePlatform());
     this.arrayTypeSetFactory = arrayTypeSetFactory(config.getDatabasePlatform());
     this.offlineMigrationGeneration = DbOffline.isGenerateMigration();
@@ -425,7 +426,7 @@ public final class DefaultTypeManager implements TypeManager {
     if (objectMapper == null) {
       throw new IllegalArgumentException("Type [" + type + "] unsupported for @DbJson mapping - Jackson ObjectMapper not present");
     }
-    return ScalarTypeJsonObjectMapper.createTypeFor(postgres, (AnnotatedField) prop.getJacksonField(), (ObjectMapper) objectMapper, dbType, docType);
+    return ScalarTypeJsonObjectMapper.createTypeFor(jsonManager, (AnnotatedField) prop.getJacksonField(), dbType, docType);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
index a6c51ff05..e40e1a9ae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
@@ -61,7 +61,7 @@ abstract class ScalarTypeJsonCollection<T> extends ScalarTypeBase<T> implements
    */
   @Override
   public boolean isDirty(Object value) {
-    return CheckMarkedDirty.isDirty(value);
+    return TypeJsonManager.checkIsDirty(value);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index f0714c467..6dd4f900b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -123,7 +123,7 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
    */
   @Override
   public boolean isDirty(Object value) {
-    return CheckMarkedDirty.isDirty(value);
+    return TypeJsonManager.checkIsDirty(value);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 3cf05d9c2..5e24412b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
-import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
@@ -30,38 +29,23 @@ import java.util.Set;
 /**
  * Supports @DbJson properties using Jackson ObjectMapper.
  */
-public class ScalarTypeJsonObjectMapper {
+class ScalarTypeJsonObjectMapper {
 
   /**
    * Create and return the appropriate ScalarType.
    */
-  public static ScalarType<?> createTypeFor(boolean postgres, AnnotatedField field, ObjectMapper objectMapper,
-                                            int dbType, DocPropertyType docType) {
-
+  static ScalarType<?> createTypeFor(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
     Class<?> type = field.getRawType();
-    String pgType = getPostgresType(postgres, dbType);
     if (Set.class.equals(type)) {
-      return new OmSet(objectMapper, field, dbType, pgType, docType);
+      return new OmSet(jsonManager, field, dbType, docType);
     }
     if (List.class.equals(type)) {
-      return new OmList(objectMapper, field, dbType, pgType, docType);
+      return new OmList(jsonManager, field, dbType, docType);
     }
     if (Map.class.equals(type)) {
-      return new OmMap(objectMapper, field, dbType, pgType);
+      return new OmMap(jsonManager, field, dbType);
     }
-    return new GenericObject(objectMapper, field, dbType, pgType);
-  }
-
-  private static String getPostgresType(boolean postgres, int dbType) {
-    if (postgres) {
-      switch (dbType) {
-        case DbPlatformType.JSON:
-          return PostgresHelper.JSON_TYPE;
-        case DbPlatformType.JSONB:
-          return PostgresHelper.JSONB_TYPE;
-      }
-    }
-    return null;
+    return new GenericObject(jsonManager, field, dbType, type);
   }
 
   /**
@@ -69,8 +53,8 @@ public class ScalarTypeJsonObjectMapper {
    */
   private static class GenericObject extends Base<Object> {
 
-    public GenericObject(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType) {
-      super(Object.class, objectMapper, field, dbType, pgType, DocPropertyType.OBJECT);
+    GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, Class<?> rawType) {
+      super(Object.class, jsonManager, field, dbType, DocPropertyType.OBJECT, rawType);
     }
   }
 
@@ -80,8 +64,8 @@ public class ScalarTypeJsonObjectMapper {
   @SuppressWarnings("rawtypes")
   private static class OmSet extends Base<Set> {
 
-    public OmSet(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType, DocPropertyType docType) {
-      super(Set.class, objectMapper, field, dbType, pgType, docType);
+    OmSet(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+      super(Set.class, jsonManager, field, dbType, docType);
     }
 
     @Override
@@ -98,8 +82,8 @@ public class ScalarTypeJsonObjectMapper {
   @SuppressWarnings("rawtypes")
   private static class OmList extends Base<List> {
 
-    public OmList(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType, DocPropertyType docType) {
-      super(List.class, objectMapper, field, dbType, pgType, docType);
+    OmList(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+      super(List.class, jsonManager, field, dbType, docType);
     }
 
     @Override
@@ -116,8 +100,8 @@ public class ScalarTypeJsonObjectMapper {
   @SuppressWarnings("rawtypes")
   private static class OmMap extends Base<Map> {
 
-    public OmMap(ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType) {
-      super(Map.class, objectMapper, field, dbType, pgType, DocPropertyType.OBJECT);
+    OmMap(TypeJsonManager jsonManager, AnnotatedField field, int dbType) {
+      super(Map.class, jsonManager, field, dbType, DocPropertyType.OBJECT);
     }
 
     @Override
@@ -135,24 +119,23 @@ public class ScalarTypeJsonObjectMapper {
   private static abstract class Base<T> extends ScalarTypeBase<T> {
 
     private final ObjectWriter objectWriter;
-
     private final ObjectMapper objectReader;
-
     private final JavaType deserType;
-
     private final String pgType;
-
     private final DocPropertyType docType;
+    private final TypeJsonManager.DirtyHandler dirtyHandler;
 
-    /**
-     * Construct given the object mapper, property type and DB type for storage.
-     */
-    public Base(Class<T> cls, ObjectMapper objectMapper, AnnotatedField field, int dbType, String pgType, DocPropertyType docType) {
+    Base(Class<T> cls, TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+      this(cls, jsonManager, field, dbType, docType, cls);
+    }
+
+    Base(Class<T> cls, TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType, Class<?> rawType) {
       super(cls, false, dbType);
-      this.pgType = pgType;
+      this.objectReader = jsonManager.objectMapper();
+      this.pgType = jsonManager.postgresType(dbType);
       this.docType = docType;
-      this.objectReader = objectMapper;
-      final JacksonTypeHelper helper = new JacksonTypeHelper(field, objectMapper);
+      this.dirtyHandler = jsonManager.dirtyHandler(cls, rawType);
+      final JacksonTypeHelper helper = new JacksonTypeHelper(field, objectReader);
       this.deserType = helper.type();
       this.objectWriter = helper.objectWriter();
     }
@@ -170,7 +153,7 @@ public class ScalarTypeJsonObjectMapper {
      */
     @Override
     public boolean isDirty(Object value) {
-      return CheckMarkedDirty.isDirty(value);
+      return dirtyHandler.isDirty(value);
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
index 810504411..14d2c50d3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
@@ -33,7 +33,7 @@ public class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
 
   @Override
   public boolean isDirty(Object value) {
-    return CheckMarkedDirty.isDirty(value);
+    return TypeJsonManager.checkIsDirty(value);
   }
 
   @SuppressWarnings("unchecked")
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
new file mode 100644
index 000000000..baea26dec
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
@@ -0,0 +1,98 @@
+package io.ebeaninternal.server.type;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.ModifyAwareType;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.config.dbplatform.DbPlatformType;
+
+class TypeJsonManager {
+
+  interface DirtyHandler {
+    boolean isDirty(Object value);
+  }
+
+  private final boolean postgres;
+  private final ObjectMapper objectMapper;
+  private final DirtyHandler defaultHandler;
+  private final DirtyHandler modifyAwareHandler;
+
+  TypeJsonManager(boolean postgres, Object objectMapper, boolean defaultDirty) {
+    this.postgres = postgres;
+    this.objectMapper = (ObjectMapper) objectMapper;
+    this.defaultHandler = new DefaultHandler(defaultDirty);
+    this.modifyAwareHandler = new ModifyAwareHandler();
+  }
+
+  ObjectMapper objectMapper() {
+    return objectMapper;
+  }
+
+  String postgresType(int dbType) {
+    if (postgres) {
+      switch (dbType) {
+        case DbPlatformType.JSON:
+          return PostgresHelper.JSON_TYPE;
+        case DbPlatformType.JSONB:
+          return PostgresHelper.JSONB_TYPE;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Return the DirtyHandler to use.
+   */
+  DirtyHandler dirtyHandler(Class<?> cls, Class<?> rawType) {
+    if (!Object.class.equals(cls) || ModifyAwareType.class.isAssignableFrom(rawType)) {
+      // Set, List and Map are modify aware
+      return modifyAwareHandler;
+    }
+    return defaultHandler;
+  }
+
+  /**
+   * Return true if the value should be considered dirty (and included in an update).
+   */
+  static boolean checkIsDirty(Object value) {
+    if (value instanceof ModifyAwareType) {
+      return checkModifyAware(value);
+    }
+    return true;
+  }
+
+  private static boolean checkModifyAware(Object value) {
+    ModifyAwareType modifyAware = (ModifyAwareType) value;
+    if (modifyAware.isMarkedDirty()) {
+      // reset the dirty state (consider not dirty after update)
+      modifyAware.setMarkedDirty(false);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  static final class ModifyAwareHandler implements DirtyHandler {
+    @Override
+    public boolean isDirty(Object value) {
+      return checkModifyAware(value);
+    }
+  }
+
+  /**
+   * Effectively constant based on {@link DatabaseConfig#isJsonDirtyByDefault()}
+   */
+  static final class DefaultHandler implements DirtyHandler {
+
+    private final boolean dirty;
+
+    DefaultHandler(boolean dirty) {
+      this.dirty = dirty;
+    }
+
+    @Override
+    public boolean isDirty(Object value) {
+      return dirty;
+    }
+  }
+
+}
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
index 4e92798d6..dde2cb216 100644
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -62,6 +62,7 @@ public class ServerConfigTest {
     props.setProperty("dbOffline", "true");
     props.setProperty("jsonDateTime", "MILLIS");
     props.setProperty("jsonDate", "MILLIS");
+    props.setProperty("jsonDirtyByDefault", "false");
     props.setProperty("autoReadOnlyDataSource", "true");
     props.setProperty("disableL2Cache", "true");
     props.setProperty("notifyL2CacheInForeground", "true");
@@ -103,6 +104,9 @@ public class ServerConfigTest {
     assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
     assertEquals(JsonConfig.DateTime.MILLIS, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.MILLIS, serverConfig.getJsonDate());
+    assertFalse(serverConfig.isJsonDirtyByDefault());
+    serverConfig.setJsonDirtyByDefault(true);
+    assertTrue(serverConfig.isJsonDirtyByDefault());
 
     assertEquals("r0,users,orgs", serverConfig.getEnabledL2Regions());
 
@@ -155,6 +159,7 @@ public class ServerConfigTest {
     assertFalse(serverConfig.isIdGeneratorAutomatic());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
+    assertTrue(serverConfig.isJsonDirtyByDefault());
     assertTrue(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
     assertTrue(serverConfig.isAutoLoadModuleInfo());
 
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 74f004bca..747f01426 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -9,6 +9,7 @@ import org.tests.model.json.EBasicJsonList;
 import org.tests.model.json.PlainBean;
 import org.tests.model.json.PlainBeanDirtyAware;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -59,12 +60,14 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     EBasicJsonList bean = new EBasicJsonList();
     bean.setName("p1");
     bean.setPlainBean(contentBean);
+    bean.setBeanList(Arrays.asList(contentBean));
 
     DB.save(bean);
     final EBasicJsonList found = DB.find(EBasicJsonList.class, bean.getId());
     // json bean not modified but not aware
     // ideally don't load the json content if we are not going to modify it
     found.setName("p1-mod");
+    found.setBeanList(null);
 
     LoggedSql.start();
     DB.save(found);

From 884dd939b732a8553c8f9ad619bbac6d1d751b89 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 11 Jun 2021 00:19:20 +1200
Subject: [PATCH 259/447] #2249 - Bug with DbJson Jackson property that is null
 is updated as null (unnecessarily included in update)

When the value is null and not changed then is was null before and should not be treated as dirty. Hence only check for dirty when value != null in BeanDescriptor 3182
---
 .../java/io/ebeaninternal/server/deploy/BeanDescriptor.java     | 2 +-
 .../src/test/java/org/tests/json/TestDbJson_Jackson3.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index a6841d449..68401b5e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3179,7 +3179,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
       int propertyIndex = beanProperty.getPropertyIndex();
       if (!ebi.isDirtyProperty(propertyIndex) && ebi.isLoadedProperty(propertyIndex)) {
         Object value = beanProperty.getValue(ebi.getOwner());
-        if (value == null || beanProperty.isDirtyValue(value)) {
+        if (value != null && beanProperty.isDirtyValue(value)) {
           // mutable scalar value which is considered dirty so mark
           // it as such so that it is included in an update
           ebi.markPropertyAsChanged(propertyIndex);
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 747f01426..106beb9f2 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -74,6 +74,6 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, beans=?, bean_list=?, plain_bean=?, version=? where id=?");
+    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, plain_bean=?, version=? where id=?");
   }
 }

From fc757c087a857aee80873c76dfe810711f0c17e8 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 11 Jun 2021 00:40:55 +1200
Subject: [PATCH 260/447] [maven-release-plugin] prepare release
 ebean-parent-12.9.2

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 1d382e05c..b131ef4de 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index b8908e306..bb50c0fb1 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.2</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 94223e4be..9489c971f 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.2-SNAPSHOT</version>
+        <version>12.9.2</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index d7ea19e6f..bba66ea39 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 8f0b27243..331d202aa 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.2</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 6397c239b..6111caebe 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 45e433741..2ea48bd8f 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 17aa58fdb..a232a6b55 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.2</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 74ea548c1..4b58bfc4e 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 2994c396d..08ef181ce 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 12187d225..181170146 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 66aeb2e78..8887c95f9 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index c8f3462d4..8e2db6fbc 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 20bf130a3..58439c308 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2-SNAPSHOT</version>
+      <version>12.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index af7bc24b2..8f20cb117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.2-SNAPSHOT</version>
+  <version>12.9.2</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.2</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 1e59c8065..13c1582b4 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <name>querybean generator</name>

From 4ee784c68f40fb95f594fd943ddb11f70120a5b1 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 11 Jun 2021 00:41:06 +1200
Subject: [PATCH 261/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index b131ef4de..a96321a13 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index bb50c0fb1..b5fe45223 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 9489c971f..694875208 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.2</version>
+        <version>12.9.3-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index bba66ea39..98aaf160a 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 331d202aa..f626f3f8f 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 6111caebe..d3c571848 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 2ea48bd8f..2faf0af3d 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index a232a6b55..ad1d5b4aa 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 4b58bfc4e..67dd8867b 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 08ef181ce..7fbd226c0 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 181170146..28f52f71d 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 8887c95f9..a99ff03cb 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 8e2db6fbc..4606f1db7 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 58439c308..94d002e74 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.2</version>
+      <version>12.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 8f20cb117..ad1a85ddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.2</version>
+  <version>12.9.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 13c1582b4..e8c0c9d65 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.2</version>
+    <version>12.9.3-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 55bc498f9d773737691b9c01092ddcd89c86731e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 11 Jun 2021 10:20:47 +1200
Subject: [PATCH 262/447] No functional change - refactor QueryIterator to use
 Iterator.remove()  default method

Iterator.remove() has a default implementation that throws UnsupportedOperationException which is what we want. Remove the close() method from QueryIterator and implementations so that we just use the Iterator.remove() default implementation.
---
 ebean-api/src/main/java/io/ebean/QueryIterator.java         | 6 ------
 .../io/ebeaninternal/server/query/CQueryIteratorSimple.java | 6 +-----
 .../server/query/CQueryIteratorWithBuffer.java              | 4 ----
 .../io/ebeaninternal/server/query/DtoQueryIterator.java     | 4 ----
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/QueryIterator.java b/ebean-api/src/main/java/io/ebean/QueryIterator.java
index 2ac789073..6ad523151 100644
--- a/ebean-api/src/main/java/io/ebean/QueryIterator.java
+++ b/ebean-api/src/main/java/io/ebean/QueryIterator.java
@@ -70,12 +70,6 @@ public interface QueryIterator<T> extends Iterator<T>, AutoCloseable {
   @Override
   T next();
 
-  /**
-   * Remove is not allowed.
-   */
-  @Override
-  void remove();
-
   /**
    * Close the underlying resources held by this iterator.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
index fb434a6de..17cec9d15 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
@@ -14,7 +14,7 @@ class CQueryIteratorSimple<T> implements QueryIterator<T> {
   private final CQuery<T> cquery;
 
   private final OrmQueryRequest<T> request;
-  
+
   private boolean closed;
 
   CQueryIteratorSimple(CQuery<T> cquery, OrmQueryRequest<T> request) {
@@ -54,8 +54,4 @@ class CQueryIteratorSimple<T> implements QueryIterator<T> {
     }
   }
 
-  @Override
-  public void remove() {
-    throw new PersistenceException("Remove not allowed");
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
index 2ba431da5..e2a9bdad2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
@@ -76,8 +76,4 @@ class CQueryIteratorWithBuffer<T> implements QueryIterator<T> {
     }
   }
 
-  @Override
-  public void remove() {
-    throw new PersistenceException("Remove not allowed");
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
index cb22fdd3a..bdf4e2df6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
@@ -48,8 +48,4 @@ class DtoQueryIterator<T> implements QueryIterator<T> {
     }
   }
 
-  @Override
-  public void remove() {
-    throw new IllegalStateException("remove() not allowed");
-  }
 }

From 6a6e8f906f9e2d106b6cb75f20b27e48a7c917e4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 14 Jun 2021 11:09:13 +1200
Subject: [PATCH 263/447] Bump jedis dependency to 3.6.1 (from 3.6.0)

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

diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 28f52f71d..6490c77d2 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <version>3.6.0</version>
+      <version>3.6.1</version>
     </dependency>
 
     <dependency>

From 37a3a51b6bdc271c9aca0b975331cc589bdfd20d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 14 Jun 2021 11:09:37 +1200
Subject: [PATCH 264/447] Bump test dependency for Postgres JDBC driver

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

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index f626f3f8f..5575c187b 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -182,7 +182,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.10</version>
+      <version>42.2.20</version>
       <optional>true</optional>
     </dependency>
 

From 1fa488d870c2715e3edfe9dce564e3074461bae6 Mon Sep 17 00:00:00 2001
From: Vladimir Konkov <vkonkov@citc.ru>
Date: Mon, 14 Jun 2021 16:20:25 +0300
Subject: [PATCH 265/447] Test for transparent persistence of to-many
 associations

---
 .../TestTransparentPersist.java                 | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
index 75d767b3b..0ed40203f 100644
--- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -8,6 +8,7 @@ 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.OrderShipment;
 
 import java.util.List;
 
@@ -181,6 +182,8 @@ public class TestTransparentPersist extends BaseTestCase {
     Order order = new Order();
     order.setStatus(Order.Status.NEW);
     order.setCustomer(c0);
+    OrderShipment osh1 = new OrderShipment();
+    order.addShipment(osh1);
     DB.save(order);
 
     LoggedSql.start();
@@ -194,7 +197,11 @@ public class TestTransparentPersist extends BaseTestCase {
       Customer c1 = new Customer();
       c1.setName("newCust CascadePersist");
       foundOrder.setCustomer(c1);
-
+      foundOrder.getShipments().remove(0);
+      OrderShipment osh2 = new OrderShipment();
+      foundOrder.addShipment(osh2);
+      // if this is called insert is performed but no delete
+      // DB.save(foundOrder);
       transaction.commit();
     }
 
@@ -204,13 +211,19 @@ public class TestTransparentPersist extends BaseTestCase {
 
     assertThat(checkOrder.getStatus()).isEqualTo(Order.Status.NEW);
     assertThat(checkOrder.getCustomer().getName()).isEqualTo("newCust CascadePersist");
+    assertThat(checkOrder.getShipments().size()).isEqualTo(1);
 
-    assertThat(sql).hasSize(5);
+    assertThat(sql).hasSize(10);
     assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.order_date");
     assertThat(sql.get(1)).contains("insert into o_customer");
     assertThat(sql.get(2)).contains(" -- bind(");
     assertThat(sql.get(3)).contains("update o_order set updtime=?, kcustomer_id=? where id=? and updtime=?");
     assertThat(sql.get(4)).contains(" -- bind(");
+    assertThat(sql.get(5)).contains("select t0.order_id, t0.id, t0.ship_time, t0.cretime, t0.updtime, t0.version, t0.order_id from or_order_ship");
+    assertThat(sql.get(6)).contains("delete from or_order_ship");
+    assertThat(sql.get(7)).contains(" -- bind(");
+    assertThat(sql.get(8)).contains("insert into or_order_ship");
+    assertThat(sql.get(9)).contains(" -- bind(");
 
     DB.delete(checkOrder);
     DB.delete(Customer.class, checkOrder.getCustomer().getId());

From 7af4e166a4651192818634b9d9434429b68f8d9c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 17 Jun 2021 13:26:34 +1200
Subject: [PATCH 266/447] #2253 - Incorrect JSON format for LocalDateTime.
 Includes Z suffix when it should not.

---
 .../server/type/ScalarTypeLocalDateTime.java  | 34 +++++++++++++++--
 .../type/ScalarTypeLocalDateTimeTest.java     | 37 +++++++++++++++----
 2 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index a4bc91aae..12b884e82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -1,7 +1,10 @@
 package io.ebeaninternal.server.type;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.JsonConfig;
 
+import java.io.IOException;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.Instant;
@@ -29,12 +32,37 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
 
   @Override
   protected String toJsonNanos(LocalDateTime value) {
-    return String.valueOf(convertToMillis(value));
+    return value.toString();
   }
 
   @Override
-  protected String toJsonISO8601(LocalDateTime dateTime) {
-    return dateTime.atZone(ZoneId.systemDefault()).toInstant().toString();
+  protected String toJsonISO8601(LocalDateTime value) {
+    return value.toString();
+  }
+
+  @Override
+  protected LocalDateTime fromJsonISO8601(String value) {
+    return LocalDateTime.parse(value);
+  }
+
+  @Override
+  public LocalDateTime jsonRead(JsonParser parser) throws IOException {
+    return LocalDateTime.parse(parser.getText());
+  }
+
+  @Override
+  public void jsonWrite(JsonGenerator writer, LocalDateTime value) throws IOException {
+    writer.writeString(value.toString());
+  }
+
+  @Override
+  public String formatValue(LocalDateTime value) {
+    return value.toString();
+  }
+
+  @Override
+  public LocalDateTime parse(String value) {
+    return LocalDateTime.parse(value);
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
index 88803da74..65423e012 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
@@ -1,25 +1,28 @@
 package io.ebeaninternal.server.type;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
 import io.ebean.config.JsonConfig;
 import org.junit.Test;
 
+import java.io.StringWriter;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 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;
+import static org.junit.Assert.*;
 
 public class ScalarTypeLocalDateTimeTest {
 
-  ScalarTypeLocalDateTime type = new ScalarTypeLocalDateTime(JsonConfig.DateTime.MILLIS);
+  private final ScalarTypeLocalDateTime type = new ScalarTypeLocalDateTime(JsonConfig.DateTime.MILLIS);
+
+  private final JsonFactory factory = new JsonFactory();
 
   // warm up
-  LocalDateTime warmUp = LocalDateTime.now();
+  private final LocalDateTime warmUp = LocalDateTime.now();
 
   @Test
-  public void testNowToMillis() throws Exception {
+  public void testNowToMillis() {
 
     warmUp.hashCode();
 
@@ -29,7 +32,7 @@ public class ScalarTypeLocalDateTimeTest {
   }
 
   @Test
-  public void testConvertToMillis() throws Exception {
+  public void testConvertToMillis() {
 
     LocalDateTime now = LocalDateTime.now().withNano(123_000_000); // jdk11 workaround
     long asMillis = type.convertToMillis(now);
@@ -39,7 +42,7 @@ public class ScalarTypeLocalDateTimeTest {
   }
 
   @Test
-  public void testConvertFromTimestamp() throws Exception {
+  public void testConvertFromTimestamp() {
 
     Timestamp now = new Timestamp(System.currentTimeMillis());
 
@@ -74,6 +77,24 @@ public class ScalarTypeLocalDateTimeTest {
     assertEquals(timestamp, timestamp1);
   }
 
+
+  @Test
+  public void testJsonRaw() throws Exception {
+
+    final LocalDateTime of = LocalDateTime.of(2020, 5, 4, 13, 20, 40);
+
+    ScalarTypeLocalDateTime typeIso = new ScalarTypeLocalDateTime(JsonConfig.DateTime.ISO8601);
+
+    StringWriter writer = new StringWriter();
+    JsonGenerator generator = factory.createGenerator(writer);
+
+    typeIso.jsonWrite(generator, of);
+    generator.flush();
+
+    assertThat(of.toString()).isEqualTo("2020-05-04T13:20:40");
+    assertThat(writer.toString()).isEqualTo("\"2020-05-04T13:20:40\"");
+  }
+
   @Test
   public void testJson() throws Exception {
 

From f4bb4e1b6abea8411976bb5a1a28b0073b0145dd Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 18 Jun 2021 12:37:16 +1200
Subject: [PATCH 267/447] #2254 - OraclePlatform needs columnAliasPrefix 'c' -
 Regression in version 12.2.1 due to #1967

---
 .../dbplatform/oracle/Oracle11Platform.java       |  1 -
 .../config/dbplatform/oracle/OraclePlatform.java  |  1 +
 .../config/dbplatform/OraclePlatformTest.java     | 15 +++++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java
index cb32a7470..5934b6dd4 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java
@@ -11,7 +11,6 @@ public class Oracle11Platform extends OraclePlatform {
   public Oracle11Platform() {
     super();
     this.platform = Platform.ORACLE11;
-    this.columnAliasPrefix = "c";
     this.sqlLimiter = new OracleRownumSqlLimiter();
     this.basicSqlLimiter = new OracleRownumBasicLimiter();
     dbIdentity.setIdType(IdType.SEQUENCE);
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
index c12ca8c74..d6896ad3e 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java
@@ -22,6 +22,7 @@ public class OraclePlatform extends DatabasePlatform {
   public OraclePlatform() {
     super();
     this.platform = Platform.ORACLE;
+    this.columnAliasPrefix = "c";
     this.supportsDeleteTableAlias = true;
     this.maxTableNameLength = 30;
     this.maxConstraintNameLength = 30;
diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
index 667a5960b..15e9dda00 100644
--- a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
@@ -1,6 +1,7 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.config.PlatformConfig;
+import io.ebean.config.dbplatform.oracle.Oracle11Platform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
 import org.junit.Test;
 
@@ -8,17 +9,27 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class OraclePlatformTest {
 
+  @Test
+  public void columnAliasPrefix_Oracle11Platform() {
+    Oracle11Platform platform11 = new Oracle11Platform();
+    assertThat(platform11.columnAliasPrefix).isEqualTo("c");
+  }
+
+  @Test
+  public void columnAliasPrefix_OraclePlatform() {
+    OraclePlatform platform = new OraclePlatform();
+    assertThat(platform.columnAliasPrefix).isEqualTo("c");
+  }
+
   @Test
   public void uuid_default() {
 
     OraclePlatform platform = new OraclePlatform();
     platform.configure(new PlatformConfig(), false);
     DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
-
     assertThat(dbType.renderType(0, 0)).isEqualTo("varchar2(40)");
   }
 
-
   @Test
   public void uuid_as_binary() {
 

From 8f432aa0a950d42135c961ec727a9ee4bb2b2001 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 18 Jun 2021 16:05:25 +1200
Subject: [PATCH 268/447] #2251 - Transparent persistence of to-many
 associations (with orphanRemoval)

---
 .../java/io/ebean/bean/BeanCollection.java    | 18 ++++--------
 .../io/ebean/bean/PersistenceContext.java     | 10 -------
 .../ebean/common/AbstractBeanCollection.java  |  6 +++-
 .../io/ebeaninternal/api/SpiBeanType.java     | 17 +++++++++++
 .../ebeaninternal/api/SpiBeanTypeManager.java | 13 +++++++++
 .../api/SpiPersistenceContext.java            | 17 +++++++++++
 .../io/ebeaninternal/api/SpiTransaction.java  |  5 ++--
 .../api/SpiTransactionProxy.java              |  5 ++--
 .../server/deploy/BeanDescriptor.java         | 28 +++++++++++--------
 .../server/deploy/BeanDescriptorManager.java  | 11 +++++---
 .../DefaultPersistenceContext.java            | 28 ++++++++++---------
 .../ImplicitReadOnlyTransaction.java          | 12 +++-----
 .../server/transaction/JdbcTransaction.java   | 22 ++++-----------
 .../server/transaction/NoTransaction.java     |  6 ++--
 .../transaction/TransactionManager.java       | 15 ++--------
 .../java/org/tests/model/basic/Order.java     |  2 +-
 .../TestTransparentPersist.java               |  7 +++--
 17 files changed, 122 insertions(+), 100 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanType.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/SpiPersistenceContext.java

diff --git a/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java
index 3ec5163e3..6271d4051 100644
--- a/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java
+++ b/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java
@@ -13,12 +13,10 @@ import java.util.Set;
  * from the Map Set or List. The purpose of gathering the additions and removals
  * is to support persisting ManyToMany objects. The additions and removals
  * become inserts and deletes from the intersection table.
- * </p>
  * <p>
  * Technically this is <em>NOT</em> an extension of
  * <em>java.util.Collection</em>. The reason being that java.util.Map is not a
  * Collection. I realise this makes this name confusing so I apologise for that.
- * </p>
  */
 public interface BeanCollection<E> extends Serializable {
 
@@ -68,7 +66,6 @@ public interface BeanCollection<E> extends Serializable {
    * Return true if the collection is uninitialised or is empty without any held modifications.
    * <p>
    * Returning true means can safely skip cascade save for this bean collection.
-   * </p>
    */
   boolean isSkipSave();
 
@@ -93,7 +90,6 @@ public interface BeanCollection<E> extends Serializable {
    * <p>
    * That is, if the collection was not loaded due to filterMany predicates etc
    * then make sure the collection is set to empty.
-   * </p>
    */
   boolean checkEmptyLazyLoad();
 
@@ -136,10 +132,7 @@ public interface BeanCollection<E> extends Serializable {
   boolean isReadOnly();
 
   /**
-   * Add the bean to the collection.
-   * <p>
-   * This is disallowed for BeanMap.
-   * </p>
+   * Add the bean to the collection. This is disallowed for BeanMap.
    */
   void internalAdd(Object bean);
 
@@ -168,7 +161,6 @@ public interface BeanCollection<E> extends Serializable {
    * Map.Entry.
    * <p>
    * For maps this returns the entrySet as we need the keys of the map.
-   * </p>
    */
   Collection<?> getActualEntries();
 
@@ -185,6 +177,11 @@ public interface BeanCollection<E> extends Serializable {
    */
   boolean isReference();
 
+  /**
+   * Return true if the collection is modify listening and has modifications.
+   */
+  boolean hasModifications();
+
   /**
    * Set modify listening on or off. This is used to keep track of objects that
    * have been added to or removed from the list set or map.
@@ -192,7 +189,6 @@ public interface BeanCollection<E> extends Serializable {
    * This is required only for ManyToMany collections. The additions and
    * deletions are used to insert or delete entries from the intersection table.
    * Otherwise modifyListening is false.
-   * </p>
    */
   void setModifyListening(ModifyListenMode modifyListenMode);
 
@@ -206,7 +202,6 @@ public interface BeanCollection<E> extends Serializable {
    * <p>
    * This will potentially end up as an insert into a intersection table for a
    * ManyToMany.
-   * </p>
    */
   void modifyAddition(E bean);
 
@@ -215,7 +210,6 @@ public interface BeanCollection<E> extends Serializable {
    * <p>
    * This will potentially end up as an delete from an intersection table for a
    * ManyToMany.
-   * </p>
    */
   void modifyRemoval(Object bean);
 
diff --git a/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java b/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java
index 8c861af1f..9d67499d1 100644
--- a/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java
+++ b/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java
@@ -1,13 +1,10 @@
 package io.ebean.bean;
 
-import java.util.List;
-
 /**
  * Holds entity beans by there type and id.
  * <p>
  * This is used to ensure only one instance for a given entity type and id is
  * used to build object graphs from queries and lazy loading.
- * </p>
  */
 public interface PersistenceContext {
 
@@ -22,7 +19,6 @@ public interface PersistenceContext {
    * <p>
    * Returns an existing entity bean (if one is already there) and otherwise
    * returns null.
-   * </p>
    */
   Object putIfAbsent(Class<?> rootType, Object id, Object bean);
 
@@ -79,17 +75,11 @@ public interface PersistenceContext {
    */
   boolean resetLimit();
 
-  /**
-   * Return the list of dirty beans held by this persistence context.
-   */
-  List<Object> dirtyBeans();
-
   /**
    * Wrapper on a bean to also indicate if a bean has been deleted.
    * <p>
    * If a bean has been deleted then for the same persistence context is should
    * not be able to be fetched from persistence context or L2 cache.
-   * </p>
    */
   class WithOption {
 
diff --git a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java
index f1a608361..809ca13b3 100644
--- a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -135,6 +135,11 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   // Support for modify additions deletions etc - ManyToMany
   // ---------------------------------------------------------
 
+  @Override
+  public boolean hasModifications() {
+    return modifyHolder != null && modifyHolder.hasModifications();
+  }
+
   @Override
   public ModifyListenMode getModifyListening() {
     return modifyListenMode;
@@ -145,7 +150,6 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
    */
   @Override
   public void setModifyListening(ModifyListenMode mode) {
-
     this.modifyListenMode = mode;
     this.modifyListening = mode != null && ModifyListenMode.NONE != mode;
     if (modifyListening) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanType.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanType.java
new file mode 100644
index 000000000..9923fff3f
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanType.java
@@ -0,0 +1,17 @@
+package io.ebeaninternal.api;
+
+import io.ebean.bean.EntityBean;
+
+/**
+ * SPI interface for underlying BeanDescriptor.
+ */
+public interface SpiBeanType {
+
+  /**
+   * Return true if the bean contains a many property that has modifications.
+   * <p>
+   * That is a ManyToMany or a OneToMany with orphan removal with additions
+   * or removals from the collection.
+   */
+  boolean isToManyDirty(EntityBean bean);
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java
new file mode 100644
index 000000000..0a6b79d78
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiBeanTypeManager.java
@@ -0,0 +1,13 @@
+package io.ebeaninternal.api;
+
+/**
+ * Manager of SpiBeanTypes.
+ */
+public interface SpiBeanTypeManager {
+
+  /**
+   * Return the bean type for the given entity class.
+   */
+  SpiBeanType getBeanType(Class<?> entityType);
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiPersistenceContext.java
new file mode 100644
index 000000000..a11f9d2f4
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiPersistenceContext.java
@@ -0,0 +1,17 @@
+package io.ebeaninternal.api;
+
+import io.ebean.bean.PersistenceContext;
+
+import java.util.List;
+
+/**
+ * SPI extension to PersistenceContext.
+ */
+public interface SpiPersistenceContext extends PersistenceContext {
+
+  /**
+   * Return the list of dirty beans held by this persistence context.
+   */
+  List<Object> dirtyBeans(SpiBeanTypeManager manager);
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
index 8c59fa7dc..d26ab3ecc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.ProfileLocation;
 import io.ebean.Transaction;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
@@ -196,7 +195,7 @@ public interface SpiTransaction extends Transaction {
    * later. This is along the lines of 'extended persistence context'
    * behaviour.
    */
-  PersistenceContext getPersistenceContext();
+  SpiPersistenceContext getPersistenceContext();
 
   /**
    * Set the persistence context to this transaction.
@@ -208,7 +207,7 @@ public interface SpiTransaction extends Transaction {
    * and setPersistenceContext() enable a developer to reuse a single
    * PersistenceContext with multiple transactions.
    */
-  void setPersistenceContext(PersistenceContext context);
+  void setPersistenceContext(SpiPersistenceContext context);
 
   /**
    * Return the underlying Connection for internal use.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
index 5fd2a3c6e..a63c04cc6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java
+++ b/ebean-core/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.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
@@ -379,12 +378,12 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public SpiPersistenceContext getPersistenceContext() {
     return transaction.getPersistenceContext();
   }
 
   @Override
-  public void setPersistenceContext(PersistenceContext context) {
+  public void setPersistenceContext(SpiPersistenceContext context) {
     transaction.setPersistenceContext(context);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 68401b5e3..326cbae00 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -38,15 +38,7 @@ import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
 import io.ebean.plugin.Property;
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.BeanCacheResult;
-import io.ebeaninternal.api.CQueryPlanKey;
-import io.ebeaninternal.api.ConcurrencyMode;
-import io.ebeaninternal.api.LoadBeanContext;
-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.*;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
@@ -119,7 +111,7 @@ import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
 /**
  * Describes Beans including their deployment information.
  */
-public class BeanDescriptor<T> implements BeanType<T>, STreeType {
+public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanDescriptor.class);
 
@@ -1880,7 +1872,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     if (refBean == null) {
       refBean = createReference(readOnly, false, id, pc);
     }
-    return (EntityBean)refBean;
+    return (EntityBean) refBean;
   }
 
   /**
@@ -2937,6 +2929,20 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return false;
   }
 
+  @Override
+  public boolean isToManyDirty(EntityBean bean) {
+    final EntityBeanIntercept ebi = bean._ebean_getIntercept();
+    for (BeanPropertyAssocMany<?> many : propertiesManySave) {
+      if (ebi.isLoadedProperty(many.getPropertyIndex())) {
+        final BeanCollection<?> value = (BeanCollection<?>) many.getValue(bean);
+        if (value != null && value.hasModifications()) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   /**
    * Return true if the bean is draftable and considered a 'live' instance.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index dca6b2b09..b660c1718 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -26,9 +26,7 @@ import io.ebean.meta.MetricVisitor;
 import io.ebean.meta.QueryPlanInit;
 import io.ebean.plugin.BeanType;
 import io.ebean.util.AnnotationUtil;
-import io.ebeaninternal.api.ConcurrencyMode;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.TransactionEventTable;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.SpiCacheManager;
 import io.ebeaninternal.server.core.InternString;
@@ -88,7 +86,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Creates BeanDescriptors.
  */
-public class BeanDescriptorManager implements BeanDescriptorMap {
+public class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTypeManager {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanDescriptorManager.class);
 
@@ -263,6 +261,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return descQueueMap.get(queueId);
   }
 
+  @Override
+  public SpiBeanType getBeanType(Class<?> entityType) {
+    return getBeanDescriptor(entityType);
+  }
+
   @Override
   @SuppressWarnings("unchecked")
   public <T> BeanDescriptor<T> getBeanDescriptor(Class<T> entityType) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
index 27eea2e4c..1064bf8bc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
@@ -2,6 +2,9 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
+import io.ebeaninternal.api.SpiBeanType;
+import io.ebeaninternal.api.SpiBeanTypeManager;
+import io.ebeaninternal.api.SpiPersistenceContext;
 
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
@@ -11,19 +14,16 @@ import java.util.concurrent.locks.ReentrantLock;
  * <p>
  * Ensures only one instance of a bean is used according to its type and unique
  * id.
- * </p>
  * <p>
  * PersistenceContext lives on a Transaction and as such is expected to only
  * have a single thread accessing it at a time. This is not expected to be used
  * concurrently.
- * </p>
  * <p>
  * Duplicate beans are ones having the same type and unique id value. These are
  * considered duplicates and replaced by the bean instance that was already
  * loaded into the PersistenceContext.
- * </p>
  */
-public final class DefaultPersistenceContext implements PersistenceContext {
+public final class DefaultPersistenceContext implements SpiPersistenceContext {
 
   /**
    * Map used hold caches. One cache per bean type.
@@ -199,12 +199,12 @@ public final class DefaultPersistenceContext implements PersistenceContext {
   }
 
   @Override
-  public List<Object> dirtyBeans() {
+  public List<Object> dirtyBeans(SpiBeanTypeManager manager) {
     lock.lock();
     try {
       List<Object> list = new ArrayList<>();
       for (ClassContext classContext : typeCache.values()) {
-        classContext.dirtyBeans(list);
+        classContext.dirtyBeans(manager, list);
       }
       return list;
     } finally {
@@ -223,26 +223,26 @@ public final class DefaultPersistenceContext implements PersistenceContext {
   }
 
   private ClassContext getClassContext(Class<?> rootType) {
-    return typeCache.computeIfAbsent(rootType, k -> new ClassContext());
+    return typeCache.computeIfAbsent(rootType, k -> new ClassContext(rootType));
   }
 
   private static class ClassContext {
 
     private final Map<Object, Object> map = new HashMap<>();
-
+    private final Class<?> rootType;
     private Set<Object> deleteSet;
-
     private int initialSize;
-
     private ClassContext parent;
 
-    private ClassContext() {
+    private ClassContext(Class<?> rootType) {
+      this.rootType = rootType;
     }
 
     /**
      * Create as a shallow copy.
      */
     private ClassContext(ClassContext source, boolean initial) {
+      this.rootType = source.rootType;
       if (initial || source.isTransfer()) {
         parent = source.transferParent();
         initialSize = parent.size();
@@ -334,9 +334,11 @@ public final class DefaultPersistenceContext implements PersistenceContext {
     /**
      * Add the dirty beans to the list.
      */
-    void dirtyBeans(List<Object> list) {
+    void dirtyBeans(SpiBeanTypeManager manager, List<Object> list) {
+      final SpiBeanType beanType = manager.getBeanType(rootType);
       for (Object value : map.values()) {
-        if (((EntityBean) value)._ebean_getIntercept().isDirty()) {
+        EntityBean bean = (EntityBean) value;
+        if (bean._ebean_getIntercept().isDirty() || beanType.isToManyDirty(bean)) {
           list.add(value);
         }
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 5f2b5d195..e4e36e337 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -3,13 +3,9 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
-import io.ebeaninternal.api.SpiProfileTransactionEvent;
-import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.api.TransactionEvent;
-import io.ebeaninternal.api.TxnProfileEventCodes;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
@@ -58,7 +54,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   /**
    * Holder of the objects fetched to ensure unique objects are used.
    */
-  private PersistenceContext persistenceContext;
+  private SpiPersistenceContext persistenceContext;
 
   private Object tenantId;
 
@@ -421,7 +417,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
    * Return the persistence context associated with this transaction.
    */
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public SpiPersistenceContext getPersistenceContext() {
     return persistenceContext;
   }
 
@@ -434,7 +430,7 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
    * </p>
    */
   @Override
-  public void setPersistenceContext(PersistenceContext context) {
+  public void setPersistenceContext(SpiPersistenceContext context) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 9f59c44bd..b4bd7b714 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -3,20 +3,16 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.bean.PersistenceContext;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
-import io.ebeaninternal.api.SpiProfileTransactionEvent;
-import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.api.TransactionEvent;
-import io.ebeaninternal.api.TxnProfileEventCodes;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
 import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.BatchedSqlException;
+import io.ebeaninternal.server.util.Str;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,12 +21,7 @@ import javax.persistence.PersistenceException;
 import javax.persistence.RollbackException;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Consumer;
 
 /**
@@ -99,7 +90,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Holder of the objects fetched to ensure unique objects are used.
    */
-  private PersistenceContext persistenceContext;
+  private SpiPersistenceContext persistenceContext;
 
   /**
    * Used to give developers more control over the insert update and delete
@@ -806,7 +797,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return the persistence context associated with this transaction.
    */
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public SpiPersistenceContext getPersistenceContext() {
     return persistenceContext;
   }
 
@@ -816,10 +807,9 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * This could be considered similar to EJB3 Extended PersistanceContext. In
    * that you get the PersistanceContext from a transaction, hold onto it, and
    * then set it back later to a second transaction.
-   * </p>
    */
   @Override
-  public void setPersistenceContext(PersistenceContext context) {
+  public void setPersistenceContext(SpiPersistenceContext context) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 0d3c82cd6..d435e93fd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.transaction;
 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
-import io.ebean.bean.PersistenceContext;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
+import io.ebeaninternal.api.SpiPersistenceContext;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEvent;
@@ -349,12 +349,12 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public SpiPersistenceContext getPersistenceContext() {
     return null;
   }
 
   @Override
-  public void setPersistenceContext(PersistenceContext context) {
+  public void setPersistenceContext(SpiPersistenceContext context) {
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 0728eebac..e3fbdd425 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -5,7 +5,6 @@ import io.ebean.ProfileLocation;
 import io.ebean.TxScope;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.TxType;
-import io.ebean.bean.PersistenceContext;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
@@ -19,15 +18,7 @@ import io.ebean.metric.MetricFactory;
 import io.ebean.metric.TimedMetric;
 import io.ebean.metric.TimedMetricMap;
 import io.ebean.plugin.SpiServer;
-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;
-import io.ebeaninternal.api.TransactionEvent;
-import io.ebeaninternal.api.TransactionEventTable;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cluster.ClusterManager;
@@ -770,8 +761,8 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Experimental - find dirty beans in the persistence context and persist them.
    */
-  public void flushTransparent(PersistenceContext persistenceContext, SpiTransaction transaction) {
-    List<Object> dirtyBeans = persistenceContext.dirtyBeans();
+  public void flushTransparent(SpiPersistenceContext persistenceContext, SpiTransaction transaction) {
+    List<Object> dirtyBeans = persistenceContext.dirtyBeans(beanDescriptorManager);
     if (!dirtyBeans.isEmpty()) {
       server.updateAll(dirtyBeans, transaction);
     }
diff --git a/ebean-core/src/test/java/org/tests/model/basic/Order.java b/ebean-core/src/test/java/org/tests/model/basic/Order.java
index b15765b51..cea0a6e00 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/Order.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/Order.java
@@ -101,7 +101,7 @@ public class Order implements Serializable {
   @DocEmbedded
   List<OrderDetail> details;
 
-  @OneToMany(cascade = CascadeType.ALL, mappedBy = "order")
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "order", orphanRemoval = true)
   List<OrderShipment> shipments;
 
   @Override
diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
index 0ed40203f..8a870f8ab 100644
--- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
+++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java
@@ -2,9 +2,11 @@ package org.tests.transparentpersist;
 
 import io.ebean.*;
 import io.ebean.annotation.*;
+import io.ebeaninternal.api.SpiBeanTypeManager;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeantest.LoggedSql;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasicVer;
 import org.tests.model.basic.Order;
@@ -200,8 +202,6 @@ public class TestTransparentPersist extends BaseTestCase {
       foundOrder.getShipments().remove(0);
       OrderShipment osh2 = new OrderShipment();
       foundOrder.addShipment(osh2);
-      // if this is called insert is performed but no delete
-      // DB.save(foundOrder);
       transaction.commit();
     }
 
@@ -305,7 +305,8 @@ public class TestTransparentPersist extends BaseTestCase {
   }
 
   private List<Object> getDirtyBeansFromPersistenceContext(Transaction transaction) {
-    return ((SpiTransaction)transaction).getPersistenceContext().dirtyBeans();
+    final SpiBeanTypeManager mgr = Mockito.mock(SpiBeanTypeManager.class);
+    return ((SpiTransaction)transaction).getPersistenceContext().dirtyBeans(mgr);
   }
 
 }

From 66cb6d5e7d933ab71c5df78566ff7138aef498c4 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Mon, 21 Jun 2021 14:50:15 +0200
Subject: [PATCH 269/447] Imporved @Where support, especially for Many-to-many
 tables

---
 ebean-core/pom.xml                            |   2 +-
 .../io/ebeaninternal/api/LoadManyRequest.java |   2 +-
 .../server/deploy/BeanDescriptor.java         |   7 +
 .../server/deploy/BeanDescriptorManager.java  |   6 +
 .../server/deploy/BeanDescriptorMap.java      |   6 +
 .../server/deploy/BeanPropertyAssocMany.java  |  25 ++-
 .../server/deploy/DbSqlContext.java           |   2 +-
 .../server/deploy/TableJoin.java              |   6 +-
 .../deploy/meta/DeployBeanPropertyAssoc.java  |   1 +
 .../server/deploy/meta/DeployTableJoin.java   |  14 ++
 .../deploy/parse/AnnotationAssocManys.java    |   2 +-
 .../deploy/parse/AnnotationAssocOnes.java     |   2 +-
 .../server/deploy/parse/AnnotationFields.java |   4 +-
 .../server/deploy/parse/AnnotationParser.java |   7 +
 .../server/query/DefaultDbSqlContext.java     |  10 +-
 .../server/query/SqlTreeNodeManyRoot.java     |  10 --
 .../java/org/tests/model/m2m/MnyEdge.java     |  57 +++++++
 .../java/org/tests/model/m2m/MnyNode.java     | 129 ++++++++++++++
 .../org/tests/model/m2m/TestM2MWithWhere.java | 159 ++++++++++++++++++
 .../java/org/tests/o2m/OmBasicParent.java     |  16 ++
 .../org/tests/o2m/TestOneToManyWhere.java     |  44 +++++
 .../TestImplicitJoinOnParentRelationship.java |  12 +-
 .../org/tests/query/TestManyWhereJoin.java    |   2 +-
 .../org/tests/query/TestQueryFilterMany.java  |   2 +-
 .../java/org/tests/query/TestQueryIsNull.java |  41 ++---
 .../other/TestQueryRawExpressionMany.java     |   2 +-
 .../other/TestQueryRowCountWithMany.java      |   4 +-
 .../query/other/TestQuerySingleAttribute.java |   2 +-
 .../build/ModelBuildPropertyVisitor.java      |   2 +-
 29 files changed, 525 insertions(+), 53 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java
 create mode 100644 ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 5575c187b..8e3d4b068 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.0</version>
+      <version>12.9.3a</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index aeb9ff7dd..0343b8579 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -119,7 +119,7 @@ public class LoadManyRequest extends LoadRequest {
     if (extraWhere != null) {
       // replace special ${ta} placeholder with the base table alias
       // which is always t0 and add the extra where clause
-      query.where().raw(extraWhere.replace("${ta}", "t0"));
+      query.where().raw(extraWhere.replace("${ta}", "t0").replace("${mta}", "int_"));
     }
 
     query.setLazyLoadForParents(many);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 326cbae00..9b8e7768c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2009,6 +2009,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     return owner.getBeanDescriptor(otherType);
   }
 
+  /**
+   * Returns true, if the table is managed (i.e. an existing m2m relation).
+   */
+  public boolean isTableManaged(String tableName) {
+    return owner.isTableManaged(tableName);
+  }
+  
   /**
    * Return the order column property.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index b660c1718..84b412513 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -445,6 +445,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTypeMana
     return tableToDescMap.get(tableName.toLowerCase());
   }
 
+  @Override
+  public boolean isTableManaged(String tableName) {
+    return tableToDescMap.get(tableName.toLowerCase()) != null
+        || tableToViewDescMap.get(tableName.toLowerCase()) != null;
+  }
+
   /**
    * Invalidate entity beans based on views via their dependent tables.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
index 7c7dd6e0c..94a9fded9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java
@@ -76,4 +76,10 @@ public interface BeanDescriptorMap {
    * Return true if Jackson core is present on the classpath.
    */
   boolean isJacksonCorePresent();
+  
+  /**
+   * Returns true, if the given table (or view) is managed by ebean
+   * (= an entity exists)
+   */
+  boolean isTableManaged(String tableName);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 8e1ac1a14..c823e9a7e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -439,6 +439,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   @Override
   public String getAssocIsEmpty(SpiExpressionRequest request, String path) {
     boolean softDelete = targetDescriptor.isSoftDelete();
+    boolean needsX2Table = softDelete || getExtraWhere() != null;
     StringBuilder sb = new StringBuilder(50);
     SpiQuery<?> query = request.getQueryRequest().getQuery();
     if (hasJoinTable()) {
@@ -446,7 +447,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     } else {
       sb.append(targetDescriptor.getBaseTable(query.getTemporalMode()));
     }
-    if (softDelete && hasJoinTable()) {
+    if (needsX2Table && hasJoinTable()) {
       sb.append(" x join ");
       sb.append(targetDescriptor.getBaseTable(query.getTemporalMode()));
       sb.append(" x2 on ");
@@ -461,6 +462,16 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
       }
       exportedProperties[i].appendWhere(sb, "x.", path);
     }
+    if (getExtraWhere() != null) {
+      sb.append(" and ");
+      if (hasJoinTable()) {
+        sb.append(getExtraWhere().replace("${ta}", "x2").replace("${mta}", "x"));
+      } else {
+        sb.append(getExtraWhere().replace("${ta}", "x"));
+      }
+    }
+
+    
     if (softDelete) {
       String alias = hasJoinTable() ? "x2" : "x";
       sb.append(" and ").append(targetDescriptor.getSoftDeletePredicate(alias));
@@ -1061,4 +1072,16 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   public void bindElementValue(SqlUpdate insert, Object value) {
     targetDescriptor.bindElementValue(insert, value);
   }
+  
+  /**
+   * Returns true, if we must create a m2m join table.
+   */
+  public boolean createJoinTable() {
+    if (hasJoinTable() && getMappedBy() == null) {
+      // only create on other 'owning' side
+      return !descriptor.isTableManaged(intersectionJoin.getTable());
+    } else {
+      return false;
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index 257893820..1e078c0fd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -10,7 +10,7 @@ public interface DbSqlContext {
   /**
    * Add a join to the sql query.
    */
-  void addJoin(String type, String table, TableJoinColumn[] cols, String a1, String a2);
+  void addJoin(String type, String table, TableJoinColumn[] cols, String a1, String a2, String extraWhere);
 
   /**
    * Push the current table alias onto the stack.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index e88e56034..8c1624d05 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -34,6 +34,8 @@ public final class TableJoin {
   private final int queryHash;
 
   private final PropertyForeignKey foreignKey;
+  
+  private final String extraWhere;
 
   public TableJoin(DeployTableJoin deploy) {
     this(deploy, null);
@@ -44,6 +46,7 @@ public final class TableJoin {
    */
   public TableJoin(DeployTableJoin deploy, PropertyForeignKey foreignKey) {
     this.foreignKey = foreignKey;
+    this.extraWhere = deploy.getExtraWhere();
     this.table = InternString.intern(deploy.getTable());
     this.type = deploy.getType();
     this.inheritInfo = deploy.getInheritInfo();
@@ -57,6 +60,7 @@ public final class TableJoin {
 
   private TableJoin(TableJoin source, String overrideColumn) {
     this.foreignKey = null;
+    this.extraWhere = source.extraWhere;
     this.table = source.table;
     this.type = source.type;
     this.inheritInfo = source.inheritInfo;
@@ -146,7 +150,7 @@ public final class TableJoin {
 
   public SqlJoinType addJoin(SqlJoinType joinType, String a1, String a2, DbSqlContext ctx) {
     String joinLiteral = joinType.getLiteral(type);
-    ctx.addJoin(joinLiteral, table, columns(), a1, a2);
+    ctx.addJoin(joinLiteral, table, columns(), a1, a2, extraWhere);
     return joinType.autoToOuter(type);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
index 472a71db3..be4b77aa0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
@@ -86,6 +86,7 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
    * collection.
    */
   public void setExtraWhere(String extraWhere) {
+    this.tableJoin.setExtraWhere(extraWhere);
     this.extraWhere = extraWhere;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index d24024774..c3451f9f4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -33,6 +33,8 @@ public class DeployTableJoin {
   private ArrayList<DeployTableJoinColumn> columns = new ArrayList<>(4);
 
   private InheritInfo inheritInfo;
+  
+  private String extraWhere;
 
   /**
    * Create a DeployTableJoin.
@@ -137,6 +139,18 @@ public class DeployTableJoin {
     this.type = type;
   }
 
+  /**
+   * Returns the clause of an extra &#64;Where annotation.
+   * @return
+   */
+  public String getExtraWhere() {
+    return extraWhere;
+  }
+  
+  public void setExtraWhere(String extraWhere) {
+    this.extraWhere = extraWhere;
+  }
+  
   public DeployTableJoin createInverse(String tableName) {
 
     DeployTableJoin inverse = new DeployTableJoin();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index b47612d65..1ca59dbc8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -118,7 +118,7 @@ class AnnotationAssocManys extends AnnotationAssoc {
 
     Where where = prop.getMetaAnnotationWhere(platform);
     if (where != null) {
-      prop.setExtraWhere(where.clause());
+      prop.setExtraWhere(processFormula(where.clause()));
     }
 
     FetchPreference fetchPreference = get(prop, FetchPreference.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index b5929d6a0..36fa99b57 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -96,7 +96,7 @@ public class AnnotationAssocOnes extends AnnotationAssoc {
     Where where = prop.getMetaAnnotationWhere(platform);
     if (where != null) {
       // not expecting this to be used on assoc one properties
-      prop.setExtraWhere(where.clause());
+      prop.setExtraWhere(processFormula(where.clause()));
     }
 
     PrimaryKeyJoinColumn primaryKeyJoin = get(prop, PrimaryKeyJoinColumn.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 8079f156f..5a0caa287 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -153,7 +153,7 @@ public class AnnotationFields extends AnnotationParser {
 
     Formula formula = prop.getMetaAnnotationFormula(platform);
     if (formula != null) {
-      prop.setSqlFormula(formula.select(), formula.join());
+      prop.setSqlFormula(processFormula(formula.select()), processFormula(formula.join()));
     }
 
     initWhoProperties(prop);
@@ -334,7 +334,7 @@ public class AnnotationFields extends AnnotationParser {
     }
     Formula formula = prop.getMetaAnnotationFormula(platform);
     if (formula != null) {
-      prop.setSqlFormula(formula.select(), formula.join());
+      prop.setSqlFormula(processFormula(formula.select()), processFormula(formula.join()));
     }
 
     final Aggregation aggregation = prop.getMetaAnnotation(Aggregation.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index af015e1f5..ea880a18b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -129,4 +129,11 @@ public abstract class AnnotationParser extends AnnotationBase {
     }
     return columnNames;
   }
+
+  /**
+   * Process any formula from &#64;Formula or &#64;Where.
+   */
+  protected String processFormula(String source) {
+    return source == null ? null : source.replace("${dbTableName}", descriptor.getBaseTable());
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index 981abae74..9ee2c253c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -111,7 +111,7 @@ class DefaultDbSqlContext implements DbSqlContext {
   }
 
   @Override
-  public void addJoin(String type, String table, TableJoinColumn[] cols, String a1, String a2) {
+  public void addJoin(String type, String table, TableJoinColumn[] cols, String a1, String a2, String extraWhere) {
 
     if (tableJoins == null) {
       tableJoins = new HashSet<>();
@@ -164,6 +164,14 @@ class DefaultDbSqlContext implements DbSqlContext {
     if (addAsOfOnClause) {
       sb.append(" and ").append(historySupport.getAsOfPredicate(a2));
     }
+    
+    if (extraWhere != null && !extraWhere.isEmpty()) {
+      sb.append(" and ");
+      // we will also need a many-table alias here
+      sb.append(extraWhere.replace(tableAliasPlaceHolder, a2).replace("${mta}", a1));
+    }
+
+
   }
 
   private void appendTable(String table, String draftTable) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index 8c5517a76..d920b57ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -47,16 +47,6 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
     ctx.popTableAlias();
   }
 
-  /**
-   * 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
diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java
new file mode 100644
index 000000000..2e86cb9df
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java
@@ -0,0 +1,57 @@
+package org.tests.model.m2m;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+import io.ebean.annotation.Index;
+
+@Entity
+@Index(unique = true, columnNames = { "from_id", "to_id" })
+@Index(unique = true, columnNames = { "to_id", "from_id" })
+public class MnyEdge {
+
+  @Id
+  private Integer id;
+
+  @ManyToOne
+  private MnyNode from;
+
+  @ManyToOne
+  private MnyNode to;
+
+  private int flags;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public MnyNode getFrom() {
+    return from;
+  }
+
+  public void setFrom(MnyNode from) {
+    this.from = from;
+  }
+
+  public MnyNode getTo() {
+    return to;
+  }
+
+  public void setTo(MnyNode to) {
+    this.to = to;
+  }
+
+  public int getFlags() {
+    return flags;
+  }
+
+  public void setFlags(int flags) {
+    this.flags = flags;
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java
new file mode 100644
index 000000000..e51c5f417
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java
@@ -0,0 +1,129 @@
+package org.tests.model.m2m;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+
+import io.ebean.annotation.Platform;
+import io.ebean.annotation.Where;
+
+import java.util.List;
+
+@Entity
+public class MnyNode {
+
+  @Id
+  Integer id;
+
+  String name;
+
+  @ManyToMany
+  @JoinTable(name = "mny_edge",
+    joinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"),
+    inverseJoinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"))
+  List<MnyNode> allRelations;
+
+  @ManyToMany
+  @JoinTable(name = "mny_edge",
+    joinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"),
+    inverseJoinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"))
+  List<MnyNode> allReverseRelations;
+
+  @ManyToMany
+  @JoinTable(name = "mny_edge",
+    joinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"),
+    inverseJoinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"))
+  @Where(clause = "${mta}.flags & 1 != 0")
+  @Where(clause = "BITAND(${mta}.flags, 1) != 0", platforms = Platform.H2)
+  List<MnyNode> bit1Relations;
+
+  @ManyToMany
+  @JoinTable(name = "mny_edge",
+    joinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"),
+    inverseJoinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"))
+  @Where(clause = "${mta}.flags & 1 != 0")
+  @Where(clause = "BITAND(${mta}.flags, 1) != 0", platforms = Platform.H2)
+  List<MnyNode> bit1ReverseRelations;
+
+  @ManyToMany
+  @JoinTable(name = "mny_edge",
+    joinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"),
+    inverseJoinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"))
+  @Where(clause = "${mta}.flags & 2 != 0")
+  @Where(clause = "BITAND(${mta}.flags, 2) != 0", platforms = Platform.H2)
+  List<MnyNode> bit2Relations;
+
+  @ManyToMany
+  @JoinTable(name = "mny_edge",
+    joinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"),
+    inverseJoinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"))
+  @Where(clause = "${mta}.flags & 2 != 0")
+  @Where(clause = "BITAND(${mta}.flags, 2) != 0", platforms = Platform.H2)
+  List<MnyNode> bit2ReverseRelations;
+
+  @ManyToMany
+  @JoinTable(name = "mny_edge",
+    joinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"),
+    inverseJoinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"))
+  @Where(clause = "'${dbTableName}' = ${ta}.name")
+  List<MnyNode> withDbTableName;
+
+  public MnyNode() {
+
+  }
+
+  public MnyNode(String name) {
+    this.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 List<MnyNode> getAllRelations() {
+    return allRelations;
+  }
+
+  public List<MnyNode> getAllReverseRelations() {
+    return allReverseRelations;
+  }
+
+  public List<MnyNode> getBit1Relations() {
+    return bit1Relations;
+  }
+
+  public List<MnyNode> getBit1ReverseRelations() {
+    return bit1ReverseRelations;
+  }
+
+  public List<MnyNode> getBit2Relations() {
+    return bit2Relations;
+  }
+
+  public List<MnyNode> getBit2ReverseRelations() {
+    return bit2ReverseRelations;
+  }
+
+  public List<MnyNode> getWithDbTableName() {
+    return withDbTableName;
+  }
+
+  public void setWithDbTableName(List<MnyNode> withDbTableName) {
+    this.withDbTableName = withDbTableName;
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java
new file mode 100644
index 000000000..da8d83dd5
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java
@@ -0,0 +1,159 @@
+package org.tests.model.m2m;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.tests.model.m2m.MnyEdge;
+import org.tests.model.m2m.MnyNode;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebeantest.LoggedSql;
+
+/**
+ * Tests M2M with complex where queries.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class TestM2MWithWhere extends BaseTestCase {
+
+  @Test
+  public void testQuery() throws Exception {
+    createTestData();
+    MnyNode node = DB.find(MnyNode.class, 1);
+
+
+    List<MnyNode> result = DB.find(MnyNode.class).where().eq("allRelations", node).findList();
+    assertThat(result).extracting(MnyNode::getId).containsExactly(1, 2, 3, 4, 5);
+
+    result = DB.find(MnyNode.class).where().eq("allReverseRelations", node).findList();
+    assertThat(result).extracting(MnyNode::getId).containsExactly(1, 2, 3, 4, 5);
+
+    result = DB.find(MnyNode.class).where().eq("bit1Relations", node).findList();
+    assertThat(result).isEmpty(); // -> to = 1 column: 2 0 2 0 2
+
+    result = DB.find(MnyNode.class).where().eq("bit2Relations", node).findList();
+    assertThat(result).extracting(MnyNode::getId).containsExactly(1, 3, 5);
+
+    result = DB.find(MnyNode.class).where().eq("bit1ReverseRelations", node).findList();
+    // -> from = 1 column: 2 1 3 1 3
+    assertThat(result).extracting(MnyNode::getId).containsExactly(2, 3, 4, 5);
+
+    result = DB.find(MnyNode.class).where().eq("bit2ReverseRelations", node).findList();
+    assertThat(result).hasSize(3).extracting(MnyNode::getId).containsExactly(1, 3, 5);
+
+    result = DB.find(MnyNode.class).where().eq("bit2ReverseRelations", node).findList();
+    assertThat(result).hasSize(3).extracting(MnyNode::getId).containsExactly(1, 3, 5);
+  }
+
+  @Test
+  public void testGetter() throws Exception {
+    createTestData();
+    MnyNode node = DB.find(MnyNode.class, 3);
+
+    assertThat(node.getAllRelations()).extracting(MnyNode::getId).containsExactly(1, 2, 3, 4, 5);
+
+    assertThat(node.getAllReverseRelations()).extracting(MnyNode::getId).containsExactly(1, 2, 3, 4, 5);
+
+    assertThat(node.getBit1Relations()).extracting(MnyNode::getId).containsExactly(4, 5);
+
+    assertThat(node.getBit1ReverseRelations()).extracting(MnyNode::getId).containsExactly(1, 2);
+
+    assertThat(node.getBit2Relations()).extracting(MnyNode::getId).containsExactly(1, 3, 5);
+
+    LoggedSql.start();
+    assertThat(node.getBit2ReverseRelations()).extracting(MnyNode::getId).containsExactly(1, 3, 5);
+    List<String> sqls = LoggedSql.stop();
+    assertThat(sqls).hasSize(1); // lazy load
+
+    // prefetch everything
+    LoggedSql.start();
+    node = DB.find(MnyNode.class)
+        .fetch("bit1Relations","*")
+        .fetch("bit1ReverseRelations","*")
+        .where().idEq(3).findOne();
+    sqls = LoggedSql.stop();
+    assertThat(sqls).hasSize(2);
+
+    // no lazyLoad expected
+    LoggedSql.start();
+    assertThat(node.getBit1Relations()).extracting(MnyNode::getId).containsExactly(4, 5);
+    assertThat(node.getBit1ReverseRelations()).extracting(MnyNode::getId).containsExactly(1, 2);
+    sqls = LoggedSql.stop();
+    assertThat(sqls).hasSize(0);
+
+  }
+
+  // to =     | 1 2 3 4 5
+  // ---------+---------------
+  // from = 1 | 2 1 3 1 3
+  // from = 2 | 0 2 1 3 1
+  // from = 3 | 2 0 2 1 3
+  // from = 4 | 0 2 0 2 1
+  // from = 5 | 2 0 2 0 2
+  private void createTestData() {
+    DB.find(MnyEdge.class).delete();
+    DB.find(MnyNode.class).delete();
+    for (int i = 1; i <= 5; i++) {
+      MnyNode node = new MnyNode();
+      node.setId(i);
+      node.setName("Node #" + i);
+      DB.save(node);
+    }
+    StringBuilder sb = new StringBuilder();
+    for (int from = 1; from <= 5; from++) {
+      sb.append("from = ").append(from).append(" |");
+      for (int to = 1; to <= 5; to++) {
+        MnyEdge edge = new MnyEdge();
+        edge.setFrom(DB.getReference(MnyNode.class, from));
+        edge.setTo(DB.getReference(MnyNode.class, to));
+        int flags = 0;
+        if (from < to) {
+          flags |= 1;
+        }
+        if ((from + to) % 2 == 0) {
+          flags |= 2;
+        }
+        edge.setFlags(flags);
+        DB.save(edge);
+        sb.append("  ").append(flags);
+      }
+      sb.append('\n');
+    }
+    // System.out.println(sb); dump the table
+  }
+  
+
+  @Test
+  public void testWithDbTableName() {
+    LoggedSql.start();
+    DB.find(MnyNode.class).where().isNotNull("withDbTableName.name").findList();
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("'mny_node' = u1.name");
+
+    LoggedSql.start();
+    DB.find(MnyNode.class).where().isNotEmpty("withDbTableName").findList();
+    sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("'mny_node' = x2.name");
+  }
+
+  @Test
+  public void testLazyLoad() throws Exception {
+    MnyNode el = new MnyNode("testLazyLoad");
+    DB.save(el);
+    LoggedSql.start();
+    el = DB.find(MnyNode.class).select("name").where().eq("name", "testLazyLoad").findOne();
+    el.getWithDbTableName().size(); // trigger Lazy load
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id, t0.name from mny_node");
+    assertThat(sql.get(1)).contains("where 'mny_node' = t0.name");
+    DB.delete(el);
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java
index 76faeca0e..15b117bd0 100644
--- a/ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java
+++ b/ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java
@@ -4,6 +4,9 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
+
+import io.ebean.annotation.Where;
+
 import java.util.List;
 
 import static javax.persistence.CascadeType.ALL;
@@ -26,6 +29,10 @@ public class OmBasicParent {
   @OneToMany(cascade = ALL, mappedBy = "parent")
   private List<? extends OmBasicChild> children;
 
+  @OneToMany(cascade = ALL, mappedBy = "parent")
+  @Where(clause = "'${dbTableName}' = ${ta}.name")
+  private List<? extends OmBasicChild> childrenWithWhere;
+
   public OmBasicParent(String name) {
     this.name = name;
   }
@@ -57,4 +64,13 @@ public class OmBasicParent {
   public void setChildren(List<? extends OmBasicChild> children) {
     this.children = children;
   }
+
+  public List<? extends OmBasicChild> getChildrenWithWhere() {
+    return childrenWithWhere;
+  }
+
+  public void setChildrenWithWhere(List<? extends OmBasicChild> childrenWithWhere) {
+    this.childrenWithWhere = childrenWithWhere;
+  }
+
 }
diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java
new file mode 100644
index 000000000..e2dca664a
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java
@@ -0,0 +1,44 @@
+package org.tests.o2m;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebeantest.LoggedSql;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOneToManyWhere extends BaseTestCase {
+
+  @Test
+  public void testWithDbTableName() {
+    LoggedSql.start();
+    DB.find(OmBasicParent.class).where().isNotNull("childrenWithWhere.name").findList();
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("'om_basic_parent' = u1.name");
+
+    LoggedSql.start();
+    DB.find(OmBasicParent.class).where().isNotEmpty("childrenWithWhere").findList();
+    sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("'om_basic_parent' = x.name");
+  }
+
+  @Test
+  public void testLazyLoad() throws Exception {
+    OmBasicParent el = new OmBasicParent("testLazyLoad");
+    DB.save(el);
+    LoggedSql.start();
+    el = DB.find(OmBasicParent.class).select("name").where().eq("name", "testLazyLoad").findOne();
+    el.getChildrenWithWhere().size(); // trigger Lazy load
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id, t0.name from om_basic_parent");
+    assertThat(sql.get(1)).contains("where 'om_basic_parent' = t0.name");
+    DB.delete(el);
+  }
+
+}
diff --git a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
index c4aa242eb..eac3303fb 100644
--- a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
+++ b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java
@@ -24,11 +24,11 @@ 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 and u1.order_date is not null join o_order_detail u2 on u2.order_id = u1.id and u2.id > 0 join o_product u3 on u3.id = u2.product_id where u3.name = ?";
       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 and u1.order_date is not null join o_order_detail u2 on u2.order_id = u1.id and u2.id > 0 join o_product u3 on u3.id = u2.product_id where u3.name = ?";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     }
 
@@ -55,10 +55,10 @@ 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 and u1.order_date is not null left join o_order_detail u2 on u2.order_id = u1.id and u2.id > 0 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 and u1.order_date is not null left join o_order_detail u2 on u2.order_id = u1.id and u2.id > 0 left join o_product u3 on u3.id = u2.product_id where (u3.name = ? or t0.id = ?)";
       assertThat(sqlOf(query, 1)).contains(expectedSql);
     }
   }
@@ -76,11 +76,11 @@ 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 and u1.order_date is not null left join o_order_detail u2 on u2.order_id = u1.id and u2.id > 0 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 and u1.order_date is not null left join o_order_detail u2 on u2.order_id = u1.id and u2.id > 0 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/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java
index 250a32709..b90751c83 100644
--- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java
+++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java
@@ -41,7 +41,7 @@ public class TestManyWhereJoin extends BaseTestCase {
     }
     assertThat(sql).contains("join o_order ");
     assertThat(sql).contains(".status = ?");
-    assertThat(sql).contains("t0.id, t0.status from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id where u1.status = ?");
+    assertThat(sql).contains("t0.id, t0.status from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id and u1.order_date is not null where u1.status = ?");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
index be58fb8c4..01275cfa0 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -183,7 +183,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sqlList = LoggedSqlCollector.stop();
     assertEquals(1, sqlList.size());
-    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id) and 1=0 order by t0.id");
+    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) and 1=0 order by t0.id");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java
index d2689337b..f80aee9f5 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java
@@ -1,14 +1,15 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.m2m.Role;
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestQueryIsNull extends BaseTestCase {
 
@@ -17,90 +18,90 @@ public class TestQueryIsNull extends BaseTestCase {
   public void queryShouldContainIsNullOnColumn() {
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).where().isNull("customerName").query();
+    Query<Order> query = DB.find(Order.class).where().isNull("customerName").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains("name is null"));
+    assertThat(query.getGeneratedSql()).contains("name is null");
   }
 
   @Test
   public void isNotNull_when_OneToMany_expect_existsSubquery() {
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).where().isNotNull("details").query();
+    Query<Order> query = DB.find(Order.class).where().isNotNull("details").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains(" where exists (select 1 from o_order_detail x where x.order_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains(" where exists (select 1 from o_order_detail x where x.order_id = t0.id and x.id > 0)");
   }
 
   @Test
   public void isNotEmpty_when_OneToMany_expect_existsSubquery() {
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).where().isNotEmpty("details").query();
+    Query<Order> query = DB.find(Order.class).where().isNotEmpty("details").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains(" where exists (select 1 from o_order_detail x where x.order_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains(" where exists (select 1 from o_order_detail x where x.order_id = t0.id and x.id > 0)");
   }
 
   @Test
   public void isNull_when_OneToMany_expect_notExistsSubquery() {
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).where().isNull("details").query();
+    Query<Order> query = DB.find(Order.class).where().isNull("details").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains(" where not exists (select 1 from o_order_detail x where x.order_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains(" where not exists (select 1 from o_order_detail x where x.order_id = t0.id and x.id > 0)");
   }
 
   @Test
   public void isEmpty_when_OneToMany_expect_notExistsSubquery() {
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).where().isEmpty("details").query();
+    Query<Order> query = DB.find(Order.class).where().isEmpty("details").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains(" where not exists (select 1 from o_order_detail x where x.order_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains(" where not exists (select 1 from o_order_detail x where x.order_id = t0.id and x.id > 0)");
   }
 
   @Test
   public void isEmpty_when_ManyToMany_expect_notExistsSubqueryAndNoJoin() {
     ResetBasicData.reset();
 
-    Query<Role> query = Ebean.find(Role.class).where().isEmpty("permissions").query();
+    Query<Role> query = DB.find(Role.class).where().isEmpty("permissions").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains("from mt_role t0 where not exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains("from mt_role t0 where not exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)");
   }
 
   @Test
   public void isNull_when_ManyToMany_expect_notExistsSubqueryAndNoJoin() {
     ResetBasicData.reset();
 
-    Query<Role> query = Ebean.find(Role.class).where().isNull("permissions").query();
+    Query<Role> query = DB.find(Role.class).where().isNull("permissions").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains("from mt_role t0 where not exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains("from mt_role t0 where not exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)");
   }
 
   @Test
   public void isNotEmpty_when_ManyToMany_expect_existsSubqueryAndNoJoin() {
     ResetBasicData.reset();
 
-    Query<Role> query = Ebean.find(Role.class).where().isNotEmpty("permissions").query();
+    Query<Role> query = DB.find(Role.class).where().isNotEmpty("permissions").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains("from mt_role t0 where exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains("from mt_role t0 where exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)");
   }
 
   @Test
   public void isNotNull_when_ManyToMany_expect_existsSubqueryAndNoJoin() {
     ResetBasicData.reset();
 
-    Query<Role> query = Ebean.find(Role.class).where().isNotNull("permissions").query();
+    Query<Role> query = DB.find(Role.class).where().isNotNull("permissions").query();
     query.findList();
 
-    assertTrue(query.getGeneratedSql().contains("from mt_role t0 where exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)"));
+    assertThat(query.getGeneratedSql()).contains("from mt_role t0 where exists (select 1 from mt_role_permission x where x.mt_role_id = t0.id)");
   }
 
 }
diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java
index af52302d2..55901a720 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java
@@ -30,6 +30,6 @@ public class TestQueryRawExpressionMany extends BaseTestCase {
     query.findCount();
     List<String> sql = LoggedSqlCollector.stop();
 
-    assertThat(trimSql(sql.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 left join o_order_detail t1 on t1.order_id = t0.id where t1.order_qty = ?)");
+    assertThat(trimSql(sql.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 left join o_order_detail t1 on t1.order_id = t0.id and t1.id > 0 where t1.order_qty = ?)");
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java
index a9d18476b..44c8a78f0 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java
@@ -69,7 +69,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
     assertEquals(list.size(), rowCount);
     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 and u1.id > 0 where u1.product_id = ?)");
 
   }
 
@@ -95,7 +95,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
     List<String> sqlLogged = LoggedSqlCollector.stop();
 
     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 and u1.id > 0 where u1.product_id = ?)");
 
     query.findList();
   }
diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index f476ed084..dd230b866 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -64,7 +64,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
 
 	    assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) " +
         "from (select distinct t0.id, t0.name as attribute_ " +
-        "from o_customer t0 left join contact u1 on u1.customer_id = t0.id left join o_order u2 on u2.kcustomer_id = t0.id " +
+        "from o_customer t0 left join contact u1 on u1.customer_id = t0.id left join o_order u2 on u2.kcustomer_id = t0.id and u2.order_date is not null " +
         "where t0.name = ? and (u2.status = ? or u1.first_name = ?)) r1 " +
         "group by r1.attribute_ " +
         "order by count(*) desc, r1.attribute_");
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 3a7457a56..6530611dd 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -149,7 +149,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
   @Override
   public void visitMany(BeanPropertyAssocMany<?> p) {
-    if (p.hasJoinTable() && p.getMappedBy() == null) {
+    if (p.createJoinTable()) {
       // only create on other 'owning' side
 
       // build the create table and fkey constraints

From 824cfa27be38a62c596e33f8363d0a1d876620a4 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 23 Jun 2021 17:11:21 +0200
Subject: [PATCH 270/447] Queries are cancelable

---
 .../main/java/io/ebean/CancelableQuery.java   |  19 +
 .../src/main/java/io/ebean/DtoQuery.java      |   2 +-
 ebean-api/src/main/java/io/ebean/Query.java   |  11 +-
 .../src/main/java/io/ebean/SqlQuery.java      |   2 +-
 .../main/java/io/ebean/util/JdbcClose.java    |  13 +
 .../ebeaninternal/api/SpiCancelableQuery.java |  26 ++
 .../java/io/ebeaninternal/api/SpiQuery.java   |  13 +-
 .../io/ebeaninternal/api/SpiSqlBinding.java   |   2 +-
 .../server/core/AbstractSqlQueryRequest.java  |  56 ++-
 .../server/core/DefaultServer.java            |   2 +-
 .../server/core/DtoQueryRequest.java          |   2 +
 .../server/core/OrmQueryRequest.java          |   2 +-
 .../server/core/RelationalQueryRequest.java   |   1 +
 .../io/ebeaninternal/server/query/CQuery.java |  25 +-
 .../server/query/CQueryEngine.java            |  12 +-
 .../query/CQueryFetchSingleAttribute.java     |  48 ++-
 .../server/query/CQueryRowCount.java          |  34 +-
 .../server/query/CQueryUpdate.java            |  37 +-
 .../server/query/DtoQueryEngine.java          |   7 +-
 .../server/querydefn/AbstractQuery.java       |  56 +++
 .../server/querydefn/DefaultDtoQuery.java     |   2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  40 +-
 .../querydefn/DefaultRelationalQuery.java     |   2 +-
 .../model/basic/MyEBasicConfigStartup.java    |   6 +-
 .../org/tests/query/cancel/EBasicDto.java     |  28 ++
 .../tests/query/cancel/SlowDownEBasic.java    |  57 +++
 .../query/cancel/SqlQueryCancelTest.java      | 362 ++++++++++++++++++
 27 files changed, 731 insertions(+), 136 deletions(-)
 create mode 100644 ebean-api/src/main/java/io/ebean/CancelableQuery.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java
 create mode 100644 ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java
 create mode 100644 ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java
 create mode 100644 ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java

diff --git a/ebean-api/src/main/java/io/ebean/CancelableQuery.java b/ebean-api/src/main/java/io/ebean/CancelableQuery.java
new file mode 100644
index 000000000..fb3100bd2
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/CancelableQuery.java
@@ -0,0 +1,19 @@
+package io.ebean;
+
+/**
+ * Defines a cancelable query.
+ * <p>
+ * Typically holds a representation of the PreparedStatement to perform the
+ * actual cancel.
+ * </p>
+ */
+public interface CancelableQuery {
+
+  /**
+   * Cancel the query.
+   * <p>
+   * For JDBC this translates to calling cancel on the PreparedStatement.
+   * </p>
+   */
+  void cancel();
+}
diff --git a/ebean-api/src/main/java/io/ebean/DtoQuery.java b/ebean-api/src/main/java/io/ebean/DtoQuery.java
index 95ad6eff5..69ed034ef 100644
--- a/ebean-api/src/main/java/io/ebean/DtoQuery.java
+++ b/ebean-api/src/main/java/io/ebean/DtoQuery.java
@@ -38,7 +38,7 @@ import java.util.stream.Stream;
  *
  * }</pre>
  */
-public interface DtoQuery<T> {
+public interface DtoQuery<T> extends CancelableQuery {
 
   /**
    * Execute the query returning a list.
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index db7bf8cb9..0dc86905e 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -177,7 +177,7 @@ import java.util.stream.Stream;
  *
  * @param <T> the type of Entity bean this query will fetch.
  */
-public interface Query<T> {
+public interface Query<T> extends CancelableQuery {
 
   /**
    * The lock type (strength) to use with query FOR UPDATE row locking.
@@ -291,15 +291,6 @@ public interface Query<T> {
    */
   UpdateQuery<T> asUpdate();
 
-  /**
-   * Cancel the query execution if supported by the underlying database and
-   * driver.
-   * <p>
-   * This must be called from a different thread to the query executor.
-   * </p>
-   */
-  void cancel();
-
   /**
    * Return a copy of the query.
    * <p>
diff --git a/ebean-api/src/main/java/io/ebean/SqlQuery.java b/ebean-api/src/main/java/io/ebean/SqlQuery.java
index 46b26c90a..9a878f233 100644
--- a/ebean-api/src/main/java/io/ebean/SqlQuery.java
+++ b/ebean-api/src/main/java/io/ebean/SqlQuery.java
@@ -37,7 +37,7 @@ import java.util.function.Predicate;
  *
  * }</pre>
  */
-public interface SqlQuery extends Serializable {
+public interface SqlQuery extends Serializable, CancelableQuery {
 
   /**
    * Execute the query returning a list.
diff --git a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
index 92b3f7e28..b72f59c4d 100644
--- a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
+++ b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
@@ -66,4 +66,17 @@ public class JdbcClose {
       logger.warn("Error on connection rollback", e);
     }
   }
+
+  /**
+   * Cancels the statement
+   */
+  public static void cancel(Statement stmt) {
+    try {
+      if (stmt != null) {
+        stmt.cancel();
+      }
+    } catch (SQLException e) {
+      logger.warn("Error on cancelling statement", e);
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java
new file mode 100644
index 000000000..10a53b9a7
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java
@@ -0,0 +1,26 @@
+package io.ebeaninternal.api;
+
+import javax.persistence.PersistenceException;
+
+import io.ebean.CancelableQuery;
+
+/**
+ * Cancellable query, that has a delegate.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public interface SpiCancelableQuery extends CancelableQuery {
+
+  /**
+   * Checks if the query was cancelled.
+   * @throws PersistenceException if query was cancelled.
+   */
+  void checkCancelled();
+
+  /**
+   * Set the underlying cancelable query (with the PreparedStatement).
+   */
+  void setCancelableQuery(CancelableQuery cancelableQuery);
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 4686a3644..12942e7d6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -17,7 +17,6 @@ import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.TableJoin;
-import io.ebeaninternal.server.query.CancelableQuery;
 import io.ebeaninternal.server.querydefn.NaturalKeyBindParam;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
@@ -31,7 +30,7 @@ import java.util.Set;
 /**
  * Object Relational query - Internal extension to Query object.
  */
-public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCodes {
+public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCodes, SpiCancelableQuery {
 
   enum Mode {
     NORMAL(false), LAZYLOAD_MANY(false), LAZYLOAD_BEAN(true), REFRESH_BEAN(true);
@@ -847,16 +846,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    */
   ReadEvent getFutureFetchAudit();
 
-  /**
-   * Set the underlying cancelable query (with the PreparedStatement).
-   */
-  void setCancelableQuery(CancelableQuery cancelableQuery);
-
-  /**
-   * Return true if this query has been cancelled.
-   */
-  boolean isCancelled();
-
   /**
    * Return the base table to use if user defined on the query.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
index 849ad0cb0..62b93d34c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 /**
  * SQL query binding (for SqlQuery and DtoQuery).
  */
-public interface SpiSqlBinding {
+public interface SpiSqlBinding extends SpiCancelableQuery {
 
   /**
    * Return the named or positioned parameters.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 8a5e9214d..67844c631 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.CancelableQuery;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.*;
@@ -12,11 +13,14 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.concurrent.locks.ReentrantLock;
+
+import javax.persistence.PersistenceException;
 
 /**
  * Wraps the objects involved in executing a SQL / Relational Query.
  */
-public abstract class AbstractSqlQueryRequest {
+public abstract class AbstractSqlQueryRequest implements CancelableQuery {
 
   protected final SpiSqlBinding query;
 
@@ -36,6 +40,8 @@ public abstract class AbstractSqlQueryRequest {
 
   protected long startNano;
 
+  private final ReentrantLock lock = new ReentrantLock();
+  
   /**
    * Create the BeanFindRequest.
    */
@@ -43,6 +49,7 @@ public abstract class AbstractSqlQueryRequest {
     this.server = server;
     this.query = query;
     this.transaction = (SpiTransaction) t;
+    this.query.setCancelableQuery(this);
   }
 
   /**
@@ -137,24 +144,30 @@ public abstract class AbstractSqlQueryRequest {
   }
 
   protected void executeAsSql(Binder binder) throws SQLException {
-    prepareSql();
-    Connection conn = transaction.getInternalConnection();
-    pstmt = conn.prepareStatement(sql);
-    if (query.getTimeout() > 0) {
-      pstmt.setQueryTimeout(query.getTimeout());
+    lock.lock();
+    try {
+      query.checkCancelled();
+      prepareSql();
+      Connection conn = transaction.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()) {
+        transaction.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ")"));
+      }
+    } finally {
+      lock.unlock();
     }
-    if (query.getBufferFetchSizeHint() > 0) {
-      pstmt.setFetchSize(query.getBufferFetchSizeHint());
-    }
-    BindParams bindParams = query.getBindParams();
-    if (!bindParams.isEmpty()) {
-      this.bindLog = binder.bind(bindParams, pstmt, conn);
-    }
-    if (isLogSql()) {
-      transaction.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ")"));
-    }
-
     setResultSet(pstmt.executeQuery(), null);
+    query.checkCancelled();
   }
 
   /**
@@ -164,4 +177,13 @@ public abstract class AbstractSqlQueryRequest {
     return sql;
   }
 
+  @Override
+  public void cancel() {
+    lock.lock();
+    try {
+      JdbcClose.cancel(pstmt);
+    } finally {
+      lock.unlock();
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 231f0b718..87580f90b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1382,7 +1382,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Nonnull
   @Override
   public <T> FutureList<T> findFutureList(Query<T> query, Transaction t) {
-    SpiQuery<T> spiQuery = (SpiQuery<T>) query;
+    SpiQuery<T> spiQuery = (SpiQuery<T>) query.copy();
     spiQuery.setFutureFetch(true);
     // FutureList query always run in it's own persistence content
     spiQuery.setPersistenceContext(new DefaultPersistenceContext());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index f4cdbc236..2b1a55f6e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -53,6 +53,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
       ormQuery.setType(type);
       ormQuery.setManualId();
 
+      query.setCancelableQuery(ormQuery);
       // execute the underlying ORM query returning the ResultSet
       SpiResultSet result = server.findResultSet(ormQuery, transaction);
       this.pstmt = result.getStatement();
@@ -117,6 +118,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
   }
 
   public boolean next() throws SQLException {
+    query.checkCancelled();
     return dataReader.next();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 5548c88e3..0fb83a18f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.CacheMode;
+import io.ebean.CancelableQuery;
 import io.ebean.OrderBy;
 import io.ebean.PersistenceContextScope;
 import io.ebean.QueryIterator;
@@ -35,7 +36,6 @@ import io.ebeaninternal.server.deploy.DeployPropertyParserMap;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.loadcontext.DLoadContext;
 import io.ebeaninternal.server.query.CQueryPlan;
-import io.ebeaninternal.server.query.CancelableQuery;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index 9a0ceb153..a5130ef22 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -139,6 +139,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   @Override
   public boolean next() throws SQLException {
+    query.checkCancelled();
     if (!resultSet.next()) {
       return false;
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 0fb7e9dcf..e7674a31c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.CancelableQuery;
 import io.ebean.QueryIterator;
 import io.ebean.Version;
 import io.ebean.bean.*;
@@ -139,8 +140,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
    */
   private PreparedStatement pstmt;
 
-  private boolean cancelled;
-
   private String bindLog;
 
   private final CQueryPlan queryPlan;
@@ -272,15 +271,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   public void cancel() {
     lock.lock();
     try {
-      this.cancelled = true;
-      if (pstmt != null) {
-        try {
-          logger.debug("Cancelling query");
-          pstmt.cancel();
-        } catch (SQLException e) {
-          throw new PersistenceException("Error cancelling query", e);
-        }
-      }
+      JdbcClose.cancel(pstmt);
     } finally {
       lock.unlock();
     }
@@ -312,9 +303,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   ResultSet prepareResultSet(boolean forwardOnlyHint) throws SQLException {
     lock.lock();
     try {
-      if (cancelled) {
-        throw new SQLException("Query cancelled");
-      }
+      // cancelled before we started
+      query.checkCancelled();
       startNano = System.nanoTime();
       SpiTransaction t = request.getTransaction();
       profileOffset = t.profileOffset();
@@ -342,10 +332,12 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
         pstmt.setFetchSize(query.getBufferFetchSizeHint());
       }
       bindLog = predicates.bind(queryPlan.bindEncryptedProperties(pstmt, conn));
-      return pstmt.executeQuery();
     } finally {
       lock.unlock();
     }
+    ResultSet ret = pstmt.executeQuery();
+    query.checkCancelled();
+    return ret;
   }
 
   /**
@@ -491,7 +483,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   boolean hasNext() throws SQLException {
     lock.lock();
     try {
-      if (noMoreRows || cancelled) {
+      query.checkCancelled();
+      if (noMoreRows) {
         return false;
       }
       if (hasNextCache) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index c632c9aeb..a1a211c0a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -66,11 +66,13 @@ public class CQueryEngine {
 
   public <T> int delete(OrmQueryRequest<T> request) {
     CQueryUpdate query = queryBuilder.buildUpdateQuery(true, request);
+    request.setCancelableQuery(query);
     return executeUpdate(request, query);
   }
 
   public <T> int update(OrmQueryRequest<T> request) {
     CQueryUpdate query = queryBuilder.buildUpdateQuery(false, request);
+    request.setCancelableQuery(query);
     return executeUpdate(request, query);
   }
 
@@ -97,6 +99,7 @@ public class CQueryEngine {
   public <A> List<A> findSingleAttributeList(OrmQueryRequest<?> request) {
 
     CQueryFetchSingleAttribute rcQuery = queryBuilder.buildFetchAttributeQuery(request);
+    request.setCancelableQuery(rcQuery);
     return findAttributeList(request, rcQuery);
   }
 
@@ -151,6 +154,7 @@ public class CQueryEngine {
   public <A> List<A> findIds(OrmQueryRequest<?> request) {
 
     CQueryFetchSingleAttribute rcQuery = queryBuilder.buildFetchIdsQuery(request);
+    request.setCancelableQuery(rcQuery);
     return findAttributeList(request, rcQuery);
   }
 
@@ -164,6 +168,7 @@ public class CQueryEngine {
   public <T> int findCount(OrmQueryRequest<T> request) {
 
     CQueryRowCount rcQuery = queryBuilder.buildRowCountQuery(request);
+    request.setCancelableQuery(rcQuery);
     try {
 
       int count = rcQuery.findCount();
@@ -235,8 +240,10 @@ public class CQueryEngine {
 
     } catch (SQLException e) {
       try {
+        PersistenceException pex = cquery.createPersistenceException(e);
+        // create exception before closing connection
         cquery.close();
-        throw cquery.createPersistenceException(e);
+        throw pex;
       } finally {
         request.rollbackTransIfRequired();
       }
@@ -259,6 +266,7 @@ public class CQueryEngine {
     // order by lower sys period desc
     query.order().desc(sysPeriodLower);
     CQuery<T> cquery = queryBuilder.buildQuery(request);
+    request.setCancelableQuery(cquery);
     try {
       cquery.prepareBindExecuteQuery();
       if (request.isLogSql()) {
@@ -327,6 +335,7 @@ public class CQueryEngine {
    */
   public <T> SpiResultSet findResultSet(OrmQueryRequest<T> request) {
     CQuery<T> cquery = queryBuilder.buildQuery(request);
+    request.setCancelableQuery(cquery);
     try {
       boolean fwdOnly;
       if (request.isFindIterate()) {
@@ -411,6 +420,7 @@ public class CQueryEngine {
     EntityBean bean = null;
 
     CQuery<T> cquery = queryBuilder.buildQuery(request);
+    request.setCancelableQuery(cquery);
 
     try {
       cquery.prepareBindExecuteQuery();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 9fd7278cc..b68813bd4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.CancelableQuery;
 import io.ebean.CountedValue;
 import io.ebean.core.type.ScalarDataReader;
 import io.ebean.util.JdbcClose;
@@ -18,11 +19,12 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Base compiled query request for single attribute queries.
  */
-class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
+class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, CancelableQuery {
 
   private static final Logger logger = LoggerFactory.getLogger(CQueryFetchSingleAttribute.class);
 
@@ -65,6 +67,8 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
   private final boolean containsCounts;
 
   private long profileOffset;
+  
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * Create the Sql select based on the request.
@@ -147,21 +151,27 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
   }
 
   private void prepareExecute() throws SQLException {
-
-    SpiTransaction t = getTransaction();
-    profileOffset = t.profileOffset();
-    Connection conn = t.getInternalConnection();
-    pstmt = conn.prepareStatement(sql);
-
-    if (query.getBufferFetchSizeHint() > 0) {
-      pstmt.setFetchSize(query.getBufferFetchSizeHint());
+    lock.lock();
+    try {
+      query.checkCancelled();
+      SpiTransaction t = getTransaction();
+      profileOffset = t.profileOffset();
+      Connection conn = t.getInternalConnection();
+      pstmt = conn.prepareStatement(sql);
+  
+      if (query.getBufferFetchSizeHint() > 0) {
+        pstmt.setFetchSize(query.getBufferFetchSizeHint());
+      }
+      if (query.getTimeout() > 0) {
+        pstmt.setQueryTimeout(query.getTimeout());
+      }
+  
+      bindLog = predicates.bind(pstmt, conn);
+    } finally {
+      lock.unlock();
     }
-    if (query.getTimeout() > 0) {
-      pstmt.setQueryTimeout(query.getTimeout());
-    }
-
-    bindLog = predicates.bind(pstmt, conn);
     dataReader = new RsetDataReader(request.getDataTimeZone(), pstmt.executeQuery());
+    query.checkCancelled();
   }
 
   /**
@@ -194,4 +204,14 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent {
   Set<String> getDependentTables() {
     return queryPlan.getDependentTables();
   }
+
+  @Override
+  public void cancel() {
+    lock.lock();
+    try {
+      JdbcClose.cancel(pstmt);
+    } finally {
+      lock.unlock();
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index 6a3d40a59..248fa9058 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.CancelableQuery;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
@@ -13,11 +14,12 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Executes the select row count query.
  */
-class CQueryRowCount implements SpiProfileTransactionEvent {
+class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuery {
 
   private final CQueryPlan queryPlan;
 
@@ -57,6 +59,8 @@ class CQueryRowCount implements SpiProfileTransactionEvent {
   private int rowCount;
 
   private long profileOffset;
+  
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * Create the Sql select based on the request.
@@ -110,14 +114,22 @@ class CQueryRowCount implements SpiProfileTransactionEvent {
       SpiTransaction t = getTransaction();
       profileOffset = t.profileOffset();
       Connection conn = t.getInternalConnection();
-      pstmt = conn.prepareStatement(sql);
+      lock.lock();
+      try {
+        query.checkCancelled();
+        pstmt = conn.prepareStatement(sql);
 
-      if (query.getTimeout() > 0) {
-        pstmt.setQueryTimeout(query.getTimeout());
+        if (query.getTimeout() > 0) {
+          pstmt.setQueryTimeout(query.getTimeout());
+        }
+
+        bindLog = predicates.bind(pstmt, conn);
+      } finally {
+        lock.unlock();
       }
-
-      bindLog = predicates.bind(pstmt, conn);
       rset = pstmt.executeQuery();
+      query.checkCancelled();
+      
       if (!rset.next()) {
         throw new PersistenceException("Expecting 1 row but got none?");
       }
@@ -161,4 +173,14 @@ class CQueryRowCount implements SpiProfileTransactionEvent {
   Set<String> getDependentTables() {
     return queryPlan.getDependentTables();
   }
+
+  @Override
+  public void cancel() {
+    lock.lock();
+    try {
+      JdbcClose.cancel(pstmt);
+    } finally {
+      lock.unlock();
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index 76858c271..eec5d2e6f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;
 
+import io.ebean.CancelableQuery;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
@@ -10,11 +11,12 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * Executes the delete query.
+ * Executes the update query.
  */
-class CQueryUpdate implements SpiProfileTransactionEvent {
+class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery {
 
   private final CQueryPlan queryPlan;
 
@@ -45,6 +47,8 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
 
   private long profileOffset;
 
+  private final ReentrantLock lock = new ReentrantLock();
+  
   /**
    * Create the Sql select based on the request.
    */
@@ -82,15 +86,22 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
       SpiTransaction t = getTransaction();
       profileOffset = t.profileOffset();
       Connection conn = t.getInternalConnection();
-      pstmt = conn.prepareStatement(sql);
+      lock.lock();
+      try {
+        query.checkCancelled();
+        pstmt = conn.prepareStatement(sql);
 
-      if (query.getTimeout() > 0) {
-        pstmt.setQueryTimeout(query.getTimeout());
+        if (query.getTimeout() > 0) {
+          pstmt.setQueryTimeout(query.getTimeout());
+        }
+
+        bindLog = predicates.bind(pstmt, conn);
+      } finally {
+        lock.unlock();
       }
-
-      bindLog = predicates.bind(pstmt, conn);
       rowCount = pstmt.executeUpdate();
-
+      query.checkCancelled();
+      
       long executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
       request.slowQueryCheck(executionTimeMicros, rowCount);
       if (queryPlan.executionTime(executionTimeMicros)) {
@@ -122,4 +133,14 @@ class CQueryUpdate implements SpiProfileTransactionEvent {
       .profileStream()
       .addQueryEvent(query.profileEventId(), profileOffset, desc.getName(), rowCount, query.getProfileId());
   }
+
+  @Override
+  public void cancel() {
+    lock.lock();
+    try {
+      JdbcClose.cancel(pstmt);
+    } finally {
+      lock.unlock();
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
index 46de28b8b..526d36dee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
@@ -29,7 +29,7 @@ public class DtoQueryEngine {
       }
       return rows;
 
-    } catch (Throwable e) {
+    } catch (SQLException e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
     } finally {
       request.close();
@@ -51,7 +51,7 @@ public class DtoQueryEngine {
       while (request.next()) {
         consumer.accept(request.readNextBean());
       }
-    } catch (Exception e) {
+    } catch (SQLException e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
     } finally {
       request.close();
@@ -88,9 +88,8 @@ public class DtoQueryEngine {
           break;
         }
       }
-    } catch (Exception e) {
+    } catch (SQLException e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
-
     } finally {
       request.close();
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java
new file mode 100644
index 000000000..62fd3cdf0
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java
@@ -0,0 +1,56 @@
+package io.ebeaninternal.server.querydefn;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+import javax.persistence.PersistenceException;
+
+import io.ebean.CancelableQuery;
+import io.ebeaninternal.api.SpiCancelableQuery;
+
+/**
+ * Common code for Dto/Orm/RelationalQuery
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class AbstractQuery implements SpiCancelableQuery {
+
+  private boolean cancelled;
+
+  private CancelableQuery cancelableQuery;
+
+  private final ReentrantLock lock = new ReentrantLock();
+  
+  @Override
+  public void cancel() {
+    lock.lock();
+    try {
+      if (!cancelled) {
+        cancelled = true;
+        if (cancelableQuery != null) {
+          cancelableQuery.cancel();
+        }
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Override
+  public void checkCancelled() {
+    if (cancelled) {
+      throw new PersistenceException("Query was cancelled");
+    }
+  }
+
+  @Override
+  public void setCancelableQuery(CancelableQuery cancelableQuery) {
+    lock.lock();
+    try {
+      checkCancelled();
+      this.cancelableQuery = cancelableQuery;
+    } finally {
+      lock.unlock();
+    }
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index 9afcb961f..c2cb02198 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -21,7 +21,7 @@ import java.util.stream.Stream;
 /**
  * Default implementation of DtoQuery.
  */
-public class DefaultDtoQuery<T> implements SpiDtoQuery<T> {
+public class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQuery<T> {
 
   private final SpiEbeanServer server;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 71fe9ff68..0eb5e619c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -58,7 +58,6 @@ 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;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.transaction.ExternalJdbcTransaction;
@@ -81,7 +80,7 @@ import java.util.stream.Stream;
 /**
  * Default implementation of an Object Relational query.
  */
-public class DefaultOrmQuery<T> implements SpiQuery<T> {
+public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   private static final String DEFAULT_QUERY_NAME = "default";
 
@@ -113,10 +112,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private ProfilingListener profilingListener;
 
-  private boolean cancelled;
-
-  private CancelableQuery cancelableQuery;
-
   private Type type;
 
   private String label;
@@ -856,6 +851,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.parentNode = parentNode;
     copy.forUpdate = forUpdate;
     copy.rawSql = rawSql;
+    setCancelableQuery(copy); // required to cancel findId query
     return copy;
   }
 
@@ -2046,16 +2042,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return futureFetchAudit;
   }
 
-  @Override
-  public void setCancelableQuery(CancelableQuery cancelableQuery) {
-    lock.lock();
-    try {
-      this.cancelableQuery = cancelableQuery;
-    } finally {
-      lock.unlock();
-    }
-  }
-
   @Override
   public Query<T> setBaseTable(String baseTable) {
     this.baseTable = baseTable;
@@ -2083,28 +2069,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return rootTableAlias != null ? rootTableAlias : defaultAlias;
   }
 
-  @Override
-  public void cancel() {
-    lock.lock();
-    try {
-      if (!cancelled && cancelableQuery != null) {
-        cancelled = true;
-        cancelableQuery.cancel();
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  @Override
-  public boolean isCancelled() {
-    lock.lock();
-    try {
-      return cancelled;
-    } finally {
-      lock.unlock();
-    }
-  }
 
   @Override
   public Set<String> validate() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index 182b1cfd4..6afe54a1f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -17,7 +17,7 @@ import java.util.function.Predicate;
 /**
  * Default implementation of SQuery - SQL Query.
  */
-public class DefaultRelationalQuery implements SpiSqlQuery {
+public class DefaultRelationalQuery extends AbstractQuery implements SpiSqlQuery {
 
   private static final long serialVersionUID = -1098305779779591068L;
 
diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java b/ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java
index 72cb3e689..c27c5e79b 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java
@@ -59,19 +59,19 @@ public class MyEBasicConfigStartup implements ServerConfigStartup {
     @Override
     public void inserted(Object bean) {
       insertCount.incrementAndGet();
-      System.out.println("-- EBasic inserted " + ((EBasic) bean).getId());
+      // System.out.println("-- EBasic inserted " + ((EBasic) bean).getId());
     }
 
     @Override
     public void updated(Object bean, Set<String> updatedProperties) {
       updateCount.incrementAndGet();
-      System.out.println("-- EBasic updated " + ((EBasic) bean).getId() + " updatedProperties: " + updatedProperties);
+      // System.out.println("-- EBasic updated " + ((EBasic) bean).getId() + " updatedProperties: " + updatedProperties);
     }
 
     @Override
     public void deleted(Object bean) {
       deleteCount.incrementAndGet();
-      System.out.println("-- EBasic deleted " + ((EBasic) bean).getId());
+      // System.out.println("-- EBasic deleted " + ((EBasic) bean).getId());
     }
 
   }
diff --git a/ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java b/ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java
new file mode 100644
index 000000000..49b6b157c
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java
@@ -0,0 +1,28 @@
+package org.tests.query.cancel;
+
+import org.tests.model.basic.EBasic.Status;
+
+/**
+ * DTO for Ebasic Queries.
+ */
+public class EBasicDto {
+  private Integer id;
+
+  private Status status;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Status getStatus() {
+    return status;
+  }
+
+  public void setStatus(Status status) {
+    this.status = status;
+  }
+}
\ No newline at end of file
diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java b/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java
new file mode 100644
index 000000000..68d6c038b
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java
@@ -0,0 +1,57 @@
+package org.tests.query.cancel;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.h2.api.Trigger;
+
+import io.ebean.DB;
+import io.ebean.Transaction;
+
+/**
+ * Class to artificially slow down selects on 'e_basic' table
+ */
+public class SlowDownEBasic implements Trigger {
+
+  private static int wait;
+
+  private static boolean triggerInstalled;
+
+  @Override
+  public void init(final Connection conn, final String schemaName, final String triggerName, final String tableName,
+      final boolean before, final int type) {
+  }
+
+  @Override
+  public void fire(final Connection conn, final Object[] oldRow, final Object[] newRow) {
+    try {
+      Thread.sleep(wait);
+    } catch (InterruptedException e) {
+      // nop
+    }
+  }
+
+  @Override
+  public void close() {
+  }
+
+  @Override
+  public void remove() {
+  }
+
+
+  public static void setSelectWaitMillis(final int wait) throws SQLException {
+    SlowDownEBasic.wait = wait;
+    if (triggerInstalled) {
+      return;
+    }
+    triggerInstalled = true;
+    try (Transaction txn = DB.beginTransaction(); Statement stmt = txn.getConnection().createStatement()) {
+
+      stmt.execute("CREATE TRIGGER SLOW_DOWN_E_BASIC BEFORE SELECT ON e_basic " + "CALL \""
+          + SlowDownEBasic.class.getName() + "\"");
+      txn.commit();
+    }
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
new file mode 100644
index 000000000..d3dda7443
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
@@ -0,0 +1,362 @@
+package org.tests.query.cancel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.sql.SQLException;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import javax.persistence.PersistenceException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.tests.model.basic.EBasic;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.DtoQuery;
+import io.ebean.Query;
+import io.ebean.QueryIterator;
+import io.ebean.SqlQuery;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+
+/**
+ * Tests, if all kind of queries are cancelable. There are two ways how to
+ * cancel a query: <br/>
+ * <b>At begin:</b>
+ * 
+ * <pre>
+ * query = DB.find(...)
+ * query.cancel();
+ * query.findList();
+ * </pre>
+ * 
+ * The query was caneled before executing. In this case we do hit the DB driver
+ * <br/>
+ * <br/>
+ * <b>During run:</b>
+ * 
+ * <pre>
+ * // Thread 1:              Thread 2
+ * query = DB.find(...)
+ * query.findList();
+ *    ...finding
+ *     ...finding            query.cancel();
+ *      ...JDBC-Exception
+ * </pre>
+ * 
+ * The test tries to simulate a slow query by installing the
+ * {@link SlowDownEBasic} 'SELECT' trigger. The trigger can be configured to
+ * wait 3 * <code>timing</code> ms and a second thread will cancel the query in
+ * <code>timing</code> ms.
+ * 
+ * in this case, we expect a JDBC exception from the driver. <br/>
+ * <br/>
+ * NOTE:<br/>
+ * H2 checks the cancel flag in org.h2.command.Prepared::setCurrentRowNumber
+ * only every 128th row. So we need at least 128 models and we cannot check
+ * queries like findCount or findOne, because they only return one row.
+ * 
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class SqlQueryCancelTest extends BaseTestCase {
+
+  private int timing = 10;
+  
+  @BeforeClass
+  public static void setupTestData() throws SQLException {
+    for (int i = 0; i < 128; i++) {
+      EBasic model = new EBasic("Basic " + i);
+      DB.save(model);
+    }
+    SlowDownEBasic.setSelectWaitMillis(0);
+  }
+
+  @Test
+  public void cancelSqlQueryAtBegin() throws SQLException {
+    doCancelSqlAtBegin(SqlQuery::findList);
+    doCancelSqlAtBegin(SqlQuery::findOne);
+    doCancelSqlAtBegin(q -> q.findEach(e -> {}));
+    doCancelSqlAtBegin(q -> q.findEachWhile(e -> true));
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void cancelSqlDuringRun() throws SQLException {
+
+    doCancelSqlDuringRun(SqlQuery::findList);
+    // doCancelSqlDuringRun(q -> q.setMaxRows(1).findOne());
+    // findOne cannot be tested, as H2 does the cancel check every 128 rows only
+    doCancelSqlDuringRun(q -> q.findEach(e -> {}));
+    doCancelSqlDuringRun(q -> q.findEachWhile(e -> true));
+  }
+
+  
+  @Test
+  public void cancelOrmQueryAtBegin() throws SQLException {
+    doCancelOrmAtBegin(Query::findCount); 
+    doCancelOrmAtBegin(Query::findFutureCount);
+    // We cannot test 'findCount' due H2 restrictions
+    doCancelOrmAtBegin(Query::findFutureIds);
+    doCancelOrmAtBegin(Query::findFutureList);
+    doCancelOrmAtBegin(Query::findIds);
+    doCancelOrmAtBegin(Query::findIterate);
+    doCancelOrmAtBegin(Query::findList);
+    doCancelOrmAtBegin(Query::findMap);
+    doCancelOrmAtBegin(Query::findOne);
+    doCancelOrmAtBegin(q -> q.setMaxRows(1000).findPagedList().getList()); // untested
+    doCancelOrmAtBegin(Query::findSet);
+    doCancelOrmAtBegin(Query::findSingleAttribute);
+    doCancelOrmAtBegin(Query::findSingleAttributeList);
+    doCancelOrmAtBegin(Query::findStream);
+   //  testDuringRun(Query::findVersions);
+    // EBasic has no history support, but it should work if @History is added
+    doCancelOrmAtBegin(q -> q.findEach(e -> {}));
+    doCancelOrmAtBegin(q -> q.findEachWhile(e -> true));
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void cancelOrmDuringRun() throws Throwable {
+    // doCancelOrmDuringRun(Query::findCount);
+    // testDuringRunFuture(Query::findFutureCount);
+    // We cannot test 'findCount' due H2 restrictions
+    doCancelOrmFutureDuringRun(Query::findFutureIds);
+    doCancelOrmFutureDuringRun(Query::findFutureList);
+    doCancelOrmDuringRun(Query::findIds);
+    doCancelOrmDuringRun(Query::findIterate);
+    doCancelOrmDuringRun(Query::findList);
+    doCancelOrmDuringRun(Query::findMap);
+    // doCancelOrmDuringRun(q -> q.setMaxRows(1).findOne());
+    // findOne cannot be tested, as H2 does the cancel check every 128 rows only
+    doCancelOrmDuringRun(q -> q.setMaxRows(1000).findPagedList().getList()); // untested
+    doCancelOrmDuringRun(Query::findSet);
+    doCancelOrmDuringRun(Query::findSingleAttribute);
+    doCancelOrmDuringRun(Query::findSingleAttributeList);
+    doCancelOrmDuringRun(Query::findStream);
+   //  testDuringRun(Query::findVersions);
+    // EBasic has no history support, but it should work if @History is added
+    doCancelOrmDuringRun(q -> q.findEach(e -> {}));
+    doCancelOrmDuringRun(q -> q.findEachWhile(e -> true));
+  }
+
+  @Test
+  public void cancelOrmDuringIterate() throws SQLException {
+
+    Query<EBasic> query = DB.find(EBasic.class);
+
+    QueryIterator<EBasic> iter = query.findIterate();
+    assertThat(iter.hasNext()).isTrue();
+    query.cancel();
+    assertThat(iter.next()).isNotNull();
+
+    // We might have 100 entities in a buffer. So we must iterate through all.
+    assertThatThrownBy(() -> {
+      while(iter.hasNext()) iter.next();
+    })
+      .isInstanceOf(PersistenceException.class)
+      .hasMessageContaining("Query was cancelled");
+  }
+
+  @Test
+  public void cancelOrmDtoQueryAtBegin() throws SQLException {
+
+    doCancelOrmDtoAtBegin(DtoQuery::findIterate);
+    doCancelOrmDtoAtBegin(DtoQuery::findList);
+    doCancelOrmDtoAtBegin(DtoQuery::findOne);
+    doCancelOrmDtoAtBegin(DtoQuery::findStream);
+    doCancelOrmDtoAtBegin(q -> q.findEach(e -> {}));
+    doCancelOrmDtoAtBegin(q -> q.findEachWhile(e -> true));
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void cancelOrmDtoDuringRun() throws SQLException {
+
+    doCancelOrmDtoDuringRun(DtoQuery::findIterate);
+    doCancelOrmDtoDuringRun(DtoQuery::findList);
+    // doCancelOrmDtoDuringRun(q -> q.setMaxRows(1).findOne());
+    // findOne cannot be tested, as H2 does the cancel check every 128 rows only
+    doCancelOrmDtoDuringRun(DtoQuery::findStream);
+    doCancelOrmDtoDuringRun(q -> q.findEach(e -> {}));
+    doCancelOrmDtoDuringRun(q -> q.findEachWhile(e -> true));
+  }
+
+  @Test
+  public void cancelOrmDtoDuringIterate() throws SQLException {
+
+    DtoQuery<EBasicDto> query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
+
+    QueryIterator<EBasicDto> iter = query.findIterate();
+    assertThat(iter.hasNext()).isTrue();
+    query.cancel();
+    assertThat(iter.next()).isNotNull();
+
+    // We might have 100 entities in a buffer. So we must iterate through all.
+    assertThatThrownBy(() -> {
+      while(iter.hasNext()) iter.next();
+    })
+      .isInstanceOf(PersistenceException.class)
+      .hasMessageContaining("Query was cancelled");
+  }
+  
+  @Test
+  public void cancelSqlDtoQueryAtBegin() throws SQLException {
+
+    doCancelSqlDtoAtBegin(DtoQuery::findIterate);
+    doCancelSqlDtoAtBegin(DtoQuery::findList);
+    doCancelSqlDtoAtBegin(DtoQuery::findOne);
+    doCancelSqlDtoAtBegin(DtoQuery::findStream);
+    doCancelSqlDtoAtBegin(q -> q.findEach(e -> {}));
+    doCancelSqlDtoAtBegin(q -> q.findEachWhile(e -> true));
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  public void cancelSqlDtoDuringRun() throws SQLException {
+
+    //doCancelSqlDtoDuringRun(DtoQuery::findIterate);
+    doCancelSqlDtoDuringRun(DtoQuery::findList);
+    // doCancelSqlDtoDuringRun(q -> q.setMaxRows(1).findOne());
+    // findOne cannot be tested, as H2 does the cancel check every 128 rows only
+    doCancelSqlDtoDuringRun(DtoQuery::findStream);
+    doCancelSqlDtoDuringRun(q -> q.findEach(e -> {}));
+    doCancelSqlDtoDuringRun(q -> q.findEachWhile(e -> true));
+  }
+
+  @Test
+  public void cancelSqlDtoDuringIterate() throws SQLException {
+
+    DtoQuery<EBasicDto> query = DB.findDto(EBasicDto.class, "select id, status from e_basic");
+
+    QueryIterator<EBasicDto> iter = query.findIterate();
+    assertThat(iter.hasNext()).isTrue();
+    query.cancel();
+    assertThat(iter.next()).isNotNull();
+
+    // We might have 100 entities in a buffer. So we must iterate through all.
+    assertThatThrownBy(() -> {
+      while(iter.hasNext()) iter.next();
+    })
+      .isInstanceOf(PersistenceException.class)
+      .hasMessageContaining("Query was cancelled");
+  }
+
+  private void doCancelSqlAtBegin(Consumer<SqlQuery> test) throws SQLException {
+    SqlQuery query = DB.sqlQuery("select * from e_basic");
+    query.cancel();
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasMessageContaining("Query was cancelled");
+  }
+
+  private void doCancelSqlDuringRun(Consumer<SqlQuery> test) throws SQLException {
+    SqlQuery warmup = DB.sqlQuery("select * from e_basic");
+    test.accept(warmup);
+    SqlQuery query = DB.sqlQuery("select * from e_basic");
+    executeDelayed(query::cancel);
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
+  }
+
+  private void doCancelOrmAtBegin(Consumer<Query<EBasic>> test) throws SQLException {
+    Query<EBasic> query = DB.find(EBasic.class);
+    query.cancel();
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasMessageContaining("Query was cancelled");
+  }
+
+  private void doCancelOrmDuringRun(Consumer<Query<EBasic>> test) throws SQLException {
+    Query<EBasic> warmup = DB.find(EBasic.class);
+    test.accept(warmup);
+    Query<EBasic> warmup2 = DB.find(EBasic.class);
+    test.accept(warmup2);
+    Query<EBasic> query = DB.find(EBasic.class);
+    executeDelayed(query::cancel);
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
+  }
+
+  private void doCancelOrmFutureDuringRun(Function<Query<EBasic>, Future<?>> test) throws SQLException, InterruptedException, ExecutionException {
+    Query<EBasic> warmup = DB.find(EBasic.class);
+    test.apply(warmup).get();
+    
+    Query<EBasic> query = DB.find(EBasic.class);
+    executeDelayed(query::cancel);
+    assertThatThrownBy(() -> {
+      try {
+        test.apply(query).get();
+      } catch (ExecutionException ee) {
+        throw ee.getCause();
+      }
+    })
+      .isInstanceOf(PersistenceException.class)
+      .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
+  }
+
+  private void doCancelOrmDtoAtBegin(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
+    DtoQuery<EBasicDto> query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
+    query.cancel();
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasMessageContaining("Query was cancelled");
+  }
+  
+  private void doCancelOrmDtoDuringRun(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
+    DtoQuery<EBasicDto> warmup = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
+    test.accept(warmup);
+    
+    DtoQuery<EBasicDto> query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
+    executeDelayed(query::cancel);
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
+  }
+  
+  private void doCancelSqlDtoAtBegin(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
+    DtoQuery<EBasicDto> query = DB.findDto(EBasicDto.class, "select id, status from e_basic");
+    query.cancel();
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasMessageContaining("Query was cancelled");
+  }
+
+  private void doCancelSqlDtoDuringRun(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
+    DtoQuery<EBasicDto> warmup = DB.findDto(EBasicDto.class, "select id, status from e_basic");
+    test.accept(warmup);
+    
+    DtoQuery<EBasicDto> query = DB.findDto(EBasicDto.class, "select id, status from e_basic");
+    executeDelayed(query::cancel);
+    assertThatThrownBy(() -> test.accept(query))
+        .isInstanceOf(PersistenceException.class)
+        .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
+  }
+  
+  private void executeDelayed(Runnable r) throws SQLException {
+    // We modify the DB here. Otherwise we may hit an internal H2 cache, if the
+    // same query is performed. Queries from the cache cannot be canceled.
+    EBasic makeDbDirty = new EBasic("Basic " + UUID.randomUUID());
+    DB.save(makeDbDirty);
+    SlowDownEBasic.setSelectWaitMillis(timing * 3);
+    new Thread(() -> {
+      try {
+        Thread.sleep(timing);
+        r.run();
+        SlowDownEBasic.setSelectWaitMillis(0);
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }).start();
+  }
+
+}

From d3137be9845ee6ff7f76d1e4d29cd6483834b7ab Mon Sep 17 00:00:00 2001
From: Cas de Graaf <cdegraaf@banktrade.com>
Date: Wed, 30 Jun 2021 16:23:20 +0200
Subject: [PATCH 271/447] in addition to #2236  - autotune still throws
 RunTimeException due to existing  ORMQueryDetail.toString() calls, replaced
 with .asString()

---
 .../server/autotune/service/AutoTuneDiffCollection.java       | 4 ++--
 .../ebeaninternal/server/autotune/service/TunedQueryInfo.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java
index 9eb5439f2..e9ebe5af1 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java
@@ -113,7 +113,7 @@ public class AutoTuneDiffCollection {
 
     diffCount++;
 
-    Origin origin = createOrigin(entry, point, tuneDetail.toString());
+    Origin origin = createOrigin(entry, point, tuneDetail.asString());
     ProfileDiff diff = document.getProfileDiff();
     if (diff == null) {
       diff = new ProfileDiff();
@@ -147,7 +147,7 @@ public class AutoTuneDiffCollection {
     Origin origin = new Origin();
     origin.setKey(point.getKey());
     origin.setBeanType(point.getBeanType());
-    origin.setDetail(entry.getDetail().toString());
+    origin.setDetail(entry.getDetail().asString());
     origin.setCallStack(point.getCallOrigin().getFullDescription());
     origin.setOriginal(query);
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java
index 374a8d722..43e66c5af 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java
@@ -65,7 +65,7 @@ public class TunedQueryInfo implements Serializable {
 
   @Override
   public String toString() {
-    return tunedDetail.toString();
+    return tunedDetail.asString();
   }
 
 }

From e82b8c80f066cbcc2d6bd2f05c5e066ff6cb55ef Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 11:30:31 +1200
Subject: [PATCH 272/447] #2265 - ArrayIndexOutOfBoundsException: Index -1 out
 of bounds with @IdClass and batch insert accessing id property

---
 .../server/core/PersistRequestBean.java       |  8 ++++---
 .../server/deploy/BeanDescriptor.java         | 10 +++++++-
 .../tests/model/bridge/TestIdClassScalar.java | 24 +++++++++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index ce6a39878..8b3285c7a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -379,9 +379,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   public void setBatched() {
     batched = true;
     if (type == Type.INSERT || type == Type.UPDATE) {
-      // used to trigger automatic jdbc batch flush
-      intercept.registerGetterCallback(this);
-      getterCallback = true;
+      if (beanDescriptor.hasSingleIdProperty()) {
+        // used to trigger automatic jdbc batch flush
+        intercept.registerGetterCallback(this);
+        getterCallback = true;
+      }
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 326cbae00..260985417 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1747,6 +1747,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     return idProperty != null;
   }
 
+  /**
+   * Return false for IdClass case with multiple @Id properties.
+   */
+  public boolean hasSingleIdProperty() {
+    return idPropertyIndex != -1;
+  }
+
   /**
    * Return true if this type has a simple Id and the platform supports mutli-value binding.
    */
@@ -3145,7 +3152,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   }
 
   public boolean isIdLoaded(EntityBeanIntercept ebi) {
-    return ebi.isLoadedProperty(idPropertyIndex);
+    // assume id loaded for IdClass case with idPropertyIndex == -1
+    return idPropertyIndex == -1 ? true : ebi.isLoadedProperty(idPropertyIndex);
   }
 
   boolean hasIdValue(EntityBean bean) {
diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
index 06b2ee143..a06c7e173 100644
--- a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
+++ b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
@@ -1,7 +1,9 @@
 package org.tests.model.bridge;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
+import io.ebean.Transaction;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -39,6 +41,28 @@ public class TestIdClassScalar extends BaseTestCase {
 
   }
 
+  @Test
+  public void insertBatch() {
+    UUID siteId = UUID.randomUUID();
+    UUID userId = UUID.randomUUID();
+
+    try (final Transaction transaction = DB.beginTransaction()) {
+      transaction.setBatchMode(true);
+
+
+      BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, siteId, userId);
+      DB.save(access);
+
+      final UUID siteId1 = access.getSiteId(); // ArrayIndexOutOfBoundsException here
+      assertThat(siteId1).isNotNull();
+      assertThat(access.getUserId()).isEqualTo(userId);
+
+      transaction.commit();
+    }
+
+    DB.delete(BSiteUserD.class, new BEmbId(siteId, userId));
+  }
+
   @Test
   public void test() {
 

From baa05945017ee912c8e0db6d50938028c1f0bae6 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 12:10:23 +1200
Subject: [PATCH 273/447] Change ebean-test tests to use H2 rather than mariadb

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

diff --git a/ebean-test/src/test/resources/application-test.yaml b/ebean-test/src/test/resources/application-test.yaml
index 7ad9e2dd5..d0d3fc81a 100644
--- a/ebean-test/src/test/resources/application-test.yaml
+++ b/ebean-test/src/test/resources/application-test.yaml
@@ -24,7 +24,7 @@ ebean:
 
   test:
     redis: latest
-    platform: mariadb #, postgres, mysql, mariadb, oracle, sqlserver, hana
+    platform: h2 #, postgres, mysql, mariadb, oracle, sqlserver, hana
 #    useDocker: false
     ddlMode: dropCreate # none | dropCreate | create | migrations
     dbName: junk

From 8a698bd71e0ff735c95a82f0e63347174715517e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 12:16:01 +1200
Subject: [PATCH 274/447] [maven-release-plugin] prepare release
 ebean-parent-12.9.3

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index a96321a13..b610d3d08 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index b5fe45223..3e8c66b68 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.3</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 694875208..cc75c1959 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.3-SNAPSHOT</version>
+        <version>12.9.3</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 98aaf160a..0eb7e29ed 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 5575c187b..2c1a8c212 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.3</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index d3c571848..83c4b1589 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 2faf0af3d..f5651754c 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index ad1d5b4aa..d65f141c1 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.3</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 67dd8867b..52381810a 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 7fbd226c0..764c85bb6 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 6490c77d2..59d3315b1 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index a99ff03cb..2a0fb7838 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 4606f1db7..1cdb7f12f 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 94d002e74..4736e3fed 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3-SNAPSHOT</version>
+      <version>12.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index ad1a85ddb..6c2ea07a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.3-SNAPSHOT</version>
+  <version>12.9.3</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.9.3</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index e8c0c9d65..b34e06e54 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3-SNAPSHOT</version>
+    <version>12.9.3</version>
   </parent>
 
   <name>querybean generator</name>

From be810aa56808ac5ac8feff62b0202af77a8425b7 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 12:16:12 +1200
Subject: [PATCH 275/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index b610d3d08..51c641732 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 3e8c66b68..18aa6f7f2 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index cc75c1959..e84d91d6e 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.3</version>
+        <version>12.9.4-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 0eb7e29ed..7d38dad0d 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 2c1a8c212..689ee5f2e 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 83c4b1589..04894f284 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index f5651754c..25767c934 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index d65f141c1..f6c46a020 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 52381810a..1278c7bb9 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 764c85bb6..2ab505a6e 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 59d3315b1..1f9ab2ba1 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 2a0fb7838..58283de10 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 1cdb7f12f..e6f0c157f 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 4736e3fed..d64f656be 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3</version>
+      <version>12.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 6c2ea07a3..4c4218409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.3</version>
+  <version>12.9.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.9.3</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index b34e06e54..af8d8c273 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.3</version>
+    <version>12.9.4-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 6fb28d7ded18c1cc0614907de2c4c5c3f7c8ee20 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 12:54:21 +1200
Subject: [PATCH 276/447] #2255 Specific test for setParameter cannot assigning
 the value when parameter in selecting section of query

---
 .../org/tests/query/sqlquery/SqlQueryTests.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 572ebf39e..996f08bbe 100644
--- a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -5,6 +5,8 @@ import io.ebean.DB;
 import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.meta.MetaTimedMetric;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -24,6 +26,19 @@ import static org.junit.Assert.assertEquals;
 
 public class SqlQueryTests extends BaseTestCase {
 
+  @ForPlatform(Platform.H2)
+  @Test
+  public void selectFunction() {
+
+    String sql = "select length(?)";
+    final Long val = DB.sqlQuery(sql).setParameter("NotVeryLong").mapToScalar(Long.class).findOne();
+    assertThat(val).isEqualTo(11);
+
+    String sql2 = "select length(:val)";
+    final Long val2 = DB.sqlQuery(sql2).setParameter("val", "NotVeryLong").mapToScalar(Long.class).findOne();
+    assertThat(val2).isEqualTo(11);
+  }
+
   @Test
   public void findSingleAttributeList_decimal() {
 

From 8840628d34082ddf0e5f281d73bac8dd29107c6d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 14:45:48 +1200
Subject: [PATCH 277/447] #2262 - Transaction postCommit Callback not invoked
 when the active transaction has no database writes

---
 .../server/transaction/JdbcTransaction.java   |  2 ++
 .../transaction/TestTransactionCallback.java  | 30 +++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index b4bd7b714..f61f03699 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -941,11 +941,13 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   private void connectionEndForQueryOnly() {
     try {
+      withEachCallback(TransactionCallback::preCommit);
       if (onQueryOnly == OnQueryOnly.COMMIT) {
         performCommit();
       } else {
         performRollback();
       }
+      withEachCallback(TransactionCallback::postCommit);
     } catch (SQLException e) {
       logger.error("Error when ending a query only transaction via " + onQueryOnly, e);
     }
diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java
index 44e91f601..75ca4d567 100644
--- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java
+++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java
@@ -1,10 +1,6 @@
 package org.tests.transaction;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
-import io.ebean.Transaction;
-import io.ebean.TransactionCallbackAdapter;
+import io.ebean.*;
 import org.junit.Test;
 
 import javax.persistence.PersistenceException;
@@ -50,8 +46,32 @@ public class TestTransactionCallback extends BaseTestCase {
     assertEquals(1, countPostCommit);
     assertEquals(1, countPreRollback);
     assertEquals(1, countPostRollback);
+  }
 
+  @Test
+  public void test_commit_whenNoDbWrite() {
+    try (Transaction txn = DB.beginTransaction()) {
+      DB.register(new MyCallback());
+      txn.commit();
+    }
 
+    assertEquals(1, countPreCommit);
+    assertEquals(1, countPostCommit);
+    assertEquals(0, countPreRollback);
+    assertEquals(0, countPostRollback);
+  }
+
+  @Test
+  public void test_rollback_whenNoDbWrite() {
+    try (Transaction txn = DB.beginTransaction()) {
+      DB.register(new MyCallback());
+      txn.rollback();
+    }
+
+    assertEquals(0, countPreCommit);
+    assertEquals(0, countPostCommit);
+    assertEquals(1, countPreRollback);
+    assertEquals(1, countPostRollback);
   }
 
   @Test(expected = PersistenceException.class)

From 2763f333d48f15ceec0b31508f0230d1a90fc8db Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 14:48:40 +1200
Subject: [PATCH 278/447] #2262 - Tidy tests for Transaction postCommit
 Callback

---
 .../transaction/TestTransactionCallback.java  | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java
index 75ca4d567..d926b8067 100644
--- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java
+++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java
@@ -1,6 +1,9 @@
 package org.tests.transaction;
 
-import io.ebean.*;
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.Transaction;
+import io.ebean.TransactionCallbackAdapter;
 import org.junit.Test;
 
 import javax.persistence.PersistenceException;
@@ -14,20 +17,12 @@ public class TestTransactionCallback extends BaseTestCase {
   int countPreRollback;
   int countPostRollback;
 
-  @Test(expected = PersistenceException.class)
-  public void test_noActiveTransaction() {
-
-    Ebean.register(new MyCallback());
-  }
-
   @Test
   public void test_commitAndRollback() {
-
-
-    try (Transaction txn = Ebean.beginTransaction()) {
-      Ebean.register(new MyCallback());
-      txn.getConnection();
-      Ebean.commitTransaction();
+    try (Transaction txn = DB.beginTransaction()) {
+      DB.register(new MyCallback());
+      txn.getConnection(); // Ebean assumes writes have occurred
+      txn.commit();
     }
 
     assertEquals(1, countPreCommit);
@@ -35,11 +30,11 @@ public class TestTransactionCallback extends BaseTestCase {
     assertEquals(0, countPreRollback);
     assertEquals(0, countPostRollback);
 
-    Ebean.beginTransaction();
+    DB.beginTransaction();
     try {
-      Ebean.register(new MyCallback());
+      DB.register(new MyCallback());
     } finally {
-      Ebean.rollbackTransaction();
+      DB.rollbackTransaction();
     }
 
     assertEquals(1, countPreCommit);
@@ -75,12 +70,14 @@ public class TestTransactionCallback extends BaseTestCase {
   }
 
   @Test(expected = PersistenceException.class)
-  public void test_withEbeanserver() {
-
-    EbeanServer server = Ebean.getServer(null);
-    server.register(new MyCallback());
+  public void test_noActiveTransaction() {
+    DB.register(new MyCallback());
   }
 
+  @Test(expected = PersistenceException.class)
+  public void test_noActiveTransaction_withDatabase() {
+    DB.getDefault().register(new MyCallback());
+  }
 
   class MyCallback extends TransactionCallbackAdapter {
 

From 8c77740aa7b1bf7789df2687180fe270d0ebaa3f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 15:48:10 +1200
Subject: [PATCH 279/447] Bump version tp 12.10.0-SNAPSHOT (with 12.9.4-RC1 ddl
 generator)

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  4 ++--
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  |  8 ++++----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  2 +-
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 51c641732..0a2a3b777 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 18aa6f7f2..6b6e9511a 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index e84d91d6e..446c823f2 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.9.4-SNAPSHOT</version>
+        <version>12.10.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 7d38dad0d..9d9d22dfc 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 196ca602f..5febb1ea6 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.3a</version>
+      <version>12.9.4-RC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 04894f284..2c7df7a5d 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 25767c934..5eed791a6 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index f6c46a020..76e183c67 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 1278c7bb9..9a7cb3948 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 2ab505a6e..3d0600c83 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 1f9ab2ba1..13e5695b8 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 58283de10..fa0b249da 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index e6f0c157f..c9c24cb7b 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index d64f656be..a4b14ff53 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.4-SNAPSHOT</version>
+      <version>12.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 4c4218409..da28cb2ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.9.4-SNAPSHOT</version>
+  <version>12.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index af8d8c273..b75980c9e 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.9.4-SNAPSHOT</version>
+    <version>12.10.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 4d15535381a4be29814c486a25bc1c3cd6eee931 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 13 Jul 2021 16:48:45 +1200
Subject: [PATCH 280/447] No functional change - tidy DefaultDbSqlContext

---
 .../server/query/DefaultDbSqlContext.java     | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index 9ee2c253c..378647818 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -11,11 +11,10 @@ import java.util.HashSet;
 class DefaultDbSqlContext implements DbSqlContext {
 
   private static final String COMMA = ", ";
-
   private static final String PERIOD = ".";
   private static final int STRING_BUILDER_INITIAL_CAPACITY = 140;
-
   private static final String tableAliasPlaceHolder = "${ta}";
+  private static final String tableAliasManyPlaceHolder = "${mta}";
 
   private final String columnAliasPrefix;
 
@@ -112,26 +111,21 @@ class DefaultDbSqlContext implements DbSqlContext {
 
   @Override
   public void addJoin(String type, String table, TableJoinColumn[] cols, String a1, String a2, String extraWhere) {
-
     if (tableJoins == null) {
       tableJoins = new HashSet<>();
     }
-
     String joinKey = table + "-" + a1 + "-" + a2;
     if (tableJoins.contains(joinKey)) {
       return;
     }
 
     tableJoins.add(joinKey);
-
     sb.append(" ").append(type);
     boolean addAsOfOnClause = false;
     if (draftSupport != null) {
       appendTable(table, draftSupport.getDraftTable(table));
-
     } else if (!historyQuery) {
       sb.append(" ").append(table).append(" ");
-
     } else {
       // check if there is an associated history table and if so
       // use the unionAll view - we expect an additional predicate to match
@@ -164,21 +158,17 @@ class DefaultDbSqlContext implements DbSqlContext {
     if (addAsOfOnClause) {
       sb.append(" and ").append(historySupport.getAsOfPredicate(a2));
     }
-    
     if (extraWhere != null && !extraWhere.isEmpty()) {
       sb.append(" and ");
       // we will also need a many-table alias here
-      sb.append(extraWhere.replace(tableAliasPlaceHolder, a2).replace("${mta}", a1));
+      sb.append(extraWhere.replace(tableAliasPlaceHolder, a2).replace(tableAliasManyPlaceHolder, a1));
     }
-
-
   }
 
   private void appendTable(String table, String draftTable) {
     if (draftTable != null) {
       // there is an associated history table and view so use that
       sb.append(" ").append(draftTable).append(" ");
-
     } else {
       sb.append(" ").append(table).append(" ");
     }
@@ -201,7 +191,6 @@ class DefaultDbSqlContext implements DbSqlContext {
 
   @Override
   public String getRelativePrefix(String propName) {
-
     return currentPrefix == null ? propName : currentPrefix + "." + propName;
   }
 
@@ -236,7 +225,6 @@ class DefaultDbSqlContext implements DbSqlContext {
       // the same join has already been added.
       return;
     }
-
     // we only want to add this join once
     formulaJoins.add(converted);
     sb.append(" ");
@@ -271,13 +259,10 @@ class DefaultDbSqlContext implements DbSqlContext {
 
   @Override
   public void appendHistorySysPeriod() {
-
     String tableAlias = tableAliasStack.peek();
-
     sb.append(COMMA);
     sb.append(historySupport.getSysPeriodLower(tableAlias));
     appendColumnAlias();
-
     sb.append(COMMA);
     sb.append(historySupport.getSysPeriodUpper(tableAlias));
     appendColumnAlias();

From 7e265f7bde97120cf66e59e43abf044e0b047764 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 13 Jul 2021 09:09:30 +0200
Subject: [PATCH 281/447] FIX: SubQuery with fetch-path does not work correctly

---
 .../server/query/SqlTreeBuilder.java          |  2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  4 +-
 .../java/org/tests/query/TestSubQuery.java    | 71 +++++++++++++++++++
 3 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 239e8a58e..e4c936e45 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -311,7 +311,7 @@ public final class SqlTreeBuilder {
 
     } else {
       // do not read Id on child beans (e.g. when used with fetch())
-      boolean withId = isNotSingleAttribute();
+      boolean withId = isNotSingleAttribute() && !subQuery;
       return new SqlTreeNodeBean(prefix, prop, props, myList, withId, temporalMode, disableLazyLoad);
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 96a923637..3a81183e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -616,7 +616,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * Limit the number of fetch joins to Many properties, mark as query joins as needed.
    */
   private void markQueryJoins() {
-    detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), type != Type.ATTRIBUTE);
+    detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), type != Type.ATTRIBUTE && type != Type.SUBQUERY);
   }
 
   private boolean isAllowOneManyFetch() {
@@ -629,7 +629,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   @Override
   public void setDefaultSelectClause() {
-    if (type != Type.ATTRIBUTE) {
+    if (type != Type.ATTRIBUTE && type != Type.SUBQUERY) {
       detail.setDefaultSelectClause(beanDescriptor);
     } else if (!detail.hasSelectClause()) {
       // explicit empty select when single attribute query on non-root fetch path
diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
index db9eb7cbd..61ffacf56 100644
--- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
@@ -6,6 +6,8 @@ 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.OrderDetail;
+import org.tests.model.basic.OrderShipment;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.Vehicle;
 import org.tests.model.basic.VehicleDriver;
@@ -47,6 +49,75 @@ public class TestSubQuery extends BaseTestCase {
     DB.find(Order.class).where().isIn("id", sq).findList();
   }
 
+  /**
+   * Testcase, that discovered, that DefaultOrmQuery.setDefaultSelectClause is set on subQueries with fetch path.
+   * Also checks, that SqlTreeBuilder does not read id on Many2One props.
+   */
+  @Test
+  public void test_IsInWithFetchSubQuery1() {
+
+    List<Integer> productIds = new ArrayList<>();
+    productIds.add(3);
+
+    Query<OrderDetail> sq = DB.createQuery(OrderDetail.class).fetch("order", "id").where()
+        .isIn("product.id", productIds).query();
+
+    // execute the subQuery as copy (generatedSQL must be part of original query)
+    Query<OrderDetail> debugSq = sq.copy();
+    debugSq.findSingleAttribute();
+    assertThat(debugSq.getGeneratedSql()).isEqualTo(
+        "select t1.id from o_order_detail t0 join o_order t1 on t1.id = t0.order_id where t0.product_id in (?)");
+
+    Query<Order> query = DB.find(Order.class).select("shipDate").where().isIn("id", sq).query();
+    query.findSingleAttribute();
+
+    assertThat(query.getGeneratedSql())
+        .isEqualTo("select t0.ship_date from o_order t0 where  (t0.id) in (" + debugSq.getGeneratedSql() + ")");
+  }
+
+  /**
+   * Test checks, that DefaultOrmQuery.markQueryJoins handles subQuery correct.
+   */
+  @Test
+  public void test_IsInWithFetchSubQuery2() {
+
+    Query<OrderDetail> sq = DB.createQuery(OrderDetail.class).fetch("order.customer", "anniversary").where()
+        .eq("order.customer.name", "Roland")
+        .query().setDistinct(true);
+
+    // execute the subQuery as copy (generatedSQL must be part of original query)
+    Query<OrderDetail> debugSq = sq.copy();
+    debugSq.findSingleAttribute();
+
+    Query<Order> query = DB.find(Order.class).select("status").where().isIn("shipDate", sq).query();
+    query.findSingleAttribute();
+    assertThat(query.getGeneratedSql())
+        .isEqualTo("select t0.status from o_order t0 where  (t0.ship_date) in (" + debugSq.getGeneratedSql() + ")");
+  }
+
+  /**
+   * Checks, that SqlTreeBuilder does not read id on One2Many props.
+   */
+  @Test
+  public void test_IsInWithFetchSubQuery3() {
+
+    List<Integer> productIds = new ArrayList<>();
+    productIds.add(3);
+
+    Query<OrderDetail> sq = DB.createQuery(OrderDetail.class).fetch("order.shipments", "id").where()
+        .isIn("product.id", productIds).query();
+
+    // execute the subQuery as copy (generatedSQL must be part of original query)
+    Query<OrderDetail> debugSq = sq.copy();
+    debugSq.findSingleAttribute();
+
+    Query<OrderShipment> query = DB.find(OrderShipment.class).select("shipTime").where().isIn("id", sq).query();
+    query.findSingleAttribute();
+
+    assertThat(query.getGeneratedSql())
+        .isEqualTo("select t0.ship_time from or_order_ship t0 where  (t0.id) in (" + debugSq.getGeneratedSql() + ")");
+  }
+  
   public void testCompositeKey() {
     ResetBasicData.reset();
 

From 7408483a43ce4e6b3ecef04534fb3c2103c25e5f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Jul 2021 17:14:22 +1200
Subject: [PATCH 282/447] #2264 - Use of default timezone for OffsetDateTime
 offsets problematic for unit tests and presentation layer

---
 .../server/type/DefaultTypeManager.java       | 12 ++++-
 .../server/type/ScalarTypeOffsetDateTime.java |  7 ++-
 .../server/type/ScalarTypeZonedDateTime.java  |  7 ++-
 .../type/ScalarTypeOffsetDateTimeTest.java    | 50 +++++++++++++++---
 .../type/ScalarTypeZonedDateTimeTest.java     | 51 ++++++++++++++++---
 5 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 82c3ff46a..befe46b20 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -750,12 +750,15 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private void initialiseJavaTimeTypes(DatabaseConfig config) {
+
+    ZoneId zoneId = getZoneId(config);
+
     typeMap.put(java.nio.file.Path.class, new ScalarTypePath());
     addType(java.time.Period.class, new ScalarTypePeriod());
     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(OffsetDateTime.class, new ScalarTypeOffsetDateTime(jsonDateTime, zoneId));
+    addType(ZonedDateTime.class, new ScalarTypeZonedDateTime(jsonDateTime, zoneId));
     addType(Instant.class, new ScalarTypeInstant(jsonDateTime));
     addType(DayOfWeek.class, new ScalarTypeDayOfWeek());
     addType(Month.class, new ScalarTypeMonth());
@@ -771,6 +774,11 @@ public final class DefaultTypeManager implements TypeManager {
     addType(Duration.class, (durationNanos) ? new ScalarTypeDurationWithNanos() : new ScalarTypeDuration());
   }
 
+  private ZoneId getZoneId(DatabaseConfig config) {
+    final String dataTimeZone = config.getDataTimeZone();
+    return (dataTimeZone == null) ? ZoneOffset.systemDefault() : TimeZone.getTimeZone(dataTimeZone).toZoneId();
+  }
+
   private void addType(Class<?> clazz, ScalarType<?> scalarType) {
     typeMap.put(clazz, scalarType);
     logicalMap.putIfAbsent(clazz.getSimpleName(), scalarType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
index b62c693d3..b68f3eba9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
@@ -15,8 +15,11 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
  */
 public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateTime> {
 
-  public ScalarTypeOffsetDateTime(JsonConfig.DateTime mode) {
+  private final ZoneId zoneId;
+
+  public ScalarTypeOffsetDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
     super(mode, OffsetDateTime.class, false, Types.TIMESTAMP);
+    this.zoneId = zoneId;
   }
 
   @Override
@@ -46,7 +49,7 @@ public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateT
 
   @Override
   public OffsetDateTime convertFromInstant(Instant ts) {
-    return OffsetDateTime.ofInstant(ts, ZoneId.systemDefault());
+    return OffsetDateTime.ofInstant(ts, zoneId);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
index 52b777b6b..12e13cdfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
@@ -13,8 +13,11 @@ import java.time.ZonedDateTime;
  */
 public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTime> {
 
-  public ScalarTypeZonedDateTime(JsonConfig.DateTime mode) {
+  private final ZoneId zoneId;
+
+  public ScalarTypeZonedDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
     super(mode, ZonedDateTime.class, false, Types.TIMESTAMP);
+    this.zoneId = zoneId;
   }
 
   @Override
@@ -44,7 +47,7 @@ public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTim
 
   @Override
   public ZonedDateTime convertFromInstant(Instant ts) {
-    return ZonedDateTime.ofInstant(ts, ZoneId.systemDefault());
+    return ZonedDateTime.ofInstant(ts, zoneId);
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
index ba12fcd05..b0b2b1eb0 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
@@ -5,6 +5,8 @@ import org.junit.Test;
 
 import java.sql.Timestamp;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.TimeZone;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -14,12 +16,12 @@ import static org.junit.Assert.assertTrue;
 public class ScalarTypeOffsetDateTimeTest {
 
 
-  ScalarTypeOffsetDateTime type = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.MILLIS);
+  ScalarTypeOffsetDateTime type = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.MILLIS, ZoneOffset.systemDefault());
 
   OffsetDateTime warmUp = OffsetDateTime.now();
 
   @Test
-  public void testConvertToMillis() throws Exception {
+  public void testConvertToMillis() {
 
     warmUp.hashCode();
 
@@ -30,7 +32,43 @@ public class ScalarTypeOffsetDateTimeTest {
   }
 
   @Test
-  public void testConvertFromTimestamp() throws Exception {
+  public void convertFromInstant_with_UTC_expect_matchingZoneOffset() {
+    final TimeZone timeZoneToUse = TimeZone.getTimeZone("UTC");
+    final ZoneOffset expectedZoneOffset = ZoneOffset.UTC;
+
+    convertFromInstantWithConfiguredTimeZone(timeZoneToUse, expectedZoneOffset);
+  }
+
+  @Test
+  public void convertFromInstant_with_EST_expect_matchingZoneOffset() {
+    final TimeZone timeZoneToUse = TimeZone.getTimeZone("EST");
+    final ZoneOffset expectedOffset = OffsetDateTime.now(timeZoneToUse.toZoneId()).getOffset();
+
+    convertFromInstantWithConfiguredTimeZone(timeZoneToUse, expectedOffset);
+  }
+
+  private void convertFromInstantWithConfiguredTimeZone(TimeZone timeZoneToUse, ZoneOffset expectedZoneOffset) {
+    TimeZone previous = TimeZone.getDefault();
+    try {
+      OffsetDateTime dateTime = OffsetDateTime.parse("2021-01-01T00:00:00+11:00");
+
+      // test ScalarTypeOffsetDateTime with the configured timeZone to use
+      ScalarTypeOffsetDateTime type = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.MILLIS, timeZoneToUse.toZoneId());
+
+      // effectively we desire to ignore the system timezone and use the configured one
+      TimeZone.setDefault(timeZoneToUse);
+
+      final OffsetDateTime offsetDateTime = type.convertFromInstant(dateTime.toInstant());
+
+      assertEquals(expectedZoneOffset, offsetDateTime.getOffset());
+
+    } finally {
+      TimeZone.setDefault(previous);
+    }
+  }
+
+  @Test
+  public void testConvertFromTimestamp() {
 
     Timestamp now = new Timestamp(System.currentTimeMillis());
 
@@ -69,11 +107,11 @@ public class ScalarTypeOffsetDateTimeTest {
     JsonTester<OffsetDateTime> jsonTester = new JsonTester<>(type);
     jsonTester.test(now);
 
-    ScalarTypeOffsetDateTime typeNanos = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.NANOS);
+    ScalarTypeOffsetDateTime typeNanos = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.NANOS, ZoneOffset.systemDefault());
     jsonTester = new JsonTester<>(typeNanos);
     jsonTester.test(now);
 
-    ScalarTypeOffsetDateTime typeIso = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.ISO8601);
+    ScalarTypeOffsetDateTime typeIso = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.ISO8601, ZoneOffset.systemDefault());
     jsonTester = new JsonTester<>(typeIso);
     jsonTester.test(now);
   }
@@ -81,7 +119,7 @@ public class ScalarTypeOffsetDateTimeTest {
   @Test
   public void isoJsonFormatParse() {
 
-    ScalarTypeOffsetDateTime typeIso = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.ISO8601);
+    ScalarTypeOffsetDateTime typeIso = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.ISO8601, ZoneOffset.systemDefault());
 
     OffsetDateTime now = OffsetDateTime.now();
     String asJson = typeIso.toJsonISO8601(now);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
index ea501b273..168041723 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
@@ -4,7 +4,11 @@ import io.ebean.config.JsonConfig;
 import org.junit.Test;
 
 import java.sql.Timestamp;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.TimeZone;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.*;
@@ -12,12 +16,12 @@ import static org.junit.Assert.*;
 public class ScalarTypeZonedDateTimeTest {
 
 
-  ScalarTypeZonedDateTime type = new ScalarTypeZonedDateTime(JsonConfig.DateTime.MILLIS);
+  ScalarTypeZonedDateTime type = new ScalarTypeZonedDateTime(JsonConfig.DateTime.MILLIS, ZoneId.systemDefault());
 
   ZonedDateTime warmUp = ZonedDateTime.now();
 
   @Test
-  public void testConvertToMillis() throws Exception {
+  public void testConvertToMillis() {
 
     warmUp.hashCode();
 
@@ -29,7 +33,7 @@ public class ScalarTypeZonedDateTimeTest {
   }
 
   @Test
-  public void testConvertFromTimestamp() throws Exception {
+  public void testConvertFromTimestamp() {
 
     Timestamp now = new Timestamp(System.currentTimeMillis());
 
@@ -39,6 +43,41 @@ public class ScalarTypeZonedDateTimeTest {
     assertEquals(now, timestamp);
   }
 
+  @Test
+  public void convertFromInstant_with_UTC_expect_matchingZoneOffset() {
+    final TimeZone timeZoneToUse = TimeZone.getTimeZone("UTC");
+    final ZoneOffset expectedZoneOffset = ZoneOffset.UTC;
+
+    convertFromInstantWithConfiguredTimeZone(timeZoneToUse, expectedZoneOffset);
+  }
+
+  @Test
+  public void convertFromInstant_with_EST_expect_matchingZoneOffset() {
+    final TimeZone timeZoneToUse = TimeZone.getTimeZone("EST");
+    final ZoneOffset expectedOffset = OffsetDateTime.now(timeZoneToUse.toZoneId()).getOffset();
+
+    convertFromInstantWithConfiguredTimeZone(timeZoneToUse, expectedOffset);
+  }
+
+  private void convertFromInstantWithConfiguredTimeZone(TimeZone timeZoneToUse, ZoneOffset expectedZoneOffset) {
+    TimeZone previous = TimeZone.getDefault();
+    try {
+      OffsetDateTime dateTime = OffsetDateTime.parse("2021-01-01T00:00:00+11:00");
+
+      // test ScalarTypeOffsetDateTime with the configured timeZone to use
+      ScalarTypeZonedDateTime type = new ScalarTypeZonedDateTime(JsonConfig.DateTime.MILLIS, timeZoneToUse.toZoneId());
+
+      // effectively we desire to ignore the system timezone and use the configured one
+      TimeZone.setDefault(timeZoneToUse);
+
+      final ZonedDateTime zonedDateTime = type.convertFromInstant(dateTime.toInstant());
+
+      assertEquals(expectedZoneOffset, zonedDateTime.getOffset());
+
+    } finally {
+      TimeZone.setDefault(previous);
+    }
+  }
 
   @Test
   public void testToJdbcType() throws Exception {
@@ -68,11 +107,11 @@ public class ScalarTypeZonedDateTimeTest {
     JsonTester<ZonedDateTime> jsonTester = new JsonTester<>(type);
     jsonTester.test(now);
 
-    ScalarTypeZonedDateTime typeNanos = new ScalarTypeZonedDateTime(JsonConfig.DateTime.NANOS);
+    ScalarTypeZonedDateTime typeNanos = new ScalarTypeZonedDateTime(JsonConfig.DateTime.NANOS, ZoneId.systemDefault());
     jsonTester = new JsonTester<>(typeNanos);
     jsonTester.test(now);
 
-    ScalarTypeZonedDateTime typeIso = new ScalarTypeZonedDateTime(JsonConfig.DateTime.ISO8601);
+    ScalarTypeZonedDateTime typeIso = new ScalarTypeZonedDateTime(JsonConfig.DateTime.ISO8601, ZoneId.systemDefault());
     jsonTester = new JsonTester<>(typeIso);
     jsonTester.test(now);
   }
@@ -80,7 +119,7 @@ public class ScalarTypeZonedDateTimeTest {
   @Test
   public void toJsonISO8601() {
 
-    ScalarTypeZonedDateTime typeIso = new ScalarTypeZonedDateTime(JsonConfig.DateTime.ISO8601);
+    ScalarTypeZonedDateTime typeIso = new ScalarTypeZonedDateTime(JsonConfig.DateTime.ISO8601, ZoneId.systemDefault());
 
     ZonedDateTime now = ZonedDateTime.now();
     String asJson = typeIso.toJsonISO8601(now);

From 3d4de4dee5dec407187f2fa53daba6d9413a929a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Fri, 16 Jul 2021 15:17:04 +0200
Subject: [PATCH 283/447] FIX TestRawSqlService and TestRawSqlBuilder

---
 .../java/io/ebeaninternal/server/rawsql/DRawSqlService.java | 1 -
 .../io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java   | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index 7c27264a8..5a405dbc4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -49,7 +49,6 @@ public class DRawSqlService implements SpiRawSqlService {
       if (ret.containsKey(name)) {
         name = combine(meta.getSchemaName(i), meta.getTableName(i), name);
       }
-      ret.put(name, resultSet.getObject(i));
 
       // convert (C/B)LOBs to java objects.
       // A java.sql.Clob depends on an open connection, so storing this object in a map
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
index 0fa4c746e..8d4feeaf9 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java
@@ -21,7 +21,6 @@ import org.tests.model.rawsql.ERawSqlAggBean;
 
 import javax.sql.DataSource;
 import java.nio.charset.StandardCharsets;
-import java.sql.Blob;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -327,11 +326,10 @@ public class TestRawSqlBuilder extends BaseTestCase {
     pfc.setContent(bytes);
     DB.save(pfc);
 
-    final String sql = "select content from persistent_file_content where id = ?";
-
     List<SqlRow> rows = new ArrayList<>();
     final DataSourceConfig config = ((DefaultServer) DB.getDefault()).getServerConfig().getDataSourceConfig();
 
+    final String sql = "select content from persistent_file_content where id = ?";
     try (Connection connection = DriverManager.getConnection(config.getUrl(), config.getUsername(), config.getPassword());
          PreparedStatement stmt = connection.prepareStatement(sql)) {
       stmt.setLong(1, pfc.getId());
@@ -344,7 +342,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
     }
 
     assertThat(rows).hasSize(1);
-    assertThat(((Blob) rows.get(0).get("content")).getBytes(0, bytes.length)).isEqualTo(bytes);
+    assertThat(rows.get(0).get("content")).isEqualTo(bytes);
   }
 
 }

From f26e4b5381265f4a3c76d762f6ac82bd8eb3c8cf Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Jul 2021 12:37:42 +1200
Subject: [PATCH 284/447] Bump jedis to 3.6.3 (from 3.6.1)

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

diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 13e5695b8..404e06e7c 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <version>3.6.1</version>
+      <version>3.6.3</version>
     </dependency>
 
     <dependency>

From 0baa3a0eacdd29a02ae4034b6901fbf23f3c39f5 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Jul 2021 16:38:28 +1200
Subject: [PATCH 285/447] #2270 - ebean-agent enhancement NPE with
 MappedSuperclass with no properties that uses named database

---
 ebean-bom/pom.xml                                               | 2 +-
 ebean-core/pom.xml                                              | 2 +-
 .../ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java | 2 +-
 ebean-ddl-generator/pom.xml                                     | 2 +-
 kotlin-querybean-generator/pom.xml                              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 446c823f2..b08eb172f 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -19,7 +19,7 @@
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
     <ebean-agent.version>12.9.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.9.1</ebean-maven-plugin.version>
+    <ebean-maven-plugin.version>12.10.0</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 5febb1ea6..e5670c75b 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.9.1</version>
+        <version>12.10.0</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java
index 012c13c39..014ddb4b6 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java
@@ -33,7 +33,7 @@ public class TestNotEnhancedMappedSuper extends BaseTestCase {
 
     NotEnhancedMappedSuper mappedSuper = new NotEnhancedMappedSuper();
     boolean enhanced = (mappedSuper instanceof EntityBean);
-    Assert.assertFalse(enhanced);
+    Assert.assertTrue(enhanced);
 
   }
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 2c7df7a5d..8641ae080 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.9.1</version>
+        <version>12.10.0</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index a4b14ff53..2c872df20 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -145,7 +145,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.9.1</version>
+        <version>12.10.0</version>
         <executions>
           <execution>
             <id>test</id>

From a8456f90db608a38c08d9638fc322d20381c9b79 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Jul 2021 16:46:57 +1200
Subject: [PATCH 286/447] Bump ebean-agent version to 2.10.0

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

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index b08eb172f..096fe1a6b 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,7 +18,7 @@
     <ebean-migration.version>12.4.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.9.0</ebean-agent.version>
+    <ebean-agent.version>12.10.0</ebean-agent.version>
     <ebean-maven-plugin.version>12.10.0</ebean-maven-plugin.version>
   </properties>
 

From 492bb98e0ef0054059e869badba20987b1786cbf Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Jul 2021 17:12:06 +1200
Subject: [PATCH 287/447] #2269 - findSingleAttributeList does not filter
 soft-deleted record

---
 .../server/query/CQueryBuilder.java           |  6 +++
 .../tests/softdelete/TestSoftDeleteBasic.java | 46 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 1162e914d..41439e4b6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -189,6 +189,12 @@ class CQueryBuilder {
 
     SpiQuery<?> query = request.getQuery();
     query.setSingleAttribute();
+    if (!query.isIncludeSoftDeletes()) {
+      BeanDescriptor<?> desc = request.getBeanDescriptor();
+      if (desc.isSoftDelete()) {
+        query.addSoftDeletePredicate(desc.getSoftDeletePredicate(alias(query.getAlias())));
+      }
+    }
 
     CQueryPredicates predicates = new CQueryPredicates(binder, request);
     CQueryPlan queryPlan = request.getQueryPlan();
diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 1dfec06c4..3364417b9 100644
--- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -58,6 +58,52 @@ public class TestSoftDeleteBasic extends BaseTestCase {
 
   }
 
+  @Test
+  public void findSingleAttribute() {
+
+    EBasicSoftDelete bean = new EBasicSoftDelete();
+    bean.setName("findSingleAttribute");
+    DB.save(bean);
+
+    LoggedSqlCollector.start();
+
+    final String name0 = DB.find(EBasicSoftDelete.class)
+      .select("name")
+      .where().eq("name", "findSingleAttribute")
+      .findSingleAttribute();
+
+    List<String> sql0 = LoggedSqlCollector.current();
+    assertThat(sql0.get(0)).contains("where t0.name = ? and t0.deleted =");
+    assertThat(name0).isEqualTo("findSingleAttribute");
+
+    // now soft delete the bean
+    DB.delete(bean);
+    List<String> sqlUpdate = LoggedSqlCollector.current();
+    assertThat(sqlUpdate.get(0)).contains("update ebasic_sdchild set");
+
+    // use setIncludeSoftDeletes
+    final String name1 = DB.find(EBasicSoftDelete.class)
+      .select("name")
+      .where().eq("name", "findSingleAttribute")
+      .setIncludeSoftDeletes()
+      .findSingleAttribute();
+
+    List<String> sql1 = LoggedSqlCollector.current();
+    assertThat(sql1.get(0)).doesNotContain(" and t0.deleted =");
+    assertThat(name1).isEqualTo("findSingleAttribute");
+
+
+    // not using setIncludeSoftDeletes, so don't find it
+    final String name2 = DB.find(EBasicSoftDelete.class)
+      .select("name")
+      .where().eq("name", "findSingleAttribute")
+      .findSingleAttribute();
+
+    List<String> sql2 = LoggedSqlCollector.stop();
+    assertThat(sql2.get(0)).contains(" and t0.deleted =");
+    assertThat(name2).isNull();
+  }
+
   @Test
   public void testFindIdsWhenIncludeSoftDeletedChlld() {
 

From 1642833fdb9cfac3596e8fee3d04ddc3ec11949b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Jul 2021 18:56:02 +1200
Subject: [PATCH 288/447] Improve javadoc on TQRootBean and generated javadoc
 on query bean forFetchGroup() method

---
 .../java/io/ebean/typequery/TQRootBean.java   | 36 ++++++++++++++-----
 .../generator/SimpleQueryBeanWriter.java      | 18 ++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 728184cf4..9803da8b1 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -213,20 +213,38 @@ public abstract class TQRootBean<T, R> {
   /**
    * Set a FetchGroup to control what part of the object graph is loaded.
    * <p>
-   * This is an alternative to using select() and fetch() providing a nice clean separation
-   * between what a query should load and the query predicates.
-   * </p>
+   * FetchGroup is immutable and threadsafe. We expect to create and store
+   * FetchGroup to a static final field and reuse the instance.
+   * <p>
+   * FetchGroup is an alternative to using select() and fetch() providing a nice
+   * clean separation between what a query should load and the query predicates.
    *
    * <pre>{@code
    *
-   * FetchGroup<Customer> fetchGroup = FetchGroup.of(Customer.class)
-   *   .select("name, status")
-   *   .fetch("contacts", "firstName, lastName, email")
-   *   .build();
+   * // immutable threadsafe
    *
-   * List<Customer> customers =
+   * static final FetchGroup<Customer> fetchGroup =
+   *   QCustomer.forFetchGroup()
+   *     .shippingAddress.fetch()
+   *     .contacts.fetch()
+   *     .buildFetchGroup();
    *
-   *   new QCustomer()
+   * List<Customer> customers = new QCustomer()
+   *   .select(fetchGroup)
+   *   .findList();
+   *
+   * }</pre>
+   *
+   *
+   * <pre>{@code
+   *
+   * static final FetchGroup<Customer> fetchGroup =
+   *   FetchGroup.of(Customer.class)
+   *     .select("name, status")
+   *     .fetch("contacts", "firstName, lastName, email")
+   *     .build();
+   *
+   * List<Customer> customers = new QCustomer()
    *   .select(fetchGroup)
    *   .findList();
    *
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
index 78fd99779..3d55fd1ad 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java
@@ -188,6 +188,24 @@ class SimpleQueryBeanWriter {
     writer.eol();
     writer.append("  /**").eol();
     writer.append("   * Return a query bean used to build a FetchGroup.").eol();
+    writer.append("   * <p>").eol();
+    writer.append("   * FetchGroups are immutable and threadsafe and can be used by many").eol();
+    writer.append("   * concurrent queries. We typically stored FetchGroup as a static final field.").eol();
+    writer.append("   * <p>").eol();
+    writer.append("   * Example creating and using a FetchGroup.").eol();
+    writer.append("   * <pre>{@code").eol();
+    writer.append("   * ").eol();
+    writer.append("   * static final FetchGroup<Customer> fetchGroup = ").eol();
+    writer.append("   *   QCustomer.forFetchGroup()").eol();
+    writer.append("   *     .shippingAddress.fetch()").eol();
+    writer.append("   *     .contacts.fetch()").eol();
+    writer.append("   *     .buildFetchGroup();").eol();
+    writer.append("   * ").eol();
+    writer.append("   * List<Customer> customers = new QCustomer()").eol();
+    writer.append("   *   .select(fetchGroup)").eol();
+    writer.append("   *   .findList();").eol();
+    writer.append("   * ").eol();
+    writer.append("   * }</pre>").eol();
     writer.append("   */").eol();
     writer.append("  public static Q%s forFetchGroup() {", shortName).eol();
     writer.append("    return new Q%s(FetchGroup.queryFor(%s.class));", shortName, shortName).eol();

From 705e4f40987ded800c91e6f7155c651e6627a516 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Jul 2021 19:03:43 +1200
Subject: [PATCH 289/447] [maven-release-plugin] prepare release
 ebean-parent-12.10.0

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 0a2a3b777..3a9f740c3 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 6b6e9511a..aa0282efa 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.10.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 096fe1a6b..3a4e1d0e0 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.10.0-SNAPSHOT</version>
+        <version>12.10.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 9d9d22dfc..958959a3f 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index e5670c75b..4cb56f7aa 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.10.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 8641ae080..8901ce221 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 5eed791a6..934f7b5f9 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 76e183c67..7e47c0294 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.10.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 9a7cb3948..00f60c077 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 3d0600c83..716049721 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 404e06e7c..858ca5174 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index fa0b249da..a2f965b5c 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index c9c24cb7b..e09b69f55 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 2c872df20..a4a8a557b 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0-SNAPSHOT</version>
+      <version>12.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index da28cb2ab..f6f870413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.10.0-SNAPSHOT</version>
+  <version>12.10.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.10.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index b75980c9e..f9f21ab88 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0-SNAPSHOT</version>
+    <version>12.10.0</version>
   </parent>
 
   <name>querybean generator</name>

From 33bccd3bcbc906baf8001d26008178a5a2c9814a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 22 Jul 2021 19:03:54 +1200
Subject: [PATCH 290/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 3a9f740c3..d3868ff91 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index aa0282efa..1534f122b 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.10.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 3a4e1d0e0..0e6ebde4d 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.10.0</version>
+        <version>12.10.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 958959a3f..ad1d7c207 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 4cb56f7aa..8303c519d 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.10.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 8901ce221..dec77c4b0 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 934f7b5f9..5cb459f61 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 7e47c0294..8275fc989 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.10.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 00f60c077..ff1beee77 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 716049721..d9a2cdd6e 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 858ca5174..097cd9318 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index a2f965b5c..e889b6204 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index e09b69f55..ddd60d284 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index a4a8a557b..9b257b3b3 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.0</version>
+      <version>12.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index f6f870413..0328ea5b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.10.0</version>
+  <version>12.10.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.10.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index f9f21ab88..27e5d0399 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.0</version>
+    <version>12.10.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From b40d44895531536f76785ea84f516bfbfd4cbbb7 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Jul 2021 12:01:36 +1200
Subject: [PATCH 291/447] #2272 No effective change, tidy test
 TestM2MModifyTest only

Noting that this test fails with the fix for 2272 as M2M intersection deletes are currently executed after inserts. We need a fix to SaveManyBeans to change that so that deletes to intersection table execute after inserts.
---
 .../java/org/tests/m2m/TestM2MModifyTest.java | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java
index 1f12f85c8..3a50fa547 100644
--- a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java
+++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java
@@ -1,14 +1,15 @@
 package org.tests.m2m;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
+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 TestM2MModifyTest extends BaseTestCase {
 
   @Test
@@ -19,8 +20,8 @@ public class TestM2MModifyTest extends BaseTestCase {
     MRole r1 = new MRole("r1");
 
     // Save r1 and r2
-    Ebean.save(r0);
-    Ebean.save(r1);
+    DB.save(r0);
+    DB.save(r1);
 
     // Create a new user
     MUser u0 = new MUser("usr0");
@@ -28,32 +29,27 @@ public class TestM2MModifyTest extends BaseTestCase {
     u0.addRole(r1);
 
     // Save the user
-    Ebean.save(u0);
+    DB.save(u0);
 
     List<MRole> roles = u0.getRoles();
 
-    Assert.assertTrue(roles.size() == 2);
+    assertThat(roles).hasSize(2);
 
-    u0 = Ebean.find(MUser.class, u0.getUserid());
+    u0 = DB.find(MUser.class, u0.getUserid());
 
     roles = u0.getRoles();
-    int nrRoles = roles.size();
-
-    Assert.assertTrue(nrRoles == 2);
+    assertThat(roles).hasSize(2);
 
     roles.clear();
     roles.add(r0);
     roles.add(r1);
     roles.remove(r1);
 
-    Ebean.save(u0);
+    DB.save(u0);
 
-    u0 = Ebean.find(MUser.class, u0.getUserid());
+    u0 = DB.find(MUser.class, u0.getUserid());
 
     roles = u0.getRoles();
-
-    nrRoles = roles.size();
-
-    Assert.assertTrue(nrRoles == 1);
+    assertThat(roles).hasSize(1);
   }
 }

From e54b7052e0c79d9be32bd8358afd41c51b4546b9 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Jul 2021 12:18:06 +1200
Subject: [PATCH 292/447] #2272 Fix for collection with orphanRemoval (such
 that equals/hashCode isn't use)

- Changes ModifyHolder to use IdentityHashMap such that equals/hashcode isn't invoked
- Change SaveManyBeans such that M2M intersection deletes execute before inserts

The SaveManyBeans change is required to pass TestM2MModifyTest. With that test we get a delete/insert pair that we somewhat expect because we clear() the collection. Previously equals/hashCode meant we didn't get that delete/insert pair.

The test changes from containsExactly() to containsOnly() as we now can't guarantee the ordering with IdentityHashMap.
---
 .../java/io/ebean/common/ModifyHolder.java    | 29 +++----
 .../server/persist/SaveManyBeans.java         | 21 +++--
 .../java/io/ebean/common/BeanListTest.java    | 87 +++++++++----------
 .../java/io/ebean/common/BeanMapTest.java     | 82 ++++++++---------
 .../java/io/ebean/common/BeanSetTest.java     | 66 +++++++-------
 .../model/orphanremoval/OmBeanListChild.java  | 33 +++++++
 .../model/orphanremoval/OmBeanListParent.java | 40 +++++++++
 .../TestOrphanRemovalOverwrite.java           | 37 ++++++++
 8 files changed, 245 insertions(+), 150 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java

diff --git a/ebean-api/src/main/java/io/ebean/common/ModifyHolder.java b/ebean-api/src/main/java/io/ebean/common/ModifyHolder.java
index 6da14d3a5..957b0fa88 100644
--- a/ebean-api/src/main/java/io/ebean/common/ModifyHolder.java
+++ b/ebean-api/src/main/java/io/ebean/common/ModifyHolder.java
@@ -3,9 +3,7 @@ package io.ebean.common;
 import io.ebean.bean.EntityBean;
 
 import java.io.Serializable;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Holds sets of additions and deletions from a 'owner' List Set or Map.
@@ -23,19 +21,19 @@ class ModifyHolder<E> implements Serializable {
   /**
    * Deletions list for manyToMany persistence.
    */
-  private Set<E> modifyDeletions = new LinkedHashSet<>();
+  private Map<E,Object> modifyDeletions = new IdentityHashMap<>();
 
   /**
    * Additions list for manyToMany persistence.
    */
-  private Set<E> modifyAdditions = new LinkedHashSet<>();
+  private Map<E,Object> modifyAdditions = new IdentityHashMap<>();
 
   private boolean touched;
 
   void reset() {
     touched = false;
-    modifyDeletions = new LinkedHashSet<>();
-    modifyAdditions = new LinkedHashSet<>();
+    modifyDeletions = new IdentityHashMap<>();
+    modifyAdditions = new IdentityHashMap<>();
   }
 
   /**
@@ -50,51 +48,46 @@ class ModifyHolder<E> implements Serializable {
   }
 
   private boolean undoDeletion(E bean) {
-    return (bean != null) && modifyDeletions.remove(bean);
+    return (bean != null) && modifyDeletions.remove(bean) != null;
   }
 
   void modifyAddition(E bean) {
     if (bean != null) {
       touched = true;
-
       if (bean instanceof EntityBean) {
         ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(false);
       }
-
       // If it is to delete then just remove the deletion
       if (!undoDeletion(bean)) {
-        // Insert
-        modifyAdditions.add(bean);
+        modifyAdditions.put(bean, bean);
       }
     }
   }
 
   private boolean undoAddition(Object bean) {
-    return (bean != null) && modifyAdditions.remove(bean);
+    return (bean != null) && modifyAdditions.remove(bean) != null;
   }
 
   @SuppressWarnings("unchecked")
   void modifyRemoval(Object bean) {
     if (bean != null) {
       touched = true;
-
       if (bean instanceof EntityBean) {
         ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(true);
       }
-
       // If it is to be added then just remove the addition
       if (!undoAddition(bean)) {
-        modifyDeletions.add((E) bean);
+        modifyDeletions.put((E) bean, bean);
       }
     }
   }
 
   Set<E> getModifyAdditions() {
-    return modifyAdditions;
+    return modifyAdditions.keySet();
   }
 
   Set<E> getModifyRemovals() {
-    return modifyDeletions;
+    return modifyDeletions.keySet();
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index f273b9dbc..1f1da9fc0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -295,7 +295,16 @@ public class SaveManyBeans extends SaveManyBase {
     }
 
     transaction.depth(+1);
-
+    if (deletions != null && !deletions.isEmpty()) {
+      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);
+        SpiSqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD);
+        persister.executeOrQueue(sqlDelete, transaction, queue);
+      }
+    }
     if (additions != null && !additions.isEmpty()) {
       for (Object other : additions) {
         EntityBean otherBean = (EntityBean) other;
@@ -318,16 +327,6 @@ public class SaveManyBeans extends SaveManyBase {
         }
       }
     }
-    if (deletions != null && !deletions.isEmpty()) {
-      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);
-        SpiSqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD);
-        persister.executeOrQueue(sqlDelete, transaction, queue);
-      }
-    }
     // decrease the depth back to what it was
     transaction.depth(-1);
   }
diff --git a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java b/ebean-core/src/test/java/io/ebean/common/BeanListTest.java
index 11a7429d7..03c08efad 100644
--- a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java
+++ b/ebean-core/src/test/java/io/ebean/common/BeanListTest.java
@@ -4,7 +4,6 @@ import io.ebean.bean.BeanCollection;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -13,9 +12,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class BeanListTest {
 
-  private Object object1 = new Object();
-  private Object object2 = new Object();
-  private Object object3 = new Object();
+  private final Object object1 = new Object();
+  private final Object object2 = new Object();
+  private final Object object3 = new Object();
 
   private List<Object> all() {
     List<Object> all = new ArrayList<>();
@@ -33,7 +32,7 @@ public class BeanListTest {
   }
 
   @Test
-  public void test_setModifyListening_null() throws Exception {
+  public void test_setModifyListening_null() {
 
     BeanList<Object> list = new BeanList<>();
     list.setModifyListening(null);
@@ -45,7 +44,7 @@ public class BeanListTest {
   }
 
   @Test
-  public void test_setModifyListening_none() throws Exception {
+  public void test_setModifyListening_none() {
 
     BeanList<Object> list = new BeanList<>();
     list.setModifyListening(BeanCollection.ModifyListenMode.NONE);
@@ -57,28 +56,28 @@ public class BeanListTest {
   }
 
   @Test
-  public void testAdd() throws Exception {
+  public void testAdd() {
 
     BeanList<Object> list = new BeanList<>();
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     list.add(object1);
 
-    assertThat(list.getModifyAdditions()).containsExactly(object1);
+    assertThat(list.getModifyAdditions()).containsOnly(object1);
     assertThat(list.getModifyRemovals()).isEmpty();
 
     list.add(object1);
-    assertThat(list.getModifyAdditions()).containsExactly(object1);
+    assertThat(list.getModifyAdditions()).containsOnly(object1);
 
     list.add(object2);
-    assertThat(list.getModifyAdditions()).containsExactly(object1, object2);
+    assertThat(list.getModifyAdditions()).containsOnly(object1, object2);
 
     list.remove(object1);
-    assertThat(list.getModifyAdditions()).containsExactly(object2);
+    assertThat(list.getModifyAdditions()).containsOnly(object2);
     assertThat(list.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAddAll_given_emptyStart() throws Exception {
+  public void testAddAll_given_emptyStart() {
 
     BeanList<Object> list = new BeanList<>();
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -86,12 +85,12 @@ public class BeanListTest {
     // act
     list.addAll(all());
 
-    assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
     assertThat(list.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void test_removals_DeleteThenAddBack_expect_noChange() throws Exception {
+  public void test_removals_DeleteThenAddBack_expect_noChange() {
 
     BeanList<Object> list = new BeanList<>(some());
     list.setModifyListening(BeanCollection.ModifyListenMode.REMOVALS);
@@ -106,33 +105,33 @@ public class BeanListTest {
   }
 
   @Test
-  public void test_sort_whenAll_expect_noChange() throws Exception {
+  public void test_sort_whenAll_expect_noChange() {
 
     BeanList<Object> list = new BeanList<>(all());
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
 
     // act
-    Collections.sort(list, Comparator.comparingInt(Object::hashCode));
+    list.sort(Comparator.comparingInt(Object::hashCode));
 
     assertThat(list.getModifyRemovals()).isEmpty();
     assertThat(list.getModifyAdditions()).isEmpty();
   }
 
   @Test
-  public void test_sort_whenRemovals_expect_noChange() throws Exception {
+  public void test_sort_whenRemovals_expect_noChange() {
 
     BeanList<Object> list = new BeanList<>(all());
     list.setModifyListening(BeanCollection.ModifyListenMode.REMOVALS);
 
     // act
-    Collections.sort(list, Comparator.comparingInt(Object::hashCode));
+    list.sort(Comparator.comparingInt(Object::hashCode));
 
     assertThat(list.getModifyRemovals()).isEmpty();
     assertThat(list.getModifyAdditions()).isEmpty();
   }
 
   @Test
-  public void testAdd_given_someAlreadyIn() throws Exception {
+  public void testAdd_given_someAlreadyIn() {
 
     BeanList<Object> list = new BeanList<>(some());
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -143,12 +142,12 @@ public class BeanListTest {
     assertThat(list.contains(object2)).isTrue();
     list.add(object2); // object2 added as List allows duplicates
 
-    assertThat(list.getModifyAdditions()).containsExactly(object1, object2);
+    assertThat(list.getModifyAdditions()).containsOnly(object1, object2);
     assertThat(list.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAddSome_given_someAlreadyIn() throws Exception {
+  public void testAddSome_given_someAlreadyIn() {
 
     BeanList<Object> list = new BeanList<>(some());
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -156,43 +155,43 @@ public class BeanListTest {
     // act
     list.addAll(all());
 
-    assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
     assertThat(list.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemove_given_beansInAdditions() throws Exception {
+  public void testRemove_given_beansInAdditions() {
 
     BeanList<Object> list = new BeanList<>();
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     list.addAll(all());
-    assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     list.remove(object2);
     list.remove(object3);
 
-    assertThat(list.getModifyAdditions()).containsExactly(object1);
+    assertThat(list.getModifyAdditions()).containsOnly(object1);
     assertThat(list.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemoveAll_given_beansInAdditions() throws Exception {
+  public void testRemoveAll_given_beansInAdditions() {
 
     BeanList<Object> list = new BeanList<>();
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     list.addAll(all());
-    assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     list.removeAll(some());
 
-    assertThat(list.getModifyAdditions()).containsExactly(object1);
+    assertThat(list.getModifyAdditions()).containsOnly(object1);
     assertThat(list.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemove_given_beansNotInAdditions() throws Exception {
+  public void testRemove_given_beansNotInAdditions() {
 
     BeanList<Object> list = new BeanList<>(all());
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -203,11 +202,11 @@ public class BeanListTest {
 
     // assert
     assertThat(list.getModifyAdditions()).isEmpty();
-    assertThat(list.getModifyRemovals()).containsExactly(object2, object3);
+    assertThat(list.getModifyRemovals()).containsOnly(object2, object3);
   }
 
   @Test
-  public void testRemoveAll_given_beansNotInAdditions() throws Exception {
+  public void testRemoveAll_given_beansNotInAdditions() {
 
     BeanList<Object> list = new BeanList<>(all());
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -217,11 +216,11 @@ public class BeanListTest {
 
     // assert
     assertThat(list.getModifyAdditions()).isEmpty();
-    assertThat(list.getModifyRemovals()).containsExactly(object2, object3);
+    assertThat(list.getModifyRemovals()).containsOnly(object2, object3);
   }
 
   @Test
-  public void testClear() throws Exception {
+  public void testClear() {
 
     BeanList<Object> list = new BeanList<>(all());
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -230,12 +229,12 @@ public class BeanListTest {
     list.clear();
 
     //assert
-    assertThat(list.getModifyRemovals()).containsExactly(object1, object2, object3);
+    assertThat(list.getModifyRemovals()).containsOnly(object1, object2, object3);
     assertThat(list.getModifyAdditions()).isEmpty();
   }
 
   @Test
-  public void testClear_given_someBeansInAdditions() throws Exception {
+  public void testClear_given_someBeansInAdditions() {
 
     BeanList<Object> list = new BeanList<>();
     list.add(object1);
@@ -247,27 +246,27 @@ public class BeanListTest {
     list.clear();
 
     //assert
-    assertThat(list.getModifyRemovals()).containsExactly(object1);
+    assertThat(list.getModifyRemovals()).containsOnly(object1);
     assertThat(list.getModifyAdditions()).isEmpty();
   }
 
   @Test
-  public void testRetainAll_given_beansInAdditions() throws Exception {
+  public void testRetainAll_given_beansInAdditions() {
 
     BeanList<Object> list = new BeanList<>();
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     list.addAll(all());
-    assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(list.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     list.retainAll(some());
 
-    assertThat(list.getModifyAdditions()).containsExactly(object2, object3);
+    assertThat(list.getModifyAdditions()).containsOnly(object2, object3);
     assertThat(list.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRetainAll_given_someBeansInAdditions() throws Exception {
+  public void testRetainAll_given_someBeansInAdditions() {
 
     BeanList<Object> list = new BeanList<>();
     list.add(object1);
@@ -278,12 +277,12 @@ public class BeanListTest {
     // act
     list.retainAll(some());
 
-    assertThat(list.getModifyAdditions()).containsExactly(object3);
-    assertThat(list.getModifyRemovals()).containsExactly(object1);
+    assertThat(list.getModifyAdditions()).containsOnly(object3);
+    assertThat(list.getModifyRemovals()).containsOnly(object1);
   }
 
   @Test
-  public void testRetainAll_given_noBeansInAdditions() throws Exception {
+  public void testRetainAll_given_noBeansInAdditions() {
 
     BeanList<Object> list = new BeanList<>(all());
     list.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -291,7 +290,7 @@ public class BeanListTest {
     // act
     list.retainAll(some());
 
-    assertThat(list.getModifyRemovals()).containsExactly(object1);
+    assertThat(list.getModifyRemovals()).containsOnly(object1);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java
index 003539a72..3101fc0f2 100644
--- a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java
+++ b/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java
@@ -34,30 +34,30 @@ public class BeanMapTest {
   }
 
   @Test
-  public void testAdd() throws Exception {
+  public void testAdd() {
 
     BeanMap<String, Object> map = new BeanMap<>();
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     map.put("1", object1);
     map.put("4", null);
 
-    assertThat(map.getModifyAdditions()).containsExactly(object1);
+    assertThat(map.getModifyAdditions()).containsOnly(object1);
     assertThat(map.getModifyRemovals()).isEmpty();
 
     map.put("1", object1);
     map.put("4", null);
-    assertThat(map.getModifyAdditions()).containsExactly(object1);
+    assertThat(map.getModifyAdditions()).containsOnly(object1);
 
     map.put("2", object2);
-    assertThat(map.getModifyAdditions()).containsExactly(object1, object2);
+    assertThat(map.getModifyAdditions()).containsOnly(object1, object2);
 
     map.remove("1");
-    assertThat(map.getModifyAdditions()).containsExactly(object2);
+    assertThat(map.getModifyAdditions()).containsOnly(object2);
     assertThat(map.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAddAll_given_emptyStart() throws Exception {
+  public void testAddAll_given_emptyStart() {
 
     BeanMap<String, Object> set = new BeanMap<>();
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -65,28 +65,28 @@ public class BeanMapTest {
     // act
     set.putAll(all());
 
-    assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAdd_given_someAlreadyIn() throws Exception {
+  public void testAdd_given_someAlreadyIn() {
 
     BeanMap<String, Object> map = new BeanMap<>(some());
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
 
     // act
-    assertThat(map.values().contains(object1)).isFalse();
+    assertThat(map.containsValue(object1)).isFalse();
     map.put("1", object1);
-    assertThat(map.values().contains(object2)).isTrue();
+    assertThat(map.containsValue(object2)).isTrue();
     map.put("2", object2);
 
-    assertThat(map.getModifyAdditions()).containsExactly(object1);
+    assertThat(map.getModifyAdditions()).containsOnly(object1);
     assertThat(map.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAddSome_given_someAlreadyIn() throws Exception {
+  public void testAddSome_given_someAlreadyIn() {
 
     BeanMap<String, Object> map = new BeanMap<>(some());
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -94,44 +94,44 @@ public class BeanMapTest {
     // act
     map.putAll(all());
 
-    assertThat(map.getModifyAdditions()).containsExactly(object1);
+    assertThat(map.getModifyAdditions()).containsOnly(object1);
     assertThat(map.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemove_given_beansInAdditions() throws Exception {
+  public void testRemove_given_beansInAdditions() {
 
     BeanMap<String, Object> map = new BeanMap<>();
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     map.putAll(all());
-    assertThat(map.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(map.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     map.remove("2");
     map.remove("3");
 
-    assertThat(map.getModifyAdditions()).containsExactly(object1);
+    assertThat(map.getModifyAdditions()).containsOnly(object1);
     assertThat(map.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemoveAll_given_beansInAdditions() throws Exception {
+  public void testRemoveAll_given_beansInAdditions() {
 
     BeanMap<String, Object> map = new BeanMap<>();
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     map.putAll(all());
-    assertThat(map.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(map.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     map.remove("2");
     map.remove("3");
 
-    assertThat(map.getModifyAdditions()).containsExactly(object1);
+    assertThat(map.getModifyAdditions()).containsOnly(object1);
     assertThat(map.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemove_given_beansNotInAdditions() throws Exception {
+  public void testRemove_given_beansNotInAdditions() {
 
     BeanMap<String, Object> map = new BeanMap<>(all());
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -142,11 +142,11 @@ public class BeanMapTest {
 
     // assert
     assertThat(map.getModifyAdditions()).isEmpty();
-    assertThat(map.getModifyRemovals()).containsExactly(object2, object3);
+    assertThat(map.getModifyRemovals()).containsOnly(object2, object3);
   }
 
   @Test
-  public void testRemoveAll_given_beansNotInAdditions() throws Exception {
+  public void testRemoveAll_given_beansNotInAdditions() {
 
     BeanMap<String, Object> map = new BeanMap<>(all());
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -157,11 +157,11 @@ public class BeanMapTest {
 
     // assert
     assertThat(map.getModifyAdditions()).isEmpty();
-    assertThat(map.getModifyRemovals()).containsExactly(object2, object3);
+    assertThat(map.getModifyRemovals()).containsOnly(object2, object3);
   }
 
   @Test
-  public void testClear() throws Exception {
+  public void testClear() {
 
     BeanMap<String, Object> map = new BeanMap<>(all());
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -170,12 +170,12 @@ public class BeanMapTest {
     map.clear();
 
     //assert
-    assertThat(map.getModifyRemovals()).containsExactly(object1, object2, object3);
+    assertThat(map.getModifyRemovals()).containsOnly(object1, object2, object3);
     assertThat(map.getModifyAdditions()).isEmpty();
   }
 
   @Test
-  public void testClear_given_someBeansInAdditions() throws Exception {
+  public void testClear_given_someBeansInAdditions() {
 
     BeanMap<String, EBasic> map = newModifyListeningMap();
     map.put("2", object2);
@@ -185,7 +185,7 @@ public class BeanMapTest {
     map.clear();
 
     //assert
-    assertThat(map.getModifyRemovals()).containsExactly(object1);
+    assertThat(map.getModifyRemovals()).containsOnly(object1);
     assertThat(map.getModifyAdditions()).isEmpty();
   }
 
@@ -228,7 +228,7 @@ public class BeanMapTest {
     assertThat(map).doesNotContainKeys("1");
     assertThat(map.get("1")).isNull();
 
-    assertThat(map.getModifyRemovals()).containsExactly(object1);
+    assertThat(map.getModifyRemovals()).containsOnly(object1);
   }
 
   @Test
@@ -245,7 +245,7 @@ public class BeanMapTest {
     assertThat(map).isEmpty();
     assertThat(keySet).isEmpty();
 
-    assertThat(map.getModifyRemovals()).containsExactly(object1, object2);
+    assertThat(map.getModifyRemovals()).containsOnly(object1, object2);
   }
 
   @Test
@@ -258,20 +258,14 @@ public class BeanMapTest {
     map.setModifyListening(BeanCollection.ModifyListenMode.ALL);
 
     final Set<String> keySet = map.keySet();
-    final Iterator<String> iterator = keySet.iterator();
-    while (iterator.hasNext()) {
-      final String key = iterator.next();
-      if (key.equals("2")) {
-        iterator.remove();
-      }
-    }
+    keySet.removeIf(key -> key.equals("2"));
 
     assertThat(map).hasSize(2);
     assertThat(keySet).hasSize(2);
     assertThat(keySet).containsExactly("1", "3");
     assertThat(map).containsKeys("1", "3");
 
-    assertThat(map.getModifyRemovals()).containsExactly(object2);
+    assertThat(map.getModifyRemovals()).containsOnly(object2);
   }
 
   @Test
@@ -294,7 +288,7 @@ public class BeanMapTest {
     assertThat(keySet).containsExactly("1", "4");
     assertThat(map).containsKeys("1", "4");
 
-    assertThat(map.getModifyRemovals()).containsExactly(object2, object3, object5);
+    assertThat(map.getModifyRemovals()).containsOnly(object2, object3, object5);
   }
 
 
@@ -318,7 +312,7 @@ public class BeanMapTest {
     assertThat(keySet).containsExactly("2", "3", "5");
     assertThat(map).containsKeys("2", "3", "5");
 
-    assertThat(map.getModifyRemovals()).containsExactly(object1, object4);
+    assertThat(map.getModifyRemovals()).containsOnly(object1, object4);
   }
 
   @Test(expected = UnsupportedOperationException.class)
@@ -348,7 +342,7 @@ public class BeanMapTest {
 
     assertThat(entries).isEmpty();
     assertThat(map).isEmpty();
-    assertThat(map.getModifyRemovals()).containsExactly(object1);
+    assertThat(map.getModifyRemovals()).containsOnly(object1);
   }
 
   @Test
@@ -365,7 +359,7 @@ public class BeanMapTest {
     assertThat(existed22).isFalse();
 
     assertThat(map).hasSize(4);
-    assertThat(map.getModifyRemovals()).containsExactly(object1);
+    assertThat(map.getModifyRemovals()).containsOnly(object1);
   }
 
   @Test
@@ -395,7 +389,7 @@ public class BeanMapTest {
     }
     assertThat(map).hasSize(3);
     assertThat(entries).hasSize(3);
-    assertThat(map.getModifyRemovals()).containsExactly(object2, object5);
+    assertThat(map.getModifyRemovals()).containsOnly(object2, object5);
   }
 
   @Test
@@ -406,7 +400,7 @@ public class BeanMapTest {
     entries.removeAll(asList(new AbstractMap.SimpleEntry<>("1", object1), new AbstractMap.SimpleEntry<>("3", object4), new AbstractMap.SimpleEntry<>("4", object4)));
     assertThat(map).hasSize(3);
     assertThat(entries).hasSize(3);
-    assertThat(map.getModifyRemovals()).containsExactly(object1, object4);
+    assertThat(map.getModifyRemovals()).containsOnly(object1, object4);
   }
 
   @Test
@@ -417,7 +411,7 @@ public class BeanMapTest {
     entries.retainAll(asList(new AbstractMap.SimpleEntry<>("1", object1), new AbstractMap.SimpleEntry<>("3", object4), new AbstractMap.SimpleEntry<>("4", object4)));
     assertThat(map).hasSize(2);
     assertThat(entries).hasSize(2);
-    assertThat(map.getModifyRemovals()).containsExactly(object2, object3, object5);
+    assertThat(map.getModifyRemovals()).containsOnly(object2, object3, object5);
   }
 
   private BeanMap<String, EBasic> newModifyListeningMap() {
diff --git a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java b/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java
index c274d34d7..40253faef 100644
--- a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java
+++ b/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java
@@ -31,28 +31,28 @@ public class BeanSetTest {
   }
 
   @Test
-  public void testAdd() throws Exception {
+  public void testAdd() {
 
     BeanSet<Object> set = new BeanSet<>();
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     set.add(object1);
 
-    assertThat(set.getModifyAdditions()).containsExactly(object1);
+    assertThat(set.getModifyAdditions()).containsOnly(object1);
     assertThat(set.getModifyRemovals()).isEmpty();
 
     set.add(object1);
-    assertThat(set.getModifyAdditions()).containsExactly(object1);
+    assertThat(set.getModifyAdditions()).containsOnly(object1);
 
     set.add(object2);
-    assertThat(set.getModifyAdditions()).containsExactly(object1, object2);
+    assertThat(set.getModifyAdditions()).containsOnly(object1, object2);
 
     set.remove(object1);
-    assertThat(set.getModifyAdditions()).containsExactly(object2);
+    assertThat(set.getModifyAdditions()).containsOnly(object2);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAddAll_given_emptyStart() throws Exception {
+  public void testAddAll_given_emptyStart() {
 
     BeanSet<Object> set = new BeanSet<>();
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -60,12 +60,12 @@ public class BeanSetTest {
     // act
     set.addAll(all());
 
-    assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAdd_given_someAlreadyIn() throws Exception {
+  public void testAdd_given_someAlreadyIn() {
 
     BeanSet<Object> set = new BeanSet<>(some());
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -76,12 +76,12 @@ public class BeanSetTest {
     assertThat(set.contains(object2)).isTrue();
     set.add(object2);
 
-    assertThat(set.getModifyAdditions()).containsExactly(object1);
+    assertThat(set.getModifyAdditions()).containsOnly(object1);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testAddSome_given_someAlreadyIn() throws Exception {
+  public void testAddSome_given_someAlreadyIn() {
 
     BeanSet<Object> set = new BeanSet<>(some());
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -89,43 +89,43 @@ public class BeanSetTest {
     // act
     set.addAll(all());
 
-    assertThat(set.getModifyAdditions()).containsExactly(object1);
+    assertThat(set.getModifyAdditions()).containsOnly(object1);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemove_given_beansInAdditions() throws Exception {
+  public void testRemove_given_beansInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>();
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     set.addAll(all());
-    assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     set.remove(object2);
     set.remove(object3);
 
-    assertThat(set.getModifyAdditions()).containsExactly(object1);
+    assertThat(set.getModifyAdditions()).containsOnly(object1);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemoveAll_given_beansInAdditions() throws Exception {
+  public void testRemoveAll_given_beansInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>();
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     set.addAll(all());
-    assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     set.removeAll(some());
 
-    assertThat(set.getModifyAdditions()).containsExactly(object1);
+    assertThat(set.getModifyAdditions()).containsOnly(object1);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRemove_given_beansNotInAdditions() throws Exception {
+  public void testRemove_given_beansNotInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>(all());
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -136,11 +136,11 @@ public class BeanSetTest {
 
     // assert
     assertThat(set.getModifyAdditions()).isEmpty();
-    assertThat(set.getModifyRemovals()).containsExactly(object2, object3);
+    assertThat(set.getModifyRemovals()).containsOnly(object2, object3);
   }
 
   @Test
-  public void testRemoveAll_given_beansNotInAdditions() throws Exception {
+  public void testRemoveAll_given_beansNotInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>(all());
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -150,11 +150,11 @@ public class BeanSetTest {
 
     // assert
     assertThat(set.getModifyAdditions()).isEmpty();
-    assertThat(set.getModifyRemovals()).containsExactly(object2, object3);
+    assertThat(set.getModifyRemovals()).containsOnly(object2, object3);
   }
 
   @Test
-  public void testClear() throws Exception {
+  public void testClear() {
 
     BeanSet<Object> set = new BeanSet<>(all());
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -163,12 +163,12 @@ public class BeanSetTest {
     set.clear();
 
     //assert
-    assertThat(set.getModifyRemovals()).containsExactly(object1, object2, object3);
+    assertThat(set.getModifyRemovals()).containsOnly(object1, object2, object3);
     assertThat(set.getModifyAdditions()).isEmpty();
   }
 
   @Test
-  public void testClear_given_someBeansInAdditions() throws Exception {
+  public void testClear_given_someBeansInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>();
     set.add(object1);
@@ -180,27 +180,27 @@ public class BeanSetTest {
     set.clear();
 
     //assert
-    assertThat(set.getModifyRemovals()).containsExactly(object1);
+    assertThat(set.getModifyRemovals()).containsOnly(object1);
     assertThat(set.getModifyAdditions()).isEmpty();
   }
 
   @Test
-  public void testRetainAll_given_beansInAdditions() throws Exception {
+  public void testRetainAll_given_beansInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>();
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
     set.addAll(all());
-    assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3);
+    assertThat(set.getModifyAdditions()).containsOnly(object1, object2, object3);
 
     // act
     set.retainAll(some());
 
-    assertThat(set.getModifyAdditions()).containsExactly(object2, object3);
+    assertThat(set.getModifyAdditions()).containsOnly(object2, object3);
     assertThat(set.getModifyRemovals()).isEmpty();
   }
 
   @Test
-  public void testRetainAll_given_someBeansInAdditions() throws Exception {
+  public void testRetainAll_given_someBeansInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>();
     set.add(object1);
@@ -211,12 +211,12 @@ public class BeanSetTest {
     // act
     set.retainAll(some());
 
-    assertThat(set.getModifyAdditions()).containsExactly(object3);
-    assertThat(set.getModifyRemovals()).containsExactly(object1);
+    assertThat(set.getModifyAdditions()).containsOnly(object3);
+    assertThat(set.getModifyRemovals()).containsOnly(object1);
   }
 
   @Test
-  public void testRetainAll_given_noBeansInAdditions() throws Exception {
+  public void testRetainAll_given_noBeansInAdditions() {
 
     BeanSet<Object> set = new BeanSet<>(all());
     set.setModifyListening(BeanCollection.ModifyListenMode.ALL);
@@ -224,7 +224,7 @@ public class BeanSetTest {
     // act
     set.retainAll(some());
 
-    assertThat(set.getModifyRemovals()).containsExactly(object1);
+    assertThat(set.getModifyRemovals()).containsOnly(object1);
   }
 
 }
diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java
new file mode 100644
index 000000000..75790e26a
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java
@@ -0,0 +1,33 @@
+package org.tests.model.orphanremoval;
+
+import io.ebean.Model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OmBeanListChild extends Model {
+
+  @Id
+  private Long id;
+
+  private final String name;
+
+  @ManyToOne
+  private OmBeanListParent parent;
+
+  @Version
+  private long version;
+
+  public OmBeanListChild(String name) {
+    this.name = name;
+  }
+
+  public Long getId() {
+    return id;
+  }
+}
+
+
diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java
new file mode 100644
index 000000000..6a9cd478f
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java
@@ -0,0 +1,40 @@
+package org.tests.model.orphanremoval;
+
+import io.ebean.Model;
+
+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 OmBeanListParent extends Model {
+
+  @Id
+  private long id;
+
+  @Version
+  private long version;
+
+  @OneToMany(cascade = ALL, mappedBy = "parent", orphanRemoval = true)
+  private List<OmBeanListChild> children;
+
+  public long getId() {
+    return id;
+  }
+
+  public List<OmBeanListChild> getChildren() {
+    return children;
+  }
+
+  public void setChildren(List<OmBeanListChild> children) {
+    // So a BeanList is used and overwriting children will replace the table entries
+    this.children.clear();
+    this.children.addAll(children);
+  }
+}
+
+
diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java
new file mode 100644
index 000000000..9c6fa045b
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java
@@ -0,0 +1,37 @@
+package org.tests.model.orphanremoval;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class TestOrphanRemovalOverwrite {
+
+  @Test
+  public void testOverwritingMapping() {
+    OmBeanListParent parent = new OmBeanListParent();
+    parent.save();
+
+    // Refreshing/querying sets the modifyListening flag on the association's BeanList
+    parent.refresh();
+
+    List<OmBeanListChild> childList = singletonList(new OmBeanListChild("child1"));
+    // Adding the children to the BeanList causes _ebean_getIdentity to be invoked before the children have been persisted and
+    // have Ids.
+    parent.setChildren(childList);
+
+    // Give the children Ids
+    parent.save();
+
+    // Refreshing here generates new objects for the associated children that are referred to by the parent.
+    parent.refresh();
+
+    assertNotNull("The children should now have Ids as they are persisted to the db.", childList.get(0).getId());
+    assertEquals("The children should have the same Id as the ones on the parent.",
+      childList.get(0).getId(), parent.getChildren().get(0).getId());
+    assertEquals("The children should therefore equal the children on the parent.", childList, parent.getChildren());
+  }
+}

From f32ace4e5aa63e83d66f2be2f208219299bb0c12 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Jul 2021 13:54:29 +1200
Subject: [PATCH 293/447] Refactor EntityBeanIntercept replacing
 owner._ebean_getPropertyNames().length with flags.length

---
 .../src/main/java/io/ebean/bean/EntityBeanIntercept.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 4695c4112..28a088ce6 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -476,7 +476,7 @@ public final class EntityBeanIntercept implements Serializable {
    * Return the number of properties.
    */
   public int getPropertyLength() {
-    return owner._ebean_getPropertyNames().length;
+    return flags.length;
   }
 
   /**
@@ -564,7 +564,7 @@ public final class EntityBeanIntercept implements Serializable {
 
   private void setOriginalValue(int propertyIndex, Object value) {
     if (origValues == null) {
-      origValues = new Object[owner._ebean_getPropertyNames().length];
+      origValues = new Object[flags.length];
     }
     if ((flags[propertyIndex] & FLAG_ORIG_VALUE_SET) == 0) {
       flags[propertyIndex] |= FLAG_ORIG_VALUE_SET;
@@ -577,7 +577,7 @@ public final class EntityBeanIntercept implements Serializable {
    */
   private void setOriginalValueForce(int propertyIndex, Object value) {
     if (origValues == null) {
-      origValues = new Object[owner._ebean_getPropertyNames().length];
+      origValues = new Object[flags.length];
     }
     origValues[propertyIndex] = value;
   }
@@ -1112,7 +1112,7 @@ public final class EntityBeanIntercept implements Serializable {
    */
   public void setLoadError(int propertyIndex, Exception t) {
     if (loadErrors == null) {
-      loadErrors = new Exception[owner._ebean_getPropertyNames().length];
+      loadErrors = new Exception[flags.length];
     }
     loadErrors[propertyIndex] = t;
     flags[propertyIndex] |= FLAG_LOADED_PROP;

From 6c262f1df549d07298431941bc08c71b9b2da6e8 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Jul 2021 16:50:24 +1200
Subject: [PATCH 294/447] JSON bean dirty detection via MD5 of JSON string
 content

- MD5 of json content stored on EntityBeanIntercept for dirty detection
- Only convert to JSON once (at dirty detection time). Store this json content on EntityBeanIntercept to later push to ScalarTypeJsonObjectMapper for bind

Should consider alternative to extend BeanProperty rather than have these if blocks.
---
 .../io/ebean/bean/EntityBeanIntercept.java    | 33 +++++++++
 .../java/io/ebean/core/type/DataBinder.java   | 11 +++
 .../java/io/ebean/core/type/DataReader.java   | 10 +++
 .../java/io/ebean/core/type/ScalarType.java   |  8 ++
 .../server/deploy/BeanDescriptor.java         |  4 +-
 .../server/deploy/BeanProperty.java           | 47 ++++++++----
 .../server/persist/dml/DmlHandler.java        |  5 ++
 .../dmlbind/BindablePropertyJsonInsert.java   | 42 +++++++++++
 .../dmlbind/BindablePropertyJsonUpdate.java   | 35 +++++++++
 .../persist/dmlbind/BindableRequest.java      |  5 ++
 .../persist/dmlbind/FactoryProperty.java      |  7 ++
 .../server/query/SqlBeanLoad.java             | 11 ++-
 .../ebeaninternal/server/type/DataBind.java   | 11 +++
 .../server/type/RsetDataReader.java           | 15 +++-
 .../type/ScalarTypeJsonObjectMapper.java      | 52 ++++++++++++-
 .../org/tests/json/TestDbJson_Jackson3.java   |  3 +-
 .../java/org/tests/json/TestDbJson_List.java  | 12 ++-
 .../org/tests/model/json/EBasicPlain.java     | 54 ++++++++++++++
 .../model/json/TestJacksonPlainBean.java      | 73 +++++++++++++++++++
 19 files changed, 404 insertions(+), 34 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 28a088ce6..59a2450bd 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -91,6 +91,17 @@ public final class EntityBeanIntercept implements Serializable {
   private Object ownerId;
   private int sortOrder;
 
+  /**
+   * Holds MD5 hash of json loaded jackson beans.
+   */
+  private String[] mutableHash;
+
+  /**
+   * Holds json content determined at point of dirty check.
+   * Stored here on dirty check such that we only convert to json once.
+   */
+  private String[] mutableContent;
+
   /**
    * Create a intercept with a given entity.
    */
@@ -1138,4 +1149,26 @@ public final class EntityBeanIntercept implements Serializable {
     }
     return ret;
   }
+
+  public String mutableHash(int propertyIndex) {
+    return mutableHash == null ? null : mutableHash[propertyIndex];
+  }
+
+  public void mutableHash(int propertyIndex, String content) {
+    if (mutableHash == null) {
+      mutableHash = new String[flags.length];
+    }
+    mutableHash[propertyIndex] = content;
+  }
+
+  public String mutableContent(int propertyIndex) {
+    return mutableContent == null ? null : mutableContent[propertyIndex];
+  }
+
+  public void mutableContent(int propertyIndex, String content) {
+    if (mutableContent == null) {
+      mutableContent = new String[flags.length];
+    }
+    mutableContent[propertyIndex] = content;
+  }
 }
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/DataBinder.java b/ebean-core-type/src/main/java/io/ebean/core/type/DataBinder.java
index be6a3b559..b08bb529a 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/DataBinder.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/DataBinder.java
@@ -163,4 +163,15 @@ public interface DataBinder {
    * Bind an array value.
    */
   void setArray(String arrayType, Object[] elements) throws SQLException;
+
+  /**
+   * Push json from dirty detection to be available for binding.
+   */
+  void pushJson(String json);
+
+  /**
+   * Pop json made during dirty detection for scalarType binding.
+   */
+  String popJson();
+
 }
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java b/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java
index a8ace12be..ef61b9122 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java
@@ -48,4 +48,14 @@ public interface DataReader {
   Object getObject() throws SQLException;
 
   InputStream getBinaryStream() throws SQLException;
+
+  /**
+   * Push json from dirty detection to be available for binding.
+   */
+  void pushJson(String json);
+
+  /**
+   * Pop json made during dirty detection for scalarType binding.
+   */
+  String popJson();
 }
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index a971a0115..831664991 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -34,6 +34,14 @@ import java.sql.SQLException;
  */
 public interface ScalarType<T> extends StringParser, StringFormatter, ScalarDataReader<T> {
 
+  default boolean isJsonMapper() {
+    return false;
+  }
+
+  default String jsonMapper(Object value) {
+    throw new UnsupportedOperationException();
+  }
+
   /**
    * Return true if this is a binary type and can not support parse() and format() from/to string.
    * This allows Ebean to optimise marshalling types to string.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 63599b7ad..d165b1489 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2022,7 +2022,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   public boolean isTableManaged(String tableName) {
     return owner.isTableManaged(tableName);
   }
-  
+
   /**
    * Return the order column property.
    */
@@ -3200,7 +3200,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
       int propertyIndex = beanProperty.getPropertyIndex();
       if (!ebi.isDirtyProperty(propertyIndex) && ebi.isLoadedProperty(propertyIndex)) {
         Object value = beanProperty.getValue(ebi.getOwner());
-        if (value != null && beanProperty.isDirtyValue(value)) {
+        if (value != null && beanProperty.isDirtyValue(value, ebi)) {
           // mutable scalar value which is considered dirty so mark
           // it as such so that it is included in an update
           ebi.markPropertyAsChanged(propertyIndex);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 8793942b6..d3c832c85 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -13,6 +13,7 @@ import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarType;
 import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
+import io.ebean.text.TextException;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiQuery;
@@ -31,11 +32,8 @@ 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.type.DataBind;
-import io.ebeaninternal.server.type.LocalEncryptedType;
-import io.ebeaninternal.server.type.ScalarTypeBoolean;
-import io.ebeaninternal.server.type.ScalarTypeEnum;
-import io.ebeaninternal.server.type.ScalarTypeLogicalType;
+import io.ebeaninternal.server.type.*;
+import io.ebeaninternal.server.util.Md5;
 import io.ebeaninternal.util.ValueUtil;
 import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
@@ -54,6 +52,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -220,6 +219,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    */
   @SuppressWarnings("rawtypes")
   final ScalarType scalarType;
+  final boolean jsonMapperType;
 
   private final DocPropertyOptions docOptions;
 
@@ -333,6 +333,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     this.formula = sqlFormulaSelect != null;
     this.dbType = deploy.getDbType();
     this.scalarType = deploy.getScalarType();
+    this.jsonMapperType = (scalarType == null) ? false : scalarType.isJsonMapper();
     this.lob = isLobType(dbType);
     this.propertyType = deploy.getPropertyType();
     this.field = deploy.getField();
@@ -427,6 +428,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     this.setter = source.setter;
     this.dbType = source.getDbType(true);
     this.scalarType = source.scalarType;
+    this.jsonMapperType = source.jsonMapperType;
     this.lob = isLobType(dbType);
     this.propertyType = source.getPropertyType();
     this.field = source.getField();
@@ -630,8 +632,17 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
       Object value = scalarType.read(reader);
       if (bean != null) {
         setValue(bean, value);
+        if (jsonMapperType) {
+          String json = reader.popJson();
+          if (json != null) {
+            final String hash = Md5.hash(json);
+            bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+          }
+        }
       }
       return value;
+    } catch (TextException e) {
+      throw e;
     } catch (Exception e) {
       throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
     }
@@ -643,13 +654,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
     try {
-      Object value = scalarType.read(ctx.getDataReader());
-      if (bean != null) {
-        setValue(bean, value);
-      }
-      return value;
-    } catch (Exception e) {
-      throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
+      return readSet(ctx.getDataReader(), bean);
+    } catch (TextException e) {
+      bean._ebean_getIntercept().setLoadError(propertyIndex, e);
+      ctx.handleLoadError(getFullBeanName(), e);
+      return getValue(bean);
     }
   }
 
@@ -1018,7 +1027,19 @@ 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.
    */
-  boolean isDirtyValue(Object value) {
+  boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
+    if (jsonMapperType) {
+      // dirty detection based on md5 hash of json content
+      final String json = scalarType.jsonMapper(value);
+      final String newHash = Md5.hash(json);
+      final String oldHash = ebi.mutableHash(propertyIndex);
+      if (!Objects.equals(newHash, oldHash)) {
+        ebi.mutableContent(propertyIndex, json); // so we only convert to json once
+        ebi.mutableHash(propertyIndex, newHash); // for dirty detection next time
+        return true;
+      }
+      return false;
+    }
     return scalarType.isDirty(value);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 189613808..0a4bb6b8a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -63,6 +63,11 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
     }
   }
 
+  @Override
+  public void pushJson(String json) {
+    dataBind.pushJson(json);
+  }
+
   @Override
   public long now() {
     return now;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
new file mode 100644
index 000000000..0a93452f1
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
@@ -0,0 +1,42 @@
+package io.ebeaninternal.server.persist.dmlbind;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.util.Md5;
+
+import java.sql.SQLException;
+
+/**
+ * For JSON Jackson properties - dirty detection via MD5 of json content.
+ */
+class BindablePropertyJsonInsert extends BindableProperty {
+
+  private final int propertyIndex;
+
+  BindablePropertyJsonInsert(BeanProperty prop) {
+    super(prop);
+    this.propertyIndex = prop.getPropertyIndex();
+  }
+
+  /**
+   * Normal binding of a property value from the bean.
+   */
+  @Override
+  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
+    if (bean == null) {
+      request.bind(null, prop);
+    } else {
+      Object value = prop.getValue(bean);
+      if (value == null) {
+        request.bind(null, prop);
+      } else {
+        // on insert store MD5 hash and push json
+        final String json = prop.format(value);
+        final String hash = Md5.hash(json);
+        bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+        request.pushJson(json);
+        request.bind(value, prop);
+      }
+    }
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
new file mode 100644
index 000000000..3418369f5
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
@@ -0,0 +1,35 @@
+package io.ebeaninternal.server.persist.dmlbind;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+import java.sql.SQLException;
+
+/**
+ * For JSON Jackson properties - dirty detection via MD5 of json content.
+ */
+class BindablePropertyJsonUpdate extends BindableProperty {
+
+  private final int propertyIndex;
+
+  BindablePropertyJsonUpdate(BeanProperty prop) {
+    super(prop);
+    this.propertyIndex = prop.getPropertyIndex();
+  }
+
+  /**
+   * Normal binding of a property value from the bean.
+   */
+  @Override
+  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
+    if (bean == null) {
+      request.bind(null, prop);
+    } else {
+      // on update push json
+      final String json = bean._ebean_getIntercept().mutableContent(propertyIndex);
+      request.pushJson(json);
+      final Object value = prop.getValue(bean);
+      request.bind(value, prop);
+    }
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
index 4a1fc6754..e06862e86 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java
@@ -57,4 +57,9 @@ public interface BindableRequest {
    * Return true if this is an update request.
    */
   boolean isUpdate();
+
+  /**
+   * Push json content for scalarType bind().
+   */
+  void pushJson(String json);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
index b47b4ecb6..78ceb098b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
@@ -43,6 +43,13 @@ class FactoryProperty {
       return  new BindableAssocOne((BeanPropertyAssocOne<?>)prop);
     }
 
+    if (prop.getScalarType().isJsonMapper()) {
+      if (DmlMode.INSERT == mode) {
+        return new BindablePropertyJsonInsert(prop);
+      } else if (DmlMode.UPDATE == mode) {
+        return new BindablePropertyJsonUpdate(prop);
+      }
+    }
     return new BindableProperty(prop);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index ac1386e11..20d1dfddb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -25,7 +25,6 @@ public class SqlBeanLoad {
   private final boolean rawSql;
 
   SqlBeanLoad(DbReadContext ctx, Class<?> type, EntityBean bean, Mode queryMode) {
-
     this.ctx = ctx;
     this.rawSql = ctx.isRawSql();
     this.type = type;
@@ -69,16 +68,16 @@ public class SqlBeanLoad {
     }
 
     try {
-      Object dbVal = prop.read(ctx);
       if (!refreshLoading) {
-        prop.setValue(bean, dbVal);
-      } else {
-        prop.setValueIntercept(bean, dbVal);
+        return prop.readSet(ctx, bean);
       }
-
+      // TODO: maybe create prop.readSetIntercept() and move this
+      Object dbVal = prop.read(ctx);
+      prop.setValueIntercept(bean, dbVal);
       return dbVal;
 
     } catch (Exception e) {
+      // TODO: maybe move this into prop.readSetIntercept()
       bean._ebean_getIntercept().setLoadError(prop.getPropertyIndex(), e);
       ctx.handleLoadError(prop.getFullBeanName(), e);
       return prop.getValue(bean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
index 2959c872c..489046405 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -36,6 +36,7 @@ public class DataBind implements DataBinder {
   private List<InputStream> inputStreams;
 
   protected int pos;
+  private String json;
 
   public DataBind(DataTimeZone dataTimeZone, PreparedStatement pstmt, Connection connection) {
     this.dataTimeZone = dataTimeZone;
@@ -43,6 +44,16 @@ public class DataBind implements DataBinder {
     this.connection = connection;
   }
 
+  @Override
+  public void pushJson(String json) {
+    this.json = json;
+  }
+
+  @Override
+  public String popJson() {
+    return json;
+  }
+
   @Override
   public StringBuilder append(Object entry) {
     return bindLog.append(entry);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
index 9763a5667..b85c8e688 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
@@ -20,22 +20,29 @@ import java.util.Calendar;
 public class RsetDataReader implements DataReader {
 
   private static final int bufferSize = 512;
-
   static final int clobBufferSize = 512;
-
   static final int stringInitialSize = 512;
 
   private final DataTimeZone dataTimeZone;
-
   private final ResultSet rset;
-
   protected int pos;
+  private String json;
 
   public RsetDataReader(DataTimeZone dataTimeZone, ResultSet rset) {
     this.dataTimeZone = dataTimeZone;
     this.rset = rset;
   }
 
+  @Override
+  public void pushJson(String json) {
+    this.json = json;
+  }
+
+  @Override
+  public String popJson() {
+    return json;
+  }
+
   @Override
   public void close() throws SQLException {
     rset.close();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 5e24412b5..d71cf18d6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -56,6 +56,50 @@ class ScalarTypeJsonObjectMapper {
     GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, Class<?> rawType) {
       super(Object.class, jsonManager, field, dbType, DocPropertyType.OBJECT, rawType);
     }
+
+    @Override
+    public boolean isJsonMapper() {
+      return true;
+    }
+
+    @Override
+    public String jsonMapper(Object value) {
+      return formatValue(value);
+    }
+
+    @Override
+    public Object read(DataReader reader) throws SQLException {
+      String json = reader.getString();
+      if (json == null || json.isEmpty()) {
+        return null;
+      }
+      // pushJson such that we MD5 and store on EntityBeanIntercept later
+      reader.pushJson(json);
+      try {
+        return objectReader.readValue(json, deserType);
+      } catch (IOException e) {
+        throw new TextException("Failed to parse JSON [{}] as " + deserType, json, e);
+      }
+    }
+
+    @Override
+    public void bind(DataBinder binder, Object value) throws SQLException {
+      // popJson as dirty detection already converted to json string
+      String rawJson = binder.popJson();
+      if (rawJson == null && value != null) {
+        rawJson = formatValue(value); // not expected, need to check?
+      }
+      if (pgType != null) {
+        binder.setObject(PostgresHelper.asObject(pgType, rawJson));
+      } else {
+        if (value == null) {
+          // use varchar, otherwise SqlServer/db2 will fail with 'Invalid JDBC data type 5.001.'
+          binder.setNull(Types.VARCHAR);
+        } else {
+          binder.setString(rawJson);
+        }
+      }
+    }
   }
 
   /**
@@ -118,10 +162,10 @@ class ScalarTypeJsonObjectMapper {
    */
   private static abstract class Base<T> extends ScalarTypeBase<T> {
 
-    private final ObjectWriter objectWriter;
-    private final ObjectMapper objectReader;
-    private final JavaType deserType;
-    private final String pgType;
+    protected final ObjectWriter objectWriter;
+    protected final ObjectMapper objectReader;
+    protected final JavaType deserType;
+    protected final String pgType;
     private final DocPropertyType docType;
     private final TypeJsonManager.DirtyHandler dirtyHandler;
 
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 106beb9f2..4bc0194d6 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -74,6 +74,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, plain_bean=?, version=? where id=?");
+    // plain_bean=?, no longer included with MD5 dirty detection
+    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index 28fd78221..f43d6f23c 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -113,7 +113,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, plain_bean=?, version=? where");
+    // plain_bean=?, no longer included with MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, version=? where");
   }
 
   public void update_when_dirty() {
@@ -126,7 +127,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set plain_bean=?, tags=?, version=? where id=? and version=?");
+    // plain_bean=? not included using MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set tags=?, version=? where id=? and version=?");
   }
 
   public void update_when_dirty_flags() {
@@ -139,7 +141,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set plain_bean=?, flags=?, version=? where id=? and version=?;");
+    // plain_bean=? not included with MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set flags=?, version=? where id=? and version=?;");
   }
 
   public void update_when_dirty_SetListMap() {
@@ -154,7 +157,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set beans=?, bean_list=?, bean_map=?, plain_bean=?, version=? where id=? and version=?");
+    // plain_bean=? not included with MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set beans=?, bean_list=?, bean_map=?, version=? where id=? and version=?");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
new file mode 100644
index 000000000..f3705aa16
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
@@ -0,0 +1,54 @@
+package org.tests.model.json;
+
+import io.ebean.annotation.DbJson;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class EBasicPlain {
+
+  @Id
+  long id;
+
+  String attr;
+
+  @DbJson(length = 500)
+  PlainBean plainBean;
+
+  @Version
+  long version;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getAttr() {
+    return attr;
+  }
+
+  public void setAttr(String attr) {
+    this.attr = attr;
+  }
+
+  public PlainBean getPlainBean() {
+    return plainBean;
+  }
+
+  public void setPlainBean(PlainBean plainBean) {
+    this.plainBean = plainBean;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
new file mode 100644
index 000000000..0e3d22aa7
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
@@ -0,0 +1,73 @@
+package org.tests.model.json;
+
+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 TestJacksonPlainBean {
+
+  @Test
+  public void insertUpdate() {
+
+    DB.getDefault();
+    LoggedSqlCollector.start();
+
+    PlainBean content = new PlainBean();
+    content.setAlong(42);
+    content.setName("foo");
+
+    EBasicPlain bean = new EBasicPlain();
+    bean.setAttr("attr0");
+    bean.setPlainBean(content);
+
+
+    DB.save(bean);
+    expectedSql(0, "insert into ebasic_plain (attr, plain_bean, version) values (?,?,?)");
+
+
+    // inserted plainBean has not been mutated
+    bean.setAttr("attr1");
+    DB.save(bean);
+    expectedSql(0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+
+
+    // inserted plainBean has now been mutated
+    content.setName("notFoo");
+    bean.setAttr("attr2");
+    DB.save(bean);
+    expectedSql(0, "update ebasic_plain set attr=?, plain_bean=?, version=? where id=? and version=?");
+
+
+    final EBasicPlain found = DB.find(EBasicPlain.class, bean.getId());
+
+    // update mutating PlainBean only
+    final PlainBean plainBean = found.getPlainBean();
+    plainBean.setName("mod1");
+    DB.save(found);
+    expectedSql(1, "update ebasic_plain set plain_bean=?, version=? where id=? and version=?");
+
+
+    // update bean, mutate PlainBean only
+    plainBean.setName("mod2");
+    DB.save(found);
+    expectedSql(0, "update ebasic_plain set plain_bean=?, version=? where id=? and version=?");
+
+
+    // update bean, not mutating PlainBean
+    found.setAttr("attr3");
+    DB.save(found);
+    expectedSql(LoggedSqlCollector.stop(), 0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+  }
+
+  private void expectedSql(int i, String s) {
+    assertThat(LoggedSqlCollector.current().get(i)).contains(s);
+  }
+
+  private void expectedSql(List<String> sql, int i, String s) {
+    assertThat(sql.get(i)).contains(s);
+  }
+}

From 4aef0ad459cf0ccfa4c01969d3d3bf96320fcfd2 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 28 Jul 2021 17:23:37 +1200
Subject: [PATCH 295/447] #2275 - Change Query<?> to Query<T> on ExtendedServer
 exists() method

---
 .../main/java/io/ebean/ExtendedServer.java    |  2 +-
 .../server/core/DefaultServer.java            |  8 ++---
 .../ebeaninternal/api/TDSpiEbeanServer.java   |  2 +-
 .../query/cancel/SqlQueryCancelTest.java      | 34 +++++++++----------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
index 9a7e62e0c..59b1c678e 100644
--- a/ebean-api/src/main/java/io/ebean/ExtendedServer.java
+++ b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
@@ -67,7 +67,7 @@ public interface ExtendedServer {
    *
    * @return True if the query finds a matching row in the database
    */
-  <T> boolean exists(Query<?> ormQuery, Transaction transaction);
+  <T> boolean exists(Query<T> ormQuery, Transaction transaction);
 
   /**
    * Return the number of 'top level' or 'root' entities this query should return.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 87580f90b..4aa90ad13 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1283,14 +1283,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public <T> boolean exists(Query<?> ormQuery, Transaction transaction) {
-    Query<?> ormQueryCopy = ormQuery.copy();
-    ormQueryCopy.setMaxRows(1);
+  public <T> boolean exists(Query<T> ormQuery, Transaction transaction) {
+    Query<T> ormQueryCopy = ormQuery.copy().setMaxRows(1);
     SpiOrmQueryRequest<?> request = createQueryRequest(Type.ID_LIST, ormQueryCopy, transaction);
     try {
       request.initTransIfRequired();
-      List<Object> ids = request.findIds();
-      return !ids.isEmpty();
+      return !request.findIds().isEmpty();
     } finally {
       request.endTransIfRequired();
     }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index f0f0c0779..b09a0f54e 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -650,7 +650,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public <T> boolean exists(Query<?> ormQuery, Transaction transaction) {
+  public <T> boolean exists(Query<T> ormQuery, Transaction transaction) {
     return false;
   }
 
diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
index d3dda7443..9fc3d6b57 100644
--- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
+++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
@@ -30,18 +30,18 @@ import io.ebean.annotation.Platform;
  * Tests, if all kind of queries are cancelable. There are two ways how to
  * cancel a query: <br/>
  * <b>At begin:</b>
- * 
+ *
  * <pre>
  * query = DB.find(...)
  * query.cancel();
  * query.findList();
  * </pre>
- * 
+ *
  * The query was caneled before executing. In this case we do hit the DB driver
  * <br/>
  * <br/>
  * <b>During run:</b>
- * 
+ *
  * <pre>
  * // Thread 1:              Thread 2
  * query = DB.find(...)
@@ -50,26 +50,26 @@ import io.ebean.annotation.Platform;
  *     ...finding            query.cancel();
  *      ...JDBC-Exception
  * </pre>
- * 
+ *
  * The test tries to simulate a slow query by installing the
  * {@link SlowDownEBasic} 'SELECT' trigger. The trigger can be configured to
  * wait 3 * <code>timing</code> ms and a second thread will cancel the query in
  * <code>timing</code> ms.
- * 
+ *
  * in this case, we expect a JDBC exception from the driver. <br/>
  * <br/>
  * NOTE:<br/>
  * H2 checks the cancel flag in org.h2.command.Prepared::setCurrentRowNumber
  * only every 128th row. So we need at least 128 models and we cannot check
  * queries like findCount or findOne, because they only return one row.
- * 
+ *
  * @author Roland Praml, FOCONIS AG
  *
  */
 public class SqlQueryCancelTest extends BaseTestCase {
 
-  private int timing = 10;
-  
+  private final int timing = 20;
+
   @BeforeClass
   public static void setupTestData() throws SQLException {
     for (int i = 0; i < 128; i++) {
@@ -98,10 +98,10 @@ public class SqlQueryCancelTest extends BaseTestCase {
     doCancelSqlDuringRun(q -> q.findEachWhile(e -> true));
   }
 
-  
+
   @Test
   public void cancelOrmQueryAtBegin() throws SQLException {
-    doCancelOrmAtBegin(Query::findCount); 
+    doCancelOrmAtBegin(Query::findCount);
     doCancelOrmAtBegin(Query::findFutureCount);
     // We cannot test 'findCount' due H2 restrictions
     doCancelOrmAtBegin(Query::findFutureIds);
@@ -206,7 +206,7 @@ public class SqlQueryCancelTest extends BaseTestCase {
       .isInstanceOf(PersistenceException.class)
       .hasMessageContaining("Query was cancelled");
   }
-  
+
   @Test
   public void cancelSqlDtoQueryAtBegin() throws SQLException {
 
@@ -290,7 +290,7 @@ public class SqlQueryCancelTest extends BaseTestCase {
   private void doCancelOrmFutureDuringRun(Function<Query<EBasic>, Future<?>> test) throws SQLException, InterruptedException, ExecutionException {
     Query<EBasic> warmup = DB.find(EBasic.class);
     test.apply(warmup).get();
-    
+
     Query<EBasic> query = DB.find(EBasic.class);
     executeDelayed(query::cancel);
     assertThatThrownBy(() -> {
@@ -311,18 +311,18 @@ public class SqlQueryCancelTest extends BaseTestCase {
         .isInstanceOf(PersistenceException.class)
         .hasMessageContaining("Query was cancelled");
   }
-  
+
   private void doCancelOrmDtoDuringRun(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
     DtoQuery<EBasicDto> warmup = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
     test.accept(warmup);
-    
+
     DtoQuery<EBasicDto> query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
     executeDelayed(query::cancel);
     assertThatThrownBy(() -> test.accept(query))
         .isInstanceOf(PersistenceException.class)
         .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
   }
-  
+
   private void doCancelSqlDtoAtBegin(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
     DtoQuery<EBasicDto> query = DB.findDto(EBasicDto.class, "select id, status from e_basic");
     query.cancel();
@@ -334,14 +334,14 @@ public class SqlQueryCancelTest extends BaseTestCase {
   private void doCancelSqlDtoDuringRun(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
     DtoQuery<EBasicDto> warmup = DB.findDto(EBasicDto.class, "select id, status from e_basic");
     test.accept(warmup);
-    
+
     DtoQuery<EBasicDto> query = DB.findDto(EBasicDto.class, "select id, status from e_basic");
     executeDelayed(query::cancel);
     assertThatThrownBy(() -> test.accept(query))
         .isInstanceOf(PersistenceException.class)
         .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
   }
-  
+
   private void executeDelayed(Runnable r) throws SQLException {
     // We modify the DB here. Otherwise we may hit an internal H2 cache, if the
     // same query is performed. Queries from the cache cannot be canceled.

From 11eed4cfe9cb9118624bd0200691acf6b71d587e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 28 Jul 2021 21:43:57 +1200
Subject: [PATCH 296/447] Add BeanPropertyJsonMapper for JSON dirty detection

---
 .../server/deploy/BeanProperty.java           | 22 -------
 .../server/deploy/BeanPropertyJsonMapper.java | 57 +++++++++++++++++++
 .../deploy/meta/DeployBeanProperty.java       |  3 +
 .../deploy/meta/DeployBeanPropertyLists.java  | 13 ++---
 4 files changed, 64 insertions(+), 31 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index d3c832c85..d9af317d7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -219,7 +219,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    */
   @SuppressWarnings("rawtypes")
   final ScalarType scalarType;
-  final boolean jsonMapperType;
 
   private final DocPropertyOptions docOptions;
 
@@ -333,7 +332,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     this.formula = sqlFormulaSelect != null;
     this.dbType = deploy.getDbType();
     this.scalarType = deploy.getScalarType();
-    this.jsonMapperType = (scalarType == null) ? false : scalarType.isJsonMapper();
     this.lob = isLobType(dbType);
     this.propertyType = deploy.getPropertyType();
     this.field = deploy.getField();
@@ -428,7 +426,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     this.setter = source.setter;
     this.dbType = source.getDbType(true);
     this.scalarType = source.scalarType;
-    this.jsonMapperType = source.jsonMapperType;
     this.lob = isLobType(dbType);
     this.propertyType = source.getPropertyType();
     this.field = source.getField();
@@ -632,13 +629,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
       Object value = scalarType.read(reader);
       if (bean != null) {
         setValue(bean, value);
-        if (jsonMapperType) {
-          String json = reader.popJson();
-          if (json != null) {
-            final String hash = Md5.hash(json);
-            bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
-          }
-        }
       }
       return value;
     } catch (TextException e) {
@@ -1028,18 +1018,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * This is only used for 'mutable' scalar types like hstore etc.
    */
   boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
-    if (jsonMapperType) {
-      // dirty detection based on md5 hash of json content
-      final String json = scalarType.jsonMapper(value);
-      final String newHash = Md5.hash(json);
-      final String oldHash = ebi.mutableHash(propertyIndex);
-      if (!Objects.equals(newHash, oldHash)) {
-        ebi.mutableContent(propertyIndex, json); // so we only convert to json once
-        ebi.mutableHash(propertyIndex, newHash); // for dirty detection next time
-        return true;
-      }
-      return false;
-    }
     return scalarType.isDirty(value);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
new file mode 100644
index 000000000..2d24958b6
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -0,0 +1,57 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.core.type.DataReader;
+import io.ebean.text.TextException;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+import io.ebeaninternal.server.util.Md5;
+
+import javax.persistence.PersistenceException;
+import java.sql.SQLException;
+import java.util.Objects;
+
+public class BeanPropertyJsonMapper extends BeanProperty {
+
+  public BeanPropertyJsonMapper(BeanDescriptor<?> desc, DeployBeanProperty deployProp) {
+    super(desc, deployProp);
+  }
+
+  /**
+   * Return true if the mutable value is considered dirty.
+   * This is only used for 'mutable' scalar types like hstore etc.
+   */
+  @Override
+  boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
+    // dirty detection based on md5 hash of json content
+    final String json = scalarType.jsonMapper(value);
+    final String newHash = Md5.hash(json);
+    final String oldHash = ebi.mutableHash(propertyIndex);
+    if (!Objects.equals(newHash, oldHash)) {
+      ebi.mutableContent(propertyIndex, json); // so we only convert to json once
+      ebi.mutableHash(propertyIndex, newHash); // for dirty detection next time
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public Object readSet(DataReader reader, EntityBean bean) throws SQLException {
+    try {
+      Object value = scalarType.read(reader);
+      if (bean != null) {
+        setValue(bean, value);
+        String json = reader.popJson();
+        if (json != null) {
+          final String hash = Md5.hash(json);
+          bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+        }
+      }
+      return value;
+    } catch (TextException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
+    }
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index e20c898ce..92ad7f1e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -1201,4 +1201,7 @@ public class DeployBeanProperty {
     return false;
   }
 
+  boolean isJsonMapper() {
+    return scalarType != null && scalarType.isJsonMapper();
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index f6280b260..9843f8e5c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -1,15 +1,7 @@
 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;
-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;
+import io.ebeaninternal.server.deploy.*;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.properties.BeanPropertySetter;
 import io.ebeaninternal.server.type.ScalarTypeString;
@@ -490,6 +482,9 @@ public class DeployBeanPropertyLists {
       return new BeanPropertyAssocMany(desc, (DeployBeanPropertyAssocMany) deployProp);
     }
 
+    if (deployProp.isJsonMapper()) {
+      return new BeanPropertyJsonMapper(desc, deployProp);
+    }
     return new BeanProperty(desc, deployProp);
   }
 

From 49b86d07d3bb5bdd13b97a180ab92038011655fc Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 28 Jul 2021 22:48:29 +1200
Subject: [PATCH 297/447] Modify SqlBeanLoad to use readSet()

Note that we don't need to use readSetIntercept() now as there is no property change listener support
---
 .../server/deploy/BeanProperty.java           | 18 +++++---------
 .../server/query/SqlBeanLoad.java             | 24 ++-----------------
 .../java/io/ebean/EbeanServer_refresh.java    |  5 +++-
 3 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index d9af317d7..4306ed97d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -33,7 +33,6 @@ import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.type.*;
-import io.ebeaninternal.server.util.Md5;
 import io.ebeaninternal.util.ValueUtil;
 import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
@@ -52,7 +51,6 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -643,13 +641,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   }
 
   public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
-    try {
-      return readSet(ctx.getDataReader(), bean);
-    } catch (TextException e) {
-      bean._ebean_getIntercept().setLoadError(propertyIndex, e);
-      ctx.handleLoadError(getFullBeanName(), e);
-      return getValue(bean);
-    }
+    return readSet(ctx.getDataReader(), bean);
   }
 
   @SuppressWarnings("unchecked")
@@ -908,7 +900,8 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the name of the property.
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public String getName() {
     return name;
   }
@@ -1280,7 +1273,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   @Override
   public Object localEncrypt(Object value) {
-    return ((LocalEncryptedType)scalarType).localEncrypt(value);
+    return ((LocalEncryptedType) scalarType).localEncrypt(value);
   }
 
   /**
@@ -1393,7 +1386,8 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the property type.
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public Class<?> getPropertyType() {
     return propertyType;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index 20d1dfddb..83c7b2936 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -18,10 +18,8 @@ public class SqlBeanLoad {
   private final DbReadContext ctx;
   private final EntityBean bean;
   private final EntityBeanIntercept ebi;
-
   private final Class<?> type;
   private final boolean lazyLoading;
-  private final boolean refreshLoading;
   private final boolean rawSql;
 
   SqlBeanLoad(DbReadContext ctx, Class<?> type, EntityBean bean, Mode queryMode) {
@@ -29,7 +27,6 @@ public class SqlBeanLoad {
     this.rawSql = ctx.isRawSql();
     this.type = type;
     this.lazyLoading = queryMode == Mode.LAZYLOAD_BEAN;
-    this.refreshLoading = queryMode == Mode.REFRESH_BEAN;
     this.bean = bean;
     this.ebi = bean == null ? null : bean._ebean_getIntercept();
   }
@@ -49,35 +46,22 @@ public class SqlBeanLoad {
   }
 
   public Object load(BeanProperty prop) {
-
     if (!rawSql && !prop.isLoadProperty(ctx.isDraftQuery())) {
       return null;
     }
-
     if ((bean == null)
       || (lazyLoading && ebi.isLoadedProperty(prop.getPropertyIndex()))
       || (type != null && !prop.isAssignableFrom(type))) {
-
       // ignore this property
       // ... null: bean already in persistence context
       // ... lazyLoading: partial bean that is lazy loading
       // ... type: inheritance and not assignable to this instance
-
       prop.loadIgnore(ctx);
       return null;
     }
-
     try {
-      if (!refreshLoading) {
-        return prop.readSet(ctx, bean);
-      }
-      // TODO: maybe create prop.readSetIntercept() and move this
-      Object dbVal = prop.read(ctx);
-      prop.setValueIntercept(bean, dbVal);
-      return dbVal;
-
+      return prop.readSet(ctx, bean);
     } catch (Exception e) {
-      // TODO: maybe move this into prop.readSetIntercept()
       bean._ebean_getIntercept().setLoadError(prop.getPropertyIndex(), e);
       ctx.handleLoadError(prop.getFullBeanName(), e);
       return prop.getValue(bean);
@@ -88,10 +72,6 @@ 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);
-    }
+    target.setValue(bean, dbVal);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java
index 1e1900a13..66af5d164 100644
--- a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java
+++ b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 public class EbeanServer_refresh {
 
@@ -39,8 +39,11 @@ public class EbeanServer_refresh {
 
     assertEquals(rows, 1);
 
+    basic.setName("modify");
+    assertTrue(DB.getBeanState(basic).isDirty());
     server.refresh(basic);
     assertEquals(basic.getStatus(), EBasic.Status.ACTIVE);
+    assertFalse(DB.getBeanState(basic).isDirty());
   }
 
   @Test

From 5e595ec5f875690d7c6e198871fc8f726f234ef7 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 28 Jul 2021 14:54:56 +0200
Subject: [PATCH 298/447] Proof of concept to support also bean change
 detection / changelog on mutable properties

---
 .../io/ebean/bean/EntityBeanIntercept.java    | 29 ++++++--
 .../main/java/io/ebean/bean/MutableJson.java  | 12 ++++
 .../java/io/ebean/core/type/ScalarType.java   |  5 ++
 .../server/deploy/BeanPropertyJsonMapper.java | 13 ++--
 .../dmlbind/BindablePropertyJsonInsert.java   |  3 +-
 .../type/ScalarTypeJsonObjectMapper.java      | 64 +++++++++++++++++
 .../org/tests/json/TestDbJson_Jackson3.java   | 70 ++++++++++++++++++-
 7 files changed, 180 insertions(+), 16 deletions(-)
 create mode 100644 ebean-api/src/main/java/io/ebean/bean/MutableJson.java

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 59a2450bd..2ea4afbb5 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -94,7 +94,7 @@ public final class EntityBeanIntercept implements Serializable {
   /**
    * Holds MD5 hash of json loaded jackson beans.
    */
-  private String[] mutableHash;
+  private MutableJson[] mutableHash;
 
   /**
    * Holds json content determined at point of dirty check.
@@ -381,7 +381,11 @@ public final class EntityBeanIntercept implements Serializable {
     this.origValues = null;
     for (int i = 0; i < flags.length; i++) {
       flags[i] &= ~(FLAG_CHANGED_PROP + FLAG_ORIG_VALUE_SET);
+      if (mutableHash != null && mutableHash[i] != null) {
+        mutableHash[i].update(owner._ebean_getField(i));
+      }
     }
+    
     this.dirty = false;
   }
 
@@ -649,7 +653,7 @@ 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 ((flags[i] & FLAG_CHANGED_PROP) != 0) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0 || isChangedByHash(i)) {
         // the property has been changed on this bean
         props.add((prefix == null ? getProperty(i) : prefix + getProperty(i)));
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
@@ -667,7 +671,7 @@ public final class EntityBeanIntercept implements Serializable {
     String[] names = owner._ebean_getPropertyNames();
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0 || isChangedByHash(i)) {
         if (propertyNames.contains(names[i])) {
           return true;
         }
@@ -695,7 +699,12 @@ 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 ((flags[i] & FLAG_CHANGED_PROP) != 0) {
+      if (isChangedByHash(i)) {
+        String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
+        Object newVal = owner._ebean_getField(i);
+        Object oldVal = mutableHash[i].get();
+        dirtyValues.put(propName, new ValuePair(newVal, oldVal));
+      } else 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);
@@ -1150,13 +1159,19 @@ public final class EntityBeanIntercept implements Serializable {
     return ret;
   }
 
-  public String mutableHash(int propertyIndex) {
+  private boolean isChangedByHash(int propertyIndex) {
+    return mutableHash != null 
+        && mutableHash[propertyIndex] != null
+        && !mutableHash[propertyIndex].isEqualToObject(owner._ebean_getField(propertyIndex));
+  }
+  
+  public MutableJson mutableHash(int propertyIndex) {
     return mutableHash == null ? null : mutableHash[propertyIndex];
   }
 
-  public void mutableHash(int propertyIndex, String content) {
+  public void mutableHash(int propertyIndex, MutableJson content) {
     if (mutableHash == null) {
-      mutableHash = new String[flags.length];
+      mutableHash = new MutableJson[flags.length];
     }
     mutableHash[propertyIndex] = content;
   }
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableJson.java b/ebean-api/src/main/java/io/ebean/bean/MutableJson.java
new file mode 100644
index 000000000..5989465e2
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableJson.java
@@ -0,0 +1,12 @@
+package io.ebean.bean;
+
+public interface MutableJson {
+  
+  boolean isEqualToObject(Object obj);
+  
+  boolean isEqualToJson(String json);
+  
+  Object get();
+
+  void update(Object obj);
+}
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 831664991..b9f7f168c 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -2,6 +2,8 @@ package io.ebean.core.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+
+import io.ebean.bean.MutableJson;
 import io.ebean.text.StringFormatter;
 import io.ebean.text.StringParser;
 
@@ -42,6 +44,9 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
     throw new UnsupportedOperationException();
   }
 
+  default MutableJson jsonMutable(String json) {
+    throw new UnsupportedOperationException();
+  }
   /**
    * Return true if this is a binary type and can not support parse() and format() from/to string.
    * This allows Ebean to optimise marshalling types to string.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index 2d24958b6..de5d148b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.bean.MutableJson;
 import io.ebean.core.type.DataReader;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
@@ -25,11 +26,11 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
     // dirty detection based on md5 hash of json content
     final String json = scalarType.jsonMapper(value);
-    final String newHash = Md5.hash(json);
-    final String oldHash = ebi.mutableHash(propertyIndex);
-    if (!Objects.equals(newHash, oldHash)) {
+    final MutableJson oldHash = ebi.mutableHash(propertyIndex);
+    if (oldHash == null || !oldHash.isEqualToJson(json)) {
       ebi.mutableContent(propertyIndex, json); // so we only convert to json once
-      ebi.mutableHash(propertyIndex, newHash); // for dirty detection next time
+      //ebi.mutableHash(propertyIndex, scalarType.jsonMutable(json)); // for dirty detection next time
+      //must be done AFTER persistControllers are called. 
       return true;
     }
     return false;
@@ -43,8 +44,8 @@ public class BeanPropertyJsonMapper extends BeanProperty {
         setValue(bean, value);
         String json = reader.popJson();
         if (json != null) {
-          final String hash = Md5.hash(json);
-          bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+          final String hash = scalarType.format(value);
+          bean._ebean_getIntercept().mutableHash(propertyIndex, scalarType.jsonMutable(hash));
         }
       }
       return value;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
index 0a93452f1..24cf050e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
@@ -32,8 +32,7 @@ class BindablePropertyJsonInsert extends BindableProperty {
       } else {
         // on insert store MD5 hash and push json
         final String json = prop.format(value);
-        final String hash = Md5.hash(json);
-        bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+        bean._ebean_getIntercept().mutableHash(propertyIndex, prop.getScalarType().jsonMutable(json));
         request.pushJson(json);
         request.bind(value, prop);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index d71cf18d6..5b44b63e4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
+
+import io.ebean.bean.MutableJson;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
@@ -15,6 +17,7 @@ import io.ebean.text.TextException;
 import io.ebeaninternal.json.ModifyAwareList;
 import io.ebeaninternal.json.ModifyAwareMap;
 import io.ebeaninternal.json.ModifyAwareSet;
+import io.ebeaninternal.server.util.Md5;
 
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
@@ -24,6 +27,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -66,6 +70,66 @@ class ScalarTypeJsonObjectMapper {
     public String jsonMapper(Object value) {
       return formatValue(value);
     }
+    
+    private class Md5MutableJson implements MutableJson {
+
+      private String md5;
+      Md5MutableJson(String json) {
+        md5 = Md5.hash(json);
+      }
+      @Override
+      public boolean isEqualToObject(Object obj) {
+        return true; // we cannot determine differences...
+      }
+
+      @Override
+      public boolean isEqualToJson(String json) {
+        return Md5.hash(json).equals(md5);
+      }
+
+      @Override
+      public Object get() {
+        return null; // cannot create object from json
+      }
+      @Override
+      public void update(Object obj) {
+        md5 = Md5.hash(format(obj));
+      }
+    }
+
+    private class PlainMutableJson implements MutableJson {
+
+      private String originalJson;
+      PlainMutableJson(String json) {
+        originalJson = json;
+      }
+      @Override
+      public boolean isEqualToObject(Object obj) {
+        return isEqualToJson(format(obj));
+      }
+
+      @Override
+      public boolean isEqualToJson(String json) {
+        return Objects.equals(originalJson, json);
+      }
+
+      @Override
+      public Object get() {
+        return parse(originalJson);
+      }
+      @Override
+      public void update(Object obj) {
+        originalJson = format(obj);
+      }
+    }
+    @Override
+    public MutableJson jsonMutable(String originalJson) {
+      if (false) {
+        return new Md5MutableJson(originalJson);
+      } else {
+        return new PlainMutableJson(originalJson);
+      }
+    }
 
     @Override
     public Object read(DataReader reader) throws SQLException {
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 4bc0194d6..4d31f8a56 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -1,7 +1,11 @@
 package org.tests.json;
 
 import io.ebean.BaseTestCase;
+import io.ebean.BeanState;
 import io.ebean.DB;
+import io.ebean.ValuePair;
+import io.ebean.event.BeanPersistAdapter;
+import io.ebean.event.BeanPersistRequest;
 import io.ebeantest.LoggedSql;
 import org.junit.Test;
 import org.tests.model.json.EBasicJsonJackson3;
@@ -11,11 +15,33 @@ import org.tests.model.json.PlainBeanDirtyAware;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDbJson_Jackson3 extends BaseTestCase {
 
+  public static class EBasicJsonListPersistController extends BeanPersistAdapter {
+
+    private static Map<String, ValuePair> updatedValues;
+
+    @Override
+    public boolean isRegisterFor(Class<?> cls) {
+      return EBasicJsonList.class.isAssignableFrom(cls);
+    }
+    
+    @Override
+    public boolean preInsert(BeanPersistRequest<?> request) {
+      updatedValues = request.getUpdatedValues();
+      return true;
+    }
+    
+    @Override
+    public boolean preUpdate(BeanPersistRequest<?> request) {
+      updatedValues = request.getUpdatedValues();
+      return true;
+    }
+  }
   @Test
   public void updateIncludesJsonColumn_when_explicit_isMarkedDirty() {
 
@@ -69,12 +95,54 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     found.setName("p1-mod");
     found.setBeanList(null);
 
+    BeanState state = DB.getBeanState(found);
+    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("name", "beanList");
+    
+    ValuePair pair = state.getDirtyValues().get("name");
+    assertThat(pair.getNewValue()).isEqualTo("p1-mod");
+    assertThat(pair.getOldValue()).isEqualTo("p1");
+    
+    pair = state.getDirtyValues().get("beanList");
+    assertThat(pair.getNewValue()).isEqualTo(null);
+    assertThat((List<PlainBean>)pair.getOldValue()).hasSize(1)
+      .extracting(PlainBean::getName).containsExactly("a");
+    
+    
     LoggedSql.start();
     DB.save(found);
 
-    final List<String> sql = LoggedSql.stop();
+    List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
     // plain_bean=?, no longer included with MD5 dirty detection
     assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
+    
+    assertThat(EBasicJsonListPersistController.updatedValues.entrySet())
+      .extracting(Map.Entry::toString)
+      .containsExactlyInAnyOrder("beanList=null,[name:a]","name=p1-mod,p1","version=2,1");
+    
+    
+    found.getPlainBean().setName("b");
+    
+    // CHECKME: How do we get these checks to work?
+    // assertThat(DB.getBeanState(found).isDirty()).isTrue();
+    
+    state = DB.getBeanState(found);
+    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainBean");
+    pair = state.getDirtyValues().get("plainBean");
+    assertThat(pair.getNewValue()).hasToString("name:b");
+    assertThat(pair.getOldValue()).hasToString("name:a");
+
+    
+    LoggedSql.start();
+    DB.save(found);
+
+    sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    // plain_bean=?, no longer included with MD5 dirty detection
+    assertThat(sql.get(0)).contains("update ebasic_json_list set plain_bean=?, version=? where id=?");
+
+    assertThat(EBasicJsonListPersistController.updatedValues.entrySet())
+      .extracting(Map.Entry::toString)
+      .containsExactlyInAnyOrder("plainBean=name:b,name:a", "version=3,2");
   }
 }

From b497b8635b8c3fcbc0ee08028aec2b67be2148e0 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 28 Jul 2021 17:22:29 +0200
Subject: [PATCH 299/447] some refactor and tidying

---
 .../io/ebean/bean/EntityBeanIntercept.java    |  71 +++++++----
 .../main/java/io/ebean/bean/MutableHash.java  |  16 +++
 .../main/java/io/ebean/bean/MutableJson.java  |  12 --
 .../java/io/ebean/core/type/ScalarType.java   |   5 +-
 .../server/deploy/BeanProperty.java           |   8 ++
 .../server/deploy/BeanPropertyJsonMapper.java |  12 +-
 .../dmlbind/BindablePropertyJsonInsert.java   |   7 +-
 .../dmlbind/BindablePropertyJsonUpdate.java   |   5 +-
 .../ebeaninternal/server/type/DataBind.java   |   5 +-
 .../type/ScalarTypeJsonObjectMapper.java      | 111 +++++++++---------
 .../org/tests/json/TestDbJson_Jackson3.java   |  28 ++++-
 .../tests/model/json/EBasicJsonJackson3.java  |  11 ++
 12 files changed, 184 insertions(+), 107 deletions(-)
 create mode 100644 ebean-api/src/main/java/io/ebean/bean/MutableHash.java
 delete mode 100644 ebean-api/src/main/java/io/ebean/bean/MutableJson.java

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 2ea4afbb5..37446a1b3 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -51,6 +51,11 @@ public final class EntityBeanIntercept implements Serializable {
    */
   private static final byte FLAG_ORIG_VALUE_SET = 8;
 
+  /**
+   * Flags indicating if the mutable hash is set.
+   */
+  private static final byte FLAG_MUTABLE_HASH_SET = 16;
+  
   private transient final ReentrantLock lock = new ReentrantLock();
   private transient NodeUsageCollector nodeUsageCollector;
   private transient PersistenceContext persistenceContext;
@@ -94,7 +99,7 @@ public final class EntityBeanIntercept implements Serializable {
   /**
    * Holds MD5 hash of json loaded jackson beans.
    */
-  private MutableJson[] mutableHash;
+  private MutableHash[] mutableHash;
 
   /**
    * Holds json content determined at point of dirty check.
@@ -239,6 +244,17 @@ public final class EntityBeanIntercept implements Serializable {
    * if any embedded beans are either new or dirty (and hence need saving).
    */
   public boolean isDirty() {
+    if (dirty) {
+      return true;
+    }
+    if (mutableHash != null) {
+      for (int i = 0; i < mutableHash.length; i++) {
+        if (mutableHash[i] != null && !mutableHash[i].isEqualToObject(owner._ebean_getField(i))) {
+          dirty = true;
+          break;
+        }
+      }
+    }
     return dirty;
   }
 
@@ -379,13 +395,10 @@ public final class EntityBeanIntercept implements Serializable {
     this.owner._ebean_setEmbeddedLoaded();
     this.lazyLoadProperty = -1;
     this.origValues = null;
+    this.mutableContent = null;
     for (int i = 0; i < flags.length; i++) {
-      flags[i] &= ~(FLAG_CHANGED_PROP + FLAG_ORIG_VALUE_SET);
-      if (mutableHash != null && mutableHash[i] != null) {
-        mutableHash[i].update(owner._ebean_getField(i));
-      }
+      flags[i] &= ~(FLAG_CHANGED_PROP | FLAG_ORIG_VALUE_SET);
     }
-    
     this.dirty = false;
   }
 
@@ -653,14 +666,14 @@ 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 ((flags[i] & FLAG_CHANGED_PROP) != 0 || isChangedByHash(i)) {
+      if (isChangedProp(i)) {
         // the property has been changed on this bean
         props.add((prefix == null ? getProperty(i) : prefix + getProperty(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) + ".");
-      }
+      } 
     }
   }
 
@@ -671,7 +684,7 @@ public final class EntityBeanIntercept implements Serializable {
     String[] names = owner._ebean_getPropertyNames();
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if ((flags[i] & FLAG_CHANGED_PROP) != 0 || isChangedByHash(i)) {
+      if (isChangedProp(i)) {
         if (propertyNames.contains(names[i])) {
           return true;
         }
@@ -699,16 +712,17 @@ 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 (isChangedByHash(i)) {
-        String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
-        Object newVal = owner._ebean_getField(i);
-        Object oldVal = mutableHash[i].get();
-        dirtyValues.put(propName, new ValuePair(newVal, oldVal));
-      } else if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
+   
+      if (isChangedProp(i)) {
         // 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 ((flags[i] & (FLAG_ORIG_VALUE_SET | FLAG_MUTABLE_HASH_SET)) == FLAG_MUTABLE_HASH_SET) {
+          // mutable hash set, but not ORIG_VALUE
+          oldVal = mutableHash[i].get();
+          setOriginalValue(i, oldVal);
+        }
         if (notEqual(oldVal, newVal)) {
           dirtyValues.put(propName, new ValuePair(newVal, oldVal));
         }
@@ -726,7 +740,7 @@ public final class EntityBeanIntercept implements Serializable {
   public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
+      if (isChangedProp(i)) {
         // the property has been changed on this bean
         Object newVal = owner._ebean_getField(i);
         Object oldVal = getOrigValue(i);
@@ -761,7 +775,7 @@ public final class EntityBeanIntercept implements Serializable {
     }
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
-      if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
+      if ((flags[i] & FLAG_CHANGED_PROP) != 0) { // we do not check against mutablecontent here.
         sb.append(i).append(',');
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
@@ -1159,20 +1173,29 @@ public final class EntityBeanIntercept implements Serializable {
     return ret;
   }
 
-  private boolean isChangedByHash(int propertyIndex) {
-    return mutableHash != null 
-        && mutableHash[propertyIndex] != null
-        && !mutableHash[propertyIndex].isEqualToObject(owner._ebean_getField(propertyIndex));
+  private boolean isChangedProp(int i) {
+    if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
+      return true;
+    } else if (mutableHash == null || mutableHash[i] == null
+        || mutableHash[i].isEqualToObject(owner._ebean_getField(i))) {
+      return false;
+    } else {
+      // mark for change 
+      flags[i] |= FLAG_CHANGED_PROP;
+      dirty = true; // this makes the bean automatically dirty!
+      return true;
+    }
   }
   
-  public MutableJson mutableHash(int propertyIndex) {
+  public MutableHash mutableHash(int propertyIndex) {
     return mutableHash == null ? null : mutableHash[propertyIndex];
   }
 
-  public void mutableHash(int propertyIndex, MutableJson content) {
+  public void mutableHash(int propertyIndex, MutableHash content) {
     if (mutableHash == null) {
-      mutableHash = new MutableJson[flags.length];
+      mutableHash = new MutableHash[flags.length];
     }
+    flags[propertyIndex] |= FLAG_MUTABLE_HASH_SET;
     mutableHash[propertyIndex] = content;
   }
 
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableHash.java b/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
new file mode 100644
index 000000000..09c8761af
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
@@ -0,0 +1,16 @@
+package io.ebean.bean;
+
+
+public interface MutableHash {
+  
+  boolean isEqualToJson(String json);
+
+  default boolean isEqualToObject(Object obj) {
+    return true;
+  }
+  
+  default Object get() {
+    return null;
+  }
+}
+ 
\ No newline at end of file
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableJson.java b/ebean-api/src/main/java/io/ebean/bean/MutableJson.java
deleted file mode 100644
index 5989465e2..000000000
--- a/ebean-api/src/main/java/io/ebean/bean/MutableJson.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.ebean.bean;
-
-public interface MutableJson {
-  
-  boolean isEqualToObject(Object obj);
-  
-  boolean isEqualToJson(String json);
-  
-  Object get();
-
-  void update(Object obj);
-}
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index b9f7f168c..55c8ad9bd 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -3,7 +3,7 @@ package io.ebean.core.type;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
-import io.ebean.bean.MutableJson;
+import io.ebean.bean.MutableHash;
 import io.ebean.text.StringFormatter;
 import io.ebean.text.StringParser;
 
@@ -44,9 +44,10 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
     throw new UnsupportedOperationException();
   }
 
-  default MutableJson jsonMutable(String json) {
+  default MutableHash createMutableHash(String json) {
     throw new UnsupportedOperationException();
   }
+
   /**
    * Return true if this is a binary type and can not support parse() and format() from/to string.
    * This allows Ebean to optimise marshalling types to string.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 4306ed97d..99ef307a7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.bean.MutableHash;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.dbplatform.DbEncryptFunction;
@@ -818,6 +819,13 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   public Object parse(String value) {
     return scalarType.parse(value);
   }
+  
+  /**
+   * creates a mutableHash for the given JSON value.
+   */
+  public MutableHash createMutableHash(String json) {
+    return scalarType.createMutableHash(json);
+  }
 
   /**
    * Read the value for this property from L2 cache entry and set it to the bean.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index de5d148b5..204b9aac5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -2,15 +2,13 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.bean.MutableJson;
+import io.ebean.bean.MutableHash;
 import io.ebean.core.type.DataReader;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
-import io.ebeaninternal.server.util.Md5;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
-import java.util.Objects;
 
 public class BeanPropertyJsonMapper extends BeanProperty {
 
@@ -26,11 +24,9 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
     // dirty detection based on md5 hash of json content
     final String json = scalarType.jsonMapper(value);
-    final MutableJson oldHash = ebi.mutableHash(propertyIndex);
+    final MutableHash oldHash = ebi.mutableHash(propertyIndex);
     if (oldHash == null || !oldHash.isEqualToJson(json)) {
       ebi.mutableContent(propertyIndex, json); // so we only convert to json once
-      //ebi.mutableHash(propertyIndex, scalarType.jsonMutable(json)); // for dirty detection next time
-      //must be done AFTER persistControllers are called. 
       return true;
     }
     return false;
@@ -44,8 +40,8 @@ public class BeanPropertyJsonMapper extends BeanProperty {
         setValue(bean, value);
         String json = reader.popJson();
         if (json != null) {
-          final String hash = scalarType.format(value);
-          bean._ebean_getIntercept().mutableHash(propertyIndex, scalarType.jsonMutable(hash));
+          final MutableHash hash = scalarType.createMutableHash(json);
+          bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
         }
       }
       return value;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
index 24cf050e3..e9de67a52 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
+import io.ebean.bean.MutableHash;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.util.Md5;
 
 import java.sql.SQLException;
 
@@ -30,9 +30,10 @@ class BindablePropertyJsonInsert extends BindableProperty {
       if (value == null) {
         request.bind(null, prop);
       } else {
-        // on insert store MD5 hash and push json
+        // on insert store hash and push json
         final String json = prop.format(value);
-        bean._ebean_getIntercept().mutableHash(propertyIndex, prop.getScalarType().jsonMutable(json));
+        final MutableHash hash = prop.createMutableHash(json);
+        bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
         request.pushJson(json);
         request.bind(value, prop);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
index 3418369f5..ab281cf01 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
+import io.ebean.bean.MutableHash;
 import io.ebeaninternal.server.deploy.BeanProperty;
 
 import java.sql.SQLException;
@@ -25,8 +26,10 @@ class BindablePropertyJsonUpdate extends BindableProperty {
     if (bean == null) {
       request.bind(null, prop);
     } else {
-      // on update push json
+      // on update store hash and push json
       final String json = bean._ebean_getIntercept().mutableContent(propertyIndex);
+      final MutableHash hash = prop.createMutableHash(json);
+      bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
       request.pushJson(json);
       final Object value = prop.getValue(bean);
       request.bind(value, prop);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
index 489046405..a1a9ec8cf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -46,12 +46,15 @@ public class DataBind implements DataBinder {
 
   @Override
   public void pushJson(String json) {
+    assert this.json == null; // we can only push one value
     this.json = json;
   }
 
   @Override
   public String popJson() {
-    return json;
+    String ret = json;
+    json = null;
+    return ret;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 5b44b63e4..0012c4cd6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 
-import io.ebean.bean.MutableJson;
+import io.ebean.bean.MutableHash;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
@@ -51,7 +51,59 @@ class ScalarTypeJsonObjectMapper {
     }
     return new GenericObject(jsonManager, field, dbType, type);
   }
+  
+  private static class Md5MutableHash implements MutableHash {
 
+    private final String md5;
+    
+    Md5MutableHash(String json) {
+      md5 = Md5.hash(json);
+    }
+    
+    @Override
+    public boolean isEqualToObject(Object obj) {
+      return true; // we cannot determine differences...
+    }
+
+    @Override
+    public boolean isEqualToJson(String json) {
+      return Md5.hash(json).equals(md5);
+    }
+
+    @Override
+    public Object get() {
+      return null; // cannot create object from json
+    }
+
+  }
+  
+  private static class JsonMutableHash implements MutableHash {
+
+    private final String originalJson;
+    private ScalarType<?> parent;
+    
+    JsonMutableHash(ScalarType<?> parent, String json) {
+      this.parent = parent;
+      originalJson = json;
+    }
+    
+    @Override
+    public boolean isEqualToObject(Object obj) {
+      return isEqualToJson(parent.format(obj));
+    }
+
+    @Override
+    public boolean isEqualToJson(String json) {
+      return Objects.equals(originalJson, json);
+    }
+
+    @Override
+    public Object get() {
+      return parent.parse(originalJson);
+    }
+
+  }
+  
   /**
    * Maps any type (Object) using Jackson ObjectMapper.
    */
@@ -71,63 +123,16 @@ class ScalarTypeJsonObjectMapper {
       return formatValue(value);
     }
     
-    private class Md5MutableJson implements MutableJson {
 
-      private String md5;
-      Md5MutableJson(String json) {
-        md5 = Md5.hash(json);
-      }
-      @Override
-      public boolean isEqualToObject(Object obj) {
-        return true; // we cannot determine differences...
-      }
 
-      @Override
-      public boolean isEqualToJson(String json) {
-        return Md5.hash(json).equals(md5);
-      }
 
-      @Override
-      public Object get() {
-        return null; // cannot create object from json
-      }
-      @Override
-      public void update(Object obj) {
-        md5 = Md5.hash(format(obj));
-      }
-    }
-
-    private class PlainMutableJson implements MutableJson {
-
-      private String originalJson;
-      PlainMutableJson(String json) {
-        originalJson = json;
-      }
-      @Override
-      public boolean isEqualToObject(Object obj) {
-        return isEqualToJson(format(obj));
-      }
-
-      @Override
-      public boolean isEqualToJson(String json) {
-        return Objects.equals(originalJson, json);
-      }
-
-      @Override
-      public Object get() {
-        return parse(originalJson);
-      }
-      @Override
-      public void update(Object obj) {
-        originalJson = format(obj);
-      }
-    }
+    
     @Override
-    public MutableJson jsonMutable(String originalJson) {
-      if (false) {
-        return new Md5MutableJson(originalJson);
+    public MutableHash createMutableHash(String json) {
+      if (false) { // TODO should we make that configurable?
+        return new Md5MutableHash(json);
       } else {
-        return new PlainMutableJson(originalJson);
+        return new JsonMutableHash(this, json);
       }
     }
 
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 4d31f8a56..8e399d3df 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -50,6 +50,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     EBasicJsonJackson3 bean = new EBasicJsonJackson3();
     bean.setName("b1");
     bean.setPlainValue(contentBean);
+    bean.setPlainValue2(contentBean);
 
     bean.save();
 
@@ -121,10 +122,11 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
       .containsExactlyInAnyOrder("beanList=null,[name:a]","name=p1-mod,p1","version=2,1");
     
     
-    found.getPlainBean().setName("b");
+    assertThat(DB.getBeanState(found).isDirty()).isFalse();
     
-    // CHECKME: How do we get these checks to work?
-    // assertThat(DB.getBeanState(found).isDirty()).isTrue();
+    found.getPlainBean().setName("b");
+
+    assertThat(DB.getBeanState(found).isDirty()).isTrue();
     
     state = DB.getBeanState(found);
     assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainBean");
@@ -145,4 +147,24 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
       .extracting(Map.Entry::toString)
       .containsExactlyInAnyOrder("plainBean=name:b,name:a", "version=3,2");
   }
+  
+  @Test
+  public void updateIncludesJsonColumn_when_list_loadedAndNotDirtyAware() {
+
+    PlainBean contentBean = new PlainBean("a", 42);
+    EBasicJsonList bean = new EBasicJsonList();
+    bean.setName("p1");
+    bean.setPlainBean(contentBean);
+    bean.setBeanList(Arrays.asList(contentBean));
+
+    DB.save(bean);
+    final EBasicJsonList found = DB.find(EBasicJsonList.class, bean.getId());
+    found.getBeanList().get(0).setName("p1-mod");
+
+    BeanState state = DB.getBeanState(found);
+    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList");
+    // this test fails, because we have a OmList instead of a GenericObject
+    // TODO: Can/Should we enhance the @DbJson/@DbJsonB annotations with a property "dirtyDetection" 
+  
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java
index 3d942d58b..45375b516 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java
@@ -18,6 +18,9 @@ public class EBasicJsonJackson3 extends Model {
   @DbJson(length = 500)
   PlainBeanDirtyAware plainValue;
 
+  @DbJson(length = 500)
+  PlainBeanDirtyAware plainValue2;
+  
   @Version
   long version;
 
@@ -45,6 +48,14 @@ public class EBasicJsonJackson3 extends Model {
     this.plainValue = plainValue;
   }
 
+  public PlainBeanDirtyAware getPlainValue2() {
+    return plainValue2;
+  }
+
+  public void setPlainValue2(PlainBeanDirtyAware plainValue2) {
+    this.plainValue2 = plainValue2;
+  }
+  
   public long getVersion() {
     return version;
   }

From eb70c7e19675c1fd68b23fdd9e5a24f40dd9a01d Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 28 Jul 2021 17:36:53 +0200
Subject: [PATCH 300/447] some javadoc and refactored getOrigValue

---
 .../java/io/ebean/bean/EntityBeanIntercept.java  |  9 ++++-----
 .../src/main/java/io/ebean/bean/MutableHash.java | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 37446a1b3..e686464e2 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -470,6 +470,10 @@ public final class EntityBeanIntercept implements Serializable {
    * Return the original value that was changed via an update.
    */
   public Object getOrigValue(int propertyIndex) {
+    if ((flags[propertyIndex] & (FLAG_ORIG_VALUE_SET | FLAG_MUTABLE_HASH_SET)) == FLAG_MUTABLE_HASH_SET) {
+      // mutable hash set, but not ORIG_VALUE
+      setOriginalValue(propertyIndex, mutableHash[propertyIndex].get());
+    }
     if (origValues == null) {
       return null;
     }
@@ -718,11 +722,6 @@ public final class EntityBeanIntercept implements Serializable {
         String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
         Object newVal = owner._ebean_getField(i);
         Object oldVal = getOrigValue(i);
-        if ((flags[i] & (FLAG_ORIG_VALUE_SET | FLAG_MUTABLE_HASH_SET)) == FLAG_MUTABLE_HASH_SET) {
-          // mutable hash set, but not ORIG_VALUE
-          oldVal = mutableHash[i].get();
-          setOriginalValue(i, oldVal);
-        }
         if (notEqual(oldVal, newVal)) {
           dirtyValues.put(propName, new ValuePair(newVal, oldVal));
         }
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableHash.java b/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
index 09c8761af..aa5ea29df 100644
--- a/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
@@ -1,14 +1,26 @@
 package io.ebean.bean;
 
-
+/**
+ * Interface to for mutable information in EntityBeanIntercept.
+ */
 public interface MutableHash {
   
+  /**
+   * Compares the given json to an internal value. Can be a MD5 hash or a plain JSON string. 
+   * @return true if the value matches the hash.
+   */
   boolean isEqualToJson(String json);
 
+  /**
+   * Compares the given object to an internal value. This is an optional method, but required for proper changelog/beanState support.
+   * The implementation can serialize the object and compare it against the original json.
+   */
   default boolean isEqualToObject(Object obj) {
     return true;
   }
-  
+  /**
+   * Creates a new instance from the internal json string. This is an optional method.
+   */
   default Object get() {
     return null;
   }

From d0270dbc6a388e1fd489810d9f3564c2678cf1d1 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 11:21:38 +1200
Subject: [PATCH 301/447] Temporarily disable TestDbJson_Jackson3
 updateIncludesJsonColumn_when_list_loadedAndNotDirtyAware()

    BeanState state = DB.getBeanState(found);
    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList");
    // this test fails, because we have a OmList instead of a GenericObject
    // TODO: Can/Should we enhance the @DbJson/@DbJsonB annotations with a property "dirtyDetection"
---
 .../org/tests/json/TestDbJson_Jackson3.java   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 8e399d3df..e8d8abdfd 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -29,13 +29,13 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     public boolean isRegisterFor(Class<?> cls) {
       return EBasicJsonList.class.isAssignableFrom(cls);
     }
-    
+
     @Override
     public boolean preInsert(BeanPersistRequest<?> request) {
       updatedValues = request.getUpdatedValues();
       return true;
     }
-    
+
     @Override
     public boolean preUpdate(BeanPersistRequest<?> request) {
       updatedValues = request.getUpdatedValues();
@@ -98,17 +98,17 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     BeanState state = DB.getBeanState(found);
     assertThat(state.getChangedProps()).containsExactlyInAnyOrder("name", "beanList");
-    
+
     ValuePair pair = state.getDirtyValues().get("name");
     assertThat(pair.getNewValue()).isEqualTo("p1-mod");
     assertThat(pair.getOldValue()).isEqualTo("p1");
-    
+
     pair = state.getDirtyValues().get("beanList");
     assertThat(pair.getNewValue()).isEqualTo(null);
     assertThat((List<PlainBean>)pair.getOldValue()).hasSize(1)
       .extracting(PlainBean::getName).containsExactly("a");
-    
-    
+
+
     LoggedSql.start();
     DB.save(found);
 
@@ -116,25 +116,25 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     assertThat(sql).hasSize(1);
     // plain_bean=?, no longer included with MD5 dirty detection
     assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
-    
+
     assertThat(EBasicJsonListPersistController.updatedValues.entrySet())
       .extracting(Map.Entry::toString)
       .containsExactlyInAnyOrder("beanList=null,[name:a]","name=p1-mod,p1","version=2,1");
-    
-    
+
+
     assertThat(DB.getBeanState(found).isDirty()).isFalse();
-    
+
     found.getPlainBean().setName("b");
 
     assertThat(DB.getBeanState(found).isDirty()).isTrue();
-    
+
     state = DB.getBeanState(found);
     assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainBean");
     pair = state.getDirtyValues().get("plainBean");
     assertThat(pair.getNewValue()).hasToString("name:b");
     assertThat(pair.getOldValue()).hasToString("name:a");
 
-    
+
     LoggedSql.start();
     DB.save(found);
 
@@ -147,7 +147,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
       .extracting(Map.Entry::toString)
       .containsExactlyInAnyOrder("plainBean=name:b,name:a", "version=3,2");
   }
-  
+
   @Test
   public void updateIncludesJsonColumn_when_list_loadedAndNotDirtyAware() {
 
@@ -161,10 +161,10 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     final EBasicJsonList found = DB.find(EBasicJsonList.class, bean.getId());
     found.getBeanList().get(0).setName("p1-mod");
 
-    BeanState state = DB.getBeanState(found);
-    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList");
+//    BeanState state = DB.getBeanState(found);
+//    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList");
     // this test fails, because we have a OmList instead of a GenericObject
-    // TODO: Can/Should we enhance the @DbJson/@DbJsonB annotations with a property "dirtyDetection" 
-  
+    // TODO: Can/Should we enhance the @DbJson/@DbJsonB annotations with a property "dirtyDetection"
+
   }
 }

From 94fb6414fa0bfa2eea88ae306c918914e4fd784f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 11:28:25 +1200
Subject: [PATCH 302/447] Refactor move createMutableHash() method from
 ScalarType to BeanProperty / BeanPropertyJsonMapper

---
 .../java/io/ebean/core/type/ScalarType.java   |  4 --
 .../server/deploy/BeanProperty.java           |  4 +-
 .../server/deploy/BeanPropertyJsonMapper.java | 66 ++++++++++++++++++-
 .../type/ScalarTypeJsonObjectMapper.java      | 65 ------------------
 4 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 55c8ad9bd..67fc940d7 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -44,10 +44,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
     throw new UnsupportedOperationException();
   }
 
-  default MutableHash createMutableHash(String json) {
-    throw new UnsupportedOperationException();
-  }
-
   /**
    * Return true if this is a binary type and can not support parse() and format() from/to string.
    * This allows Ebean to optimise marshalling types to string.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 99ef307a7..dfcea8094 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -819,12 +819,12 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   public Object parse(String value) {
     return scalarType.parse(value);
   }
-  
+
   /**
    * creates a mutableHash for the given JSON value.
    */
   public MutableHash createMutableHash(String json) {
-    return scalarType.createMutableHash(json);
+    throw new UnsupportedOperationException();
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index 204b9aac5..38c9ebb9f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -4,11 +4,14 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.MutableHash;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+import io.ebeaninternal.server.util.Md5;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
+import java.util.Objects;
 
 public class BeanPropertyJsonMapper extends BeanProperty {
 
@@ -16,6 +19,15 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     super(desc, deployProp);
   }
 
+  @Override
+  public MutableHash createMutableHash(String json) {
+    if (false) { // TODO should we make that configurable?
+      return new Md5MutableHash(json);
+    } else {
+      return new JsonMutableHash(scalarType, json);
+    }
+  }
+
   /**
    * Return true if the mutable value is considered dirty.
    * This is only used for 'mutable' scalar types like hstore etc.
@@ -40,7 +52,7 @@ public class BeanPropertyJsonMapper extends BeanProperty {
         setValue(bean, value);
         String json = reader.popJson();
         if (json != null) {
-          final MutableHash hash = scalarType.createMutableHash(json);
+          final MutableHash hash = createMutableHash(json);
           bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
         }
       }
@@ -51,4 +63,56 @@ public class BeanPropertyJsonMapper extends BeanProperty {
       throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
     }
   }
+
+  private static class Md5MutableHash implements MutableHash {
+
+    private final String md5;
+
+    Md5MutableHash(String json) {
+      md5 = Md5.hash(json);
+    }
+
+    @Override
+    public boolean isEqualToObject(Object obj) {
+      return true; // we cannot determine differences...
+    }
+
+    @Override
+    public boolean isEqualToJson(String json) {
+      return Md5.hash(json).equals(md5);
+    }
+
+    @Override
+    public Object get() {
+      return null; // cannot create object from json
+    }
+
+  }
+
+  private static class JsonMutableHash implements MutableHash {
+
+    private final String originalJson;
+    private ScalarType<?> parent;
+
+    JsonMutableHash(ScalarType<?> parent, String json) {
+      this.parent = parent;
+      originalJson = json;
+    }
+
+    @Override
+    public boolean isEqualToObject(Object obj) {
+      return isEqualToJson(parent.format(obj));
+    }
+
+    @Override
+    public boolean isEqualToJson(String json) {
+      return Objects.equals(originalJson, json);
+    }
+
+    @Override
+    public Object get() {
+      return parent.parse(originalJson);
+    }
+
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 0012c4cd6..e14b1aca9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -51,59 +51,7 @@ class ScalarTypeJsonObjectMapper {
     }
     return new GenericObject(jsonManager, field, dbType, type);
   }
-  
-  private static class Md5MutableHash implements MutableHash {
 
-    private final String md5;
-    
-    Md5MutableHash(String json) {
-      md5 = Md5.hash(json);
-    }
-    
-    @Override
-    public boolean isEqualToObject(Object obj) {
-      return true; // we cannot determine differences...
-    }
-
-    @Override
-    public boolean isEqualToJson(String json) {
-      return Md5.hash(json).equals(md5);
-    }
-
-    @Override
-    public Object get() {
-      return null; // cannot create object from json
-    }
-
-  }
-  
-  private static class JsonMutableHash implements MutableHash {
-
-    private final String originalJson;
-    private ScalarType<?> parent;
-    
-    JsonMutableHash(ScalarType<?> parent, String json) {
-      this.parent = parent;
-      originalJson = json;
-    }
-    
-    @Override
-    public boolean isEqualToObject(Object obj) {
-      return isEqualToJson(parent.format(obj));
-    }
-
-    @Override
-    public boolean isEqualToJson(String json) {
-      return Objects.equals(originalJson, json);
-    }
-
-    @Override
-    public Object get() {
-      return parent.parse(originalJson);
-    }
-
-  }
-  
   /**
    * Maps any type (Object) using Jackson ObjectMapper.
    */
@@ -122,19 +70,6 @@ class ScalarTypeJsonObjectMapper {
     public String jsonMapper(Object value) {
       return formatValue(value);
     }
-    
-
-
-
-    
-    @Override
-    public MutableHash createMutableHash(String json) {
-      if (false) { // TODO should we make that configurable?
-        return new Md5MutableHash(json);
-      } else {
-        return new JsonMutableHash(this, json);
-      }
-    }
 
     @Override
     public Object read(DataReader reader) throws SQLException {

From 52fe3cf3c87edb220831232bfd3325690920ec30 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 11:40:05 +1200
Subject: [PATCH 303/447] Change from MD5 to Checksum (Adler32) for json
 content dirty detection

---
 .../server/deploy/BeanPropertyJsonMapper.java | 12 +++++++----
 .../ebeaninternal/server/util/Checksum.java   | 20 +++++++++++++++++++
 .../io/ebeaninternal/server/util/Md5.java     |  1 -
 .../server/util/ChecksumTest.java             | 18 +++++++++++++++++
 4 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index 38c9ebb9f..747df5130 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -7,7 +7,7 @@ import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
-import io.ebeaninternal.server.util.Md5;
+import io.ebeaninternal.server.util.Checksum;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
@@ -66,10 +66,14 @@ public class BeanPropertyJsonMapper extends BeanProperty {
 
   private static class Md5MutableHash implements MutableHash {
 
-    private final String md5;
+    private final String hash;
 
     Md5MutableHash(String json) {
-      md5 = Md5.hash(json);
+      this.hash = hash(json);
+    }
+
+    private String hash(String json) {
+      return String.valueOf(Checksum.checksum(json));
     }
 
     @Override
@@ -79,7 +83,7 @@ public class BeanPropertyJsonMapper extends BeanProperty {
 
     @Override
     public boolean isEqualToJson(String json) {
-      return Md5.hash(json).equals(md5);
+      return hash(json).equals(hash);
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java
new file mode 100644
index 000000000..87ee6e7e8
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java
@@ -0,0 +1,20 @@
+package io.ebeaninternal.server.util;
+
+import java.nio.charset.StandardCharsets;
+import java.util.zip.Adler32;
+
+/**
+ * Compute a checksum for String content. Use when we desire cheaper option than MD5.
+ */
+public final class Checksum {
+
+  /**
+   * Return the checksum for the given String input.
+   */
+  public static long checksum(String input) {
+    Adler32 adler32 = new Adler32();
+    final byte[] bytes = input.getBytes(StandardCharsets.UTF_8);
+    adler32.update(bytes, 0, bytes.length);
+    return adler32.getValue();
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
index 1c848f55d..7329d3f25 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
@@ -21,7 +21,6 @@ public final class Md5 {
    * Convert the digest into a hex value.
    */
   private static String digestToHex(byte[] digest) {
-
     StringBuilder sb = new StringBuilder();
     for (byte aDigest : digest) {
       sb.append(Integer.toString((aDigest & 0xff) + 0x100, 16).substring(1));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java
new file mode 100644
index 000000000..58342df80
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java
@@ -0,0 +1,18 @@
+package io.ebeaninternal.server.util;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ChecksumTest {
+
+  @Test
+  public void checksum() {
+
+    final long val = Checksum.checksum("Hello world");
+    assertThat(val).isEqualTo(413860925L);
+
+    assertThat(Checksum.checksum("Hello world")).isEqualTo(val);
+    assertThat(Checksum.checksum("hello world")).isNotEqualTo(val);
+  }
+}

From 92d7a7562f30e85bc2956524fba17d51b6414f0a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 11:49:01 +1200
Subject: [PATCH 304/447] Tidy only - no functional change to MutableHash and
 BeanPropertyJsonMapper

---
 .../main/java/io/ebean/bean/MutableHash.java    | 17 +++++++++--------
 .../server/deploy/BeanPropertyJsonMapper.java   |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableHash.java b/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
index aa5ea29df..d59421980 100644
--- a/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
@@ -4,25 +4,26 @@ package io.ebean.bean;
  * Interface to for mutable information in EntityBeanIntercept.
  */
 public interface MutableHash {
-  
+
   /**
-   * Compares the given json to an internal value. Can be a MD5 hash or a plain JSON string. 
+   * Compares the given json to an internal value. Can be a MD5 hash or a plain JSON string.
+   *
    * @return true if the value matches the hash.
    */
   boolean isEqualToJson(String json);
 
   /**
-   * Compares the given object to an internal value. This is an optional method, but required for proper changelog/beanState support.
+   * Compares the given object to an internal value. Required for proper changelog/beanState support.
    * The implementation can serialize the object and compare it against the original json.
    */
-  default boolean isEqualToObject(Object obj) {
-    return true;
-  }
+  boolean isEqualToObject(Object obj);
+
   /**
-   * Creates a new instance from the internal json string. This is an optional method.
+   * Creates a new instance from the internal json string.
+   * <p>
+   * This is used to provide an original/old value for change logging / persist listeners.
    */
   default Object get() {
     return null;
   }
 }
- 
\ No newline at end of file
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index 747df5130..b1838ff18 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -96,11 +96,11 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   private static class JsonMutableHash implements MutableHash {
 
     private final String originalJson;
-    private ScalarType<?> parent;
+    private final ScalarType<?> parent;
 
     JsonMutableHash(ScalarType<?> parent, String json) {
       this.parent = parent;
-      originalJson = json;
+      this.originalJson = json;
     }
 
     @Override

From 86483ff947b63c23f5984eef77a74f8fc7bd943e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 11:52:15 +1200
Subject: [PATCH 305/447] Use scalarType.format(value) removing
 scalarType.jsonMapper(value)

Remove scalarType.jsonMapper(value) as we can just use format(value) instead
---
 .../src/main/java/io/ebean/core/type/ScalarType.java         | 4 ----
 .../ebeaninternal/server/deploy/BeanPropertyJsonMapper.java  | 2 +-
 .../server/type/ScalarTypeJsonObjectMapper.java              | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 67fc940d7..6388648c3 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -40,10 +40,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
     return false;
   }
 
-  default String jsonMapper(Object value) {
-    throw new UnsupportedOperationException();
-  }
-
   /**
    * Return true if this is a binary type and can not support parse() and format() from/to string.
    * This allows Ebean to optimise marshalling types to string.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index b1838ff18..40c90d853 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -35,7 +35,7 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   @Override
   boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
     // dirty detection based on md5 hash of json content
-    final String json = scalarType.jsonMapper(value);
+    final String json = scalarType.format(value);
     final MutableHash oldHash = ebi.mutableHash(propertyIndex);
     if (oldHash == null || !oldHash.isEqualToJson(json)) {
       ebi.mutableContent(propertyIndex, json); // so we only convert to json once
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index e14b1aca9..2c3be2fa3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -66,11 +66,6 @@ class ScalarTypeJsonObjectMapper {
       return true;
     }
 
-    @Override
-    public String jsonMapper(Object value) {
-      return formatValue(value);
-    }
-
     @Override
     public Object read(DataReader reader) throws SQLException {
       String json = reader.getString();

From 8832bbc57f82dceefb200250452e195fa3964fe1 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 12:43:37 +1200
Subject: [PATCH 306/447] No effective change - format EntityBeanIntercept only

Plus adjust timing on SqlQueryCancelTest
---
 .../io/ebean/bean/EntityBeanIntercept.java    | 12 +++----
 .../query/cancel/SqlQueryCancelTest.java      | 34 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index e686464e2..a090bfe43 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -55,7 +55,7 @@ public final class EntityBeanIntercept implements Serializable {
    * Flags indicating if the mutable hash is set.
    */
   private static final byte FLAG_MUTABLE_HASH_SET = 16;
-  
+
   private transient final ReentrantLock lock = new ReentrantLock();
   private transient NodeUsageCollector nodeUsageCollector;
   private transient PersistenceContext persistenceContext;
@@ -677,7 +677,7 @@ public final class EntityBeanIntercept implements Serializable {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, getProperty(i) + ".");
-      } 
+      }
     }
   }
 
@@ -716,7 +716,6 @@ 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 (isChangedProp(i)) {
         // the property has been changed on this bean
         String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
@@ -1175,17 +1174,16 @@ public final class EntityBeanIntercept implements Serializable {
   private boolean isChangedProp(int i) {
     if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
       return true;
-    } else if (mutableHash == null || mutableHash[i] == null
-        || mutableHash[i].isEqualToObject(owner._ebean_getField(i))) {
+    } else if (mutableHash == null || mutableHash[i] == null || mutableHash[i].isEqualToObject(owner._ebean_getField(i))) {
       return false;
     } else {
-      // mark for change 
+      // mark for change
       flags[i] |= FLAG_CHANGED_PROP;
       dirty = true; // this makes the bean automatically dirty!
       return true;
     }
   }
-  
+
   public MutableHash mutableHash(int propertyIndex) {
     return mutableHash == null ? null : mutableHash[propertyIndex];
   }
diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
index d3dda7443..9fc3d6b57 100644
--- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
+++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
@@ -30,18 +30,18 @@ import io.ebean.annotation.Platform;
  * Tests, if all kind of queries are cancelable. There are two ways how to
  * cancel a query: <br/>
  * <b>At begin:</b>
- * 
+ *
  * <pre>
  * query = DB.find(...)
  * query.cancel();
  * query.findList();
  * </pre>
- * 
+ *
  * The query was caneled before executing. In this case we do hit the DB driver
  * <br/>
  * <br/>
  * <b>During run:</b>
- * 
+ *
  * <pre>
  * // Thread 1:              Thread 2
  * query = DB.find(...)
@@ -50,26 +50,26 @@ import io.ebean.annotation.Platform;
  *     ...finding            query.cancel();
  *      ...JDBC-Exception
  * </pre>
- * 
+ *
  * The test tries to simulate a slow query by installing the
  * {@link SlowDownEBasic} 'SELECT' trigger. The trigger can be configured to
  * wait 3 * <code>timing</code> ms and a second thread will cancel the query in
  * <code>timing</code> ms.
- * 
+ *
  * in this case, we expect a JDBC exception from the driver. <br/>
  * <br/>
  * NOTE:<br/>
  * H2 checks the cancel flag in org.h2.command.Prepared::setCurrentRowNumber
  * only every 128th row. So we need at least 128 models and we cannot check
  * queries like findCount or findOne, because they only return one row.
- * 
+ *
  * @author Roland Praml, FOCONIS AG
  *
  */
 public class SqlQueryCancelTest extends BaseTestCase {
 
-  private int timing = 10;
-  
+  private final int timing = 20;
+
   @BeforeClass
   public static void setupTestData() throws SQLException {
     for (int i = 0; i < 128; i++) {
@@ -98,10 +98,10 @@ public class SqlQueryCancelTest extends BaseTestCase {
     doCancelSqlDuringRun(q -> q.findEachWhile(e -> true));
   }
 
-  
+
   @Test
   public void cancelOrmQueryAtBegin() throws SQLException {
-    doCancelOrmAtBegin(Query::findCount); 
+    doCancelOrmAtBegin(Query::findCount);
     doCancelOrmAtBegin(Query::findFutureCount);
     // We cannot test 'findCount' due H2 restrictions
     doCancelOrmAtBegin(Query::findFutureIds);
@@ -206,7 +206,7 @@ public class SqlQueryCancelTest extends BaseTestCase {
       .isInstanceOf(PersistenceException.class)
       .hasMessageContaining("Query was cancelled");
   }
-  
+
   @Test
   public void cancelSqlDtoQueryAtBegin() throws SQLException {
 
@@ -290,7 +290,7 @@ public class SqlQueryCancelTest extends BaseTestCase {
   private void doCancelOrmFutureDuringRun(Function<Query<EBasic>, Future<?>> test) throws SQLException, InterruptedException, ExecutionException {
     Query<EBasic> warmup = DB.find(EBasic.class);
     test.apply(warmup).get();
-    
+
     Query<EBasic> query = DB.find(EBasic.class);
     executeDelayed(query::cancel);
     assertThatThrownBy(() -> {
@@ -311,18 +311,18 @@ public class SqlQueryCancelTest extends BaseTestCase {
         .isInstanceOf(PersistenceException.class)
         .hasMessageContaining("Query was cancelled");
   }
-  
+
   private void doCancelOrmDtoDuringRun(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
     DtoQuery<EBasicDto> warmup = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
     test.accept(warmup);
-    
+
     DtoQuery<EBasicDto> query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
     executeDelayed(query::cancel);
     assertThatThrownBy(() -> test.accept(query))
         .isInstanceOf(PersistenceException.class)
         .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
   }
-  
+
   private void doCancelSqlDtoAtBegin(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
     DtoQuery<EBasicDto> query = DB.findDto(EBasicDto.class, "select id, status from e_basic");
     query.cancel();
@@ -334,14 +334,14 @@ public class SqlQueryCancelTest extends BaseTestCase {
   private void doCancelSqlDtoDuringRun(Consumer<DtoQuery<EBasicDto>> test) throws SQLException {
     DtoQuery<EBasicDto> warmup = DB.findDto(EBasicDto.class, "select id, status from e_basic");
     test.accept(warmup);
-    
+
     DtoQuery<EBasicDto> query = DB.findDto(EBasicDto.class, "select id, status from e_basic");
     executeDelayed(query::cancel);
     assertThatThrownBy(() -> test.accept(query))
         .isInstanceOf(PersistenceException.class)
         .hasCauseInstanceOf(org.h2.jdbc.JdbcSQLTimeoutException.class);
   }
-  
+
   private void executeDelayed(Runnable r) throws SQLException {
     // We modify the DB here. Otherwise we may hit an internal H2 cache, if the
     // same query is performed. Queries from the cache cannot be canceled.

From 5ad8e7ead46706a35d6d79207f8f283d7f46825e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 12:47:10 +1200
Subject: [PATCH 307/447] Use new @DbJson dirtyDetection and keepSource
 attributes

- Bump ebean-annotation with new @DbJson dirtyDetection and keepSource attributes
- Get those to BeanPropertyJsonMapper to chose MutableHash implementation
- Modify MD5MutableHash to include check for isDirty()
- EBasicJsonList needs keepSource=true to pass that test with oldValue
---
 ebean-api/pom.xml                             |  2 +-
 .../server/deploy/BeanPropertyJsonMapper.java | 36 ++++++++++++++++---
 .../deploy/meta/DeployBeanProperty.java       | 21 +++++++++++
 .../server/deploy/parse/DeployUtil.java       |  9 +++--
 .../type/ScalarTypeJsonObjectMapper.java      |  4 ---
 .../org/tests/model/json/EBasicJsonList.java  |  2 +-
 6 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index d3868ff91..649f85822 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>7.0</version>
+      <version>7.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index 40c90d853..c7fba7b8b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -15,16 +15,24 @@ import java.util.Objects;
 
 public class BeanPropertyJsonMapper extends BeanProperty {
 
+  private static final NoDirtyDetection NO_DIRTY_DETECTION = new NoDirtyDetection();
+  private final boolean dirtyDetection;
+  private final boolean keepSource;
+
   public BeanPropertyJsonMapper(BeanDescriptor<?> desc, DeployBeanProperty deployProp) {
     super(desc, deployProp);
+    this.dirtyDetection = deployProp.isDirtyDetection();
+    this.keepSource = deployProp.isKeepSource();
   }
 
   @Override
   public MutableHash createMutableHash(String json) {
-    if (false) { // TODO should we make that configurable?
-      return new Md5MutableHash(json);
-    } else {
+    if (keepSource) {
       return new JsonMutableHash(scalarType, json);
+    } else if (dirtyDetection) {
+      return new Md5MutableHash(scalarType, json);
+    } else {
+      return NO_DIRTY_DETECTION;
     }
   }
 
@@ -67,8 +75,10 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   private static class Md5MutableHash implements MutableHash {
 
     private final String hash;
+    private final ScalarType<?> parent;
 
-    Md5MutableHash(String json) {
+    Md5MutableHash(ScalarType<?> parent, String json) {
+      this.parent = parent;
       this.hash = hash(json);
     }
 
@@ -78,7 +88,7 @@ public class BeanPropertyJsonMapper extends BeanProperty {
 
     @Override
     public boolean isEqualToObject(Object obj) {
-      return true; // we cannot determine differences...
+      return isEqualToJson(parent.format(obj));
     }
 
     @Override
@@ -119,4 +129,20 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     }
 
   }
+
+  /**
+   * No dirty detection on JSON content.
+   */
+  private static class NoDirtyDetection implements MutableHash {
+
+    @Override
+    public boolean isEqualToJson(String json) {
+      return true;
+    }
+
+    @Override
+    public boolean isEqualToObject(Object obj) {
+      return true;
+    }
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 92ad7f1e9..060ce802f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -109,6 +109,8 @@ public class DeployBeanProperty {
 
   private boolean jsonSerialize = true;
   private boolean jsonDeserialize = true;
+  private boolean dirtyDetection;
+  private boolean keepSource;
 
   private boolean dbEncrypted;
   private DbEncryptFunction dbEncryptFunction;
@@ -327,6 +329,20 @@ public class DeployBeanProperty {
     this.jsonDeserialize = jsonDeserialize;
   }
 
+  /**
+   * Return true if we should have JSON dirty detection on this property.
+   */
+  public boolean isDirtyDetection() {
+    return dirtyDetection;
+  }
+
+  /**
+   * Return true if we should store source JSON content on this property.
+   */
+  public boolean isKeepSource() {
+    return keepSource;
+  }
+
   /**
    * Return the sortOrder for the properties.
    */
@@ -1204,4 +1220,9 @@ public class DeployBeanProperty {
   boolean isJsonMapper() {
     return scalarType != null && scalarType.isJsonMapper();
   }
+
+  public void setJsonOptions(boolean dirtyDetection, boolean keepSource) {
+    this.dirtyDetection = dirtyDetection;
+    this.keepSource = keepSource;
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 65c7cf45e..2245b0c4c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -213,23 +213,22 @@ public class DeployUtil {
    * This property is marked as a Lob object.
    */
   void setDbJsonType(DeployBeanProperty prop, DbJson dbJsonType) {
-
     int dbType = getDbJsonStorage(dbJsonType.storage());
-    setDbJsonType(prop, dbType, dbJsonType.length());
+    setDbJsonType(prop, dbType, dbJsonType.length(), dbJsonType.dirtyDetection(), dbJsonType.keepSource());
   }
 
   void setDbJsonBType(DeployBeanProperty prop, DbJsonB dbJsonB) {
-    setDbJsonType(prop, DbPlatformType.JSONB, dbJsonB.length());
+    setDbJsonType(prop, DbPlatformType.JSONB, dbJsonB.length(), dbJsonB.dirtyDetection(), dbJsonB.keepSource());
   }
 
-  private void setDbJsonType(DeployBeanProperty prop, int dbType, int dbLength) {
-
+  private void setDbJsonType(DeployBeanProperty prop, int dbType, int dbLength, boolean dirtyDetection, boolean keepSource) {
     ScalarType<?> scalarType = typeManager.getJsonScalarType(prop, dbType, dbLength);
     if (scalarType == null) {
       throw new RuntimeException("No ScalarType for JSON property [" + prop + "] [" + dbType + "]");
     }
     prop.setDbType(dbType);
     prop.setScalarType(scalarType);
+    prop.setJsonOptions(dirtyDetection, keepSource);
     if (dbType == Types.VARCHAR || dbLength > 0) {
       // determine the db column size
       int columnLength = (dbLength > 0) ? dbLength : DEFAULT_JSON_VARCHAR_LENGTH;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 2c3be2fa3..14425c6c9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -7,8 +7,6 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
-
-import io.ebean.bean.MutableHash;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
@@ -17,7 +15,6 @@ import io.ebean.text.TextException;
 import io.ebeaninternal.json.ModifyAwareList;
 import io.ebeaninternal.json.ModifyAwareMap;
 import io.ebeaninternal.json.ModifyAwareSet;
-import io.ebeaninternal.server.util.Md5;
 
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
@@ -27,7 +24,6 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 /**
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
index 22b32e3e1..05d9807b5 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
@@ -31,7 +31,7 @@ public class EBasicJsonList {
   @DbJson(length = 700)
   Map<String, PlainBean> beanMap = new LinkedHashMap<>();
 
-  @DbJson(length = 500)
+  @DbJson(length = 500, keepSource = true) // such that we can rebuild old values
   PlainBean plainBean;
 
   @DbJson(length = 50)

From 2bc5d3d325166ef17b3e22fce8e6798c9810e128 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 13:20:30 +1200
Subject: [PATCH 308/447] Refactor rename MutableHash to MutableValueInfo (and
 subsequent rename on methods etc)

---
 .../io/ebean/bean/EntityBeanIntercept.java    | 42 ++++++++++-----
 .../main/java/io/ebean/bean/MutableHash.java  | 29 ----------
 .../java/io/ebean/bean/MutableValueInfo.java  | 39 ++++++++++++++
 .../java/io/ebean/core/type/ScalarType.java   |  1 -
 .../server/deploy/BeanProperty.java           |  4 +-
 .../server/deploy/BeanPropertyJsonMapper.java | 54 +++++++++++--------
 .../dmlbind/BindablePropertyJsonInsert.java   |  6 +--
 .../dmlbind/BindablePropertyJsonUpdate.java   |  6 +--
 8 files changed, 107 insertions(+), 74 deletions(-)
 delete mode 100644 ebean-api/src/main/java/io/ebean/bean/MutableHash.java
 create mode 100644 ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index a090bfe43..99e9334c1 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -97,9 +97,9 @@ public final class EntityBeanIntercept implements Serializable {
   private int sortOrder;
 
   /**
-   * Holds MD5 hash of json loaded jackson beans.
+   * Holds information of json loaded jackson beans (e.g. the original json or checksum).
    */
-  private MutableHash[] mutableHash;
+  private MutableValueInfo[] mutableInfo;
 
   /**
    * Holds json content determined at point of dirty check.
@@ -247,9 +247,9 @@ public final class EntityBeanIntercept implements Serializable {
     if (dirty) {
       return true;
     }
-    if (mutableHash != null) {
-      for (int i = 0; i < mutableHash.length; i++) {
-        if (mutableHash[i] != null && !mutableHash[i].isEqualToObject(owner._ebean_getField(i))) {
+    if (mutableInfo != null) {
+      for (int i = 0; i < mutableInfo.length; i++) {
+        if (mutableInfo[i] != null && !mutableInfo[i].isEqualToObject(owner._ebean_getField(i))) {
           dirty = true;
           break;
         }
@@ -472,7 +472,7 @@ public final class EntityBeanIntercept implements Serializable {
   public Object getOrigValue(int propertyIndex) {
     if ((flags[propertyIndex] & (FLAG_ORIG_VALUE_SET | FLAG_MUTABLE_HASH_SET)) == FLAG_MUTABLE_HASH_SET) {
       // mutable hash set, but not ORIG_VALUE
-      setOriginalValue(propertyIndex, mutableHash[propertyIndex].get());
+      setOriginalValue(propertyIndex, mutableInfo[propertyIndex].get());
     }
     if (origValues == null) {
       return null;
@@ -1174,7 +1174,7 @@ public final class EntityBeanIntercept implements Serializable {
   private boolean isChangedProp(int i) {
     if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
       return true;
-    } else if (mutableHash == null || mutableHash[i] == null || mutableHash[i].isEqualToObject(owner._ebean_getField(i))) {
+    } else if (mutableInfo == null || mutableInfo[i] == null || mutableInfo[i].isEqualToObject(owner._ebean_getField(i))) {
       return false;
     } else {
       // mark for change
@@ -1184,22 +1184,38 @@ public final class EntityBeanIntercept implements Serializable {
     }
   }
 
-  public MutableHash mutableHash(int propertyIndex) {
-    return mutableHash == null ? null : mutableHash[propertyIndex];
+  /**
+   * Return the MutableValueInfo for the given property or null.
+   */
+  public MutableValueInfo mutableInfo(int propertyIndex) {
+    return mutableInfo == null ? null : mutableInfo[propertyIndex];
   }
 
-  public void mutableHash(int propertyIndex, MutableHash content) {
-    if (mutableHash == null) {
-      mutableHash = new MutableHash[flags.length];
+  /**
+   * Set the MutableValueInfo for the given property.
+   */
+  public void mutableInfo(int propertyIndex, MutableValueInfo info) {
+    if (mutableInfo == null) {
+      mutableInfo = new MutableValueInfo[flags.length];
     }
     flags[propertyIndex] |= FLAG_MUTABLE_HASH_SET;
-    mutableHash[propertyIndex] = content;
+    mutableInfo[propertyIndex] = info;
   }
 
+  /**
+   * Return the [json] content of a mutable value.
+   */
   public String mutableContent(int propertyIndex) {
     return mutableContent == null ? null : mutableContent[propertyIndex];
   }
 
+  /**
+   * Set the [json] content of a mutable property.
+   * <p>
+   * Set here as the mutable property dirty detection is based on json content comparison.
+   * We only want to perform the json serialisation once so storing it here as part of
+   * dirty detection so that we can get it back to bind in insert or update etc.
+   */
   public void mutableContent(int propertyIndex, String content) {
     if (mutableContent == null) {
       mutableContent = new String[flags.length];
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableHash.java b/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
deleted file mode 100644
index d59421980..000000000
--- a/ebean-api/src/main/java/io/ebean/bean/MutableHash.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.ebean.bean;
-
-/**
- * Interface to for mutable information in EntityBeanIntercept.
- */
-public interface MutableHash {
-
-  /**
-   * Compares the given json to an internal value. Can be a MD5 hash or a plain JSON string.
-   *
-   * @return true if the value matches the hash.
-   */
-  boolean isEqualToJson(String json);
-
-  /**
-   * Compares the given object to an internal value. Required for proper changelog/beanState support.
-   * The implementation can serialize the object and compare it against the original json.
-   */
-  boolean isEqualToObject(Object obj);
-
-  /**
-   * Creates a new instance from the internal json string.
-   * <p>
-   * This is used to provide an original/old value for change logging / persist listeners.
-   */
-  default Object get() {
-    return null;
-  }
-}
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java b/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
new file mode 100644
index 000000000..de8cbee6d
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
@@ -0,0 +1,39 @@
+package io.ebean.bean;
+
+/**
+ * Holds information on mutable values (like plain beans stored as json).
+ * <p>
+ * Used internally in EntityBeanIntercept for dirty detection on mutable values.
+ * Typically dirty detection is based on a hash/checksum of json content or the
+ * original json content itself.
+ * <p>
+ * Refer to the mapping options {@code @DbJson(dirtyDetection)} and {@code @DbJson(keepSource)}.
+ */
+public interface MutableValueInfo {
+
+  /**
+   * Compares the given json to an internal value. Can be a hash/checksum comparison
+   * or a plain JSON string comparison (based on {@code @DbJson(keepSource)}).
+   *
+   * @return true if the value is considered unchanged (when comparing in json form).
+   */
+  boolean isEqualToJson(String json);
+
+  /**
+   * Compares the given object to an internal value.
+   * <p>
+   * This is used to support changelog/beanState. The implementation can serialize the
+   * object into json form and compare it against the original json.
+   */
+  boolean isEqualToObject(Object obj);
+
+  /**
+   * Creates a new instance from the internal json string.
+   * <p>
+   * This is used to provide an original/old value for change logging / persist listeners.
+   * This is only available for properties that have {@code @DbJson(keepSource=true)}.
+   */
+  default Object get() {
+    return null;
+  }
+}
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 6388648c3..6c01811c5 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -3,7 +3,6 @@ package io.ebean.core.type;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
-import io.ebean.bean.MutableHash;
 import io.ebean.text.StringFormatter;
 import io.ebean.text.StringParser;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index dfcea8094..fc5a8364f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.bean.MutableHash;
+import io.ebean.bean.MutableValueInfo;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.dbplatform.DbEncryptFunction;
@@ -823,7 +823,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * creates a mutableHash for the given JSON value.
    */
-  public MutableHash createMutableHash(String json) {
+  public MutableValueInfo createMutableInfo(String json) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index c7fba7b8b..fca7b790b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.bean.MutableHash;
+import io.ebean.bean.MutableValueInfo;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
@@ -26,11 +26,11 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   }
 
   @Override
-  public MutableHash createMutableHash(String json) {
+  public MutableValueInfo createMutableInfo(String json) {
     if (keepSource) {
-      return new JsonMutableHash(scalarType, json);
+      return new SourceMutableValue(scalarType, json);
     } else if (dirtyDetection) {
-      return new Md5MutableHash(scalarType, json);
+      return new ChecksumMutableValue(scalarType, json);
     } else {
       return NO_DIRTY_DETECTION;
     }
@@ -42,9 +42,9 @@ public class BeanPropertyJsonMapper extends BeanProperty {
    */
   @Override
   boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
-    // dirty detection based on md5 hash of json content
+    // dirty detection based on json content or checksum of json content
     final String json = scalarType.format(value);
-    final MutableHash oldHash = ebi.mutableHash(propertyIndex);
+    final MutableValueInfo oldHash = ebi.mutableInfo(propertyIndex);
     if (oldHash == null || !oldHash.isEqualToJson(json)) {
       ebi.mutableContent(propertyIndex, json); // so we only convert to json once
       return true;
@@ -60,8 +60,8 @@ public class BeanPropertyJsonMapper extends BeanProperty {
         setValue(bean, value);
         String json = reader.popJson();
         if (json != null) {
-          final MutableHash hash = createMutableHash(json);
-          bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+          final MutableValueInfo hash = createMutableInfo(json);
+          bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
         }
       }
       return value;
@@ -72,18 +72,24 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     }
   }
 
-  private static class Md5MutableHash implements MutableHash {
+  /**
+   * Hold checksum of json source content.
+   * <p>
+   * Dirty detection based on checksum difference on json form.
+   * Does not support rebuilding 'oldValue' as no original json content.
+   */
+  private static class ChecksumMutableValue implements MutableValueInfo {
 
-    private final String hash;
     private final ScalarType<?> parent;
+    private final long checksum;
 
-    Md5MutableHash(ScalarType<?> parent, String json) {
+    ChecksumMutableValue(ScalarType<?> parent, String json) {
       this.parent = parent;
-      this.hash = hash(json);
+      this.checksum = checksum(json);
     }
 
-    private String hash(String json) {
-      return String.valueOf(Checksum.checksum(json));
+    private long checksum(String json) {
+      return Checksum.checksum(json);
     }
 
     @Override
@@ -93,22 +99,24 @@ public class BeanPropertyJsonMapper extends BeanProperty {
 
     @Override
     public boolean isEqualToJson(String json) {
-      return hash(json).equals(hash);
+      return checksum(json) == checksum;
     }
 
     @Override
     public Object get() {
       return null; // cannot create object from json
     }
-
   }
 
-  private static class JsonMutableHash implements MutableHash {
+  /**
+   * Hold original json source content. This supports rebuilding the 'oldValue'.
+   */
+  private static class SourceMutableValue implements MutableValueInfo {
 
     private final String originalJson;
     private final ScalarType<?> parent;
 
-    JsonMutableHash(ScalarType<?> parent, String json) {
+    SourceMutableValue(ScalarType<?> parent, String json) {
       this.parent = parent;
       this.originalJson = json;
     }
@@ -125,24 +133,24 @@ public class BeanPropertyJsonMapper extends BeanProperty {
 
     @Override
     public Object get() {
+      // rebuild the 'oldValue' for change log etc
       return parent.parse(originalJson);
     }
-
   }
 
   /**
-   * No dirty detection on JSON content.
+   * No dirty detection on json content.
    */
-  private static class NoDirtyDetection implements MutableHash {
+  private static class NoDirtyDetection implements MutableValueInfo {
 
     @Override
     public boolean isEqualToJson(String json) {
-      return true;
+      return true; // treat as not dirty
     }
 
     @Override
     public boolean isEqualToObject(Object obj) {
-      return true;
+      return true; // treat as not dirty
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
index e9de67a52..1cbb7eeca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
-import io.ebean.bean.MutableHash;
+import io.ebean.bean.MutableValueInfo;
 import io.ebeaninternal.server.deploy.BeanProperty;
 
 import java.sql.SQLException;
@@ -32,8 +32,8 @@ class BindablePropertyJsonInsert extends BindableProperty {
       } else {
         // on insert store hash and push json
         final String json = prop.format(value);
-        final MutableHash hash = prop.createMutableHash(json);
-        bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+        final MutableValueInfo hash = prop.createMutableInfo(json);
+        bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
         request.pushJson(json);
         request.bind(value, prop);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
index ab281cf01..f939ae004 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
-import io.ebean.bean.MutableHash;
+import io.ebean.bean.MutableValueInfo;
 import io.ebeaninternal.server.deploy.BeanProperty;
 
 import java.sql.SQLException;
@@ -28,8 +28,8 @@ class BindablePropertyJsonUpdate extends BindableProperty {
     } else {
       // on update store hash and push json
       final String json = bean._ebean_getIntercept().mutableContent(propertyIndex);
-      final MutableHash hash = prop.createMutableHash(json);
-      bean._ebean_getIntercept().mutableHash(propertyIndex, hash);
+      final MutableValueInfo hash = prop.createMutableInfo(json);
+      bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
       request.pushJson(json);
       final Object value = prop.getValue(bean);
       request.bind(value, prop);

From 991c6d6b5c30f76abe1758585cc19aebb171d896 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 13:30:15 +1200
Subject: [PATCH 309/447] No effective change - tidy FactoryProperty

---
 .../server/persist/dmlbind/BindablePropertyJsonUpdate.java | 3 +--
 .../server/persist/dmlbind/FactoryProperty.java            | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
index f939ae004..5a94d0e0e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
@@ -31,8 +31,7 @@ class BindablePropertyJsonUpdate extends BindableProperty {
       final MutableValueInfo hash = prop.createMutableInfo(json);
       bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
       request.pushJson(json);
-      final Object value = prop.getValue(bean);
-      request.bind(value, prop);
+      request.bind(prop.getValue(bean), prop);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
index 78ceb098b..d5c59daf3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+import io.ebeaninternal.server.deploy.BeanPropertyJsonMapper;
 import io.ebeaninternal.server.persist.dml.DmlMode;
 
 /**
@@ -23,14 +24,12 @@ class FactoryProperty {
    * Create a Bindable for the property given the mode and withLobs flag.
    */
   public Bindable create(BeanProperty prop, DmlMode mode, boolean withLobs, boolean allowManyToOne) {
-
     if (DmlMode.INSERT == mode && !prop.isDbInsertable()) {
       return null;
     }
     if (DmlMode.UPDATE == mode && !prop.isDbUpdatable()) {
       return null;
     }
-
     if (prop.isLob() && !withLobs) {
       // Lob exclusion
       return null;
@@ -38,12 +37,10 @@ class FactoryProperty {
     if (prop.isDbEncrypted()){
       return new BindableEncryptedProperty(prop, bindEncryptDataFirst);
     }
-
     if (allowManyToOne && prop instanceof BeanPropertyAssocOne) {
       return  new BindableAssocOne((BeanPropertyAssocOne<?>)prop);
     }
-
-    if (prop.getScalarType().isJsonMapper()) {
+    if (prop instanceof BeanPropertyJsonMapper) {
       if (DmlMode.INSERT == mode) {
         return new BindablePropertyJsonInsert(prop);
       } else if (DmlMode.UPDATE == mode) {

From 0d8e7c852b52bf599e8c225a871485adec56a56e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 15:32:06 +1200
Subject: [PATCH 310/447] Change Checksum to use CRC32

---
 .../java/io/ebeaninternal/server/util/Checksum.java   |  8 ++++----
 .../io/ebeaninternal/server/util/ChecksumTest.java    | 11 ++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java
index 87ee6e7e8..8295703c1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/Checksum.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.util;
 
 import java.nio.charset.StandardCharsets;
-import java.util.zip.Adler32;
+import java.util.zip.CRC32;
 
 /**
  * Compute a checksum for String content. Use when we desire cheaper option than MD5.
@@ -12,9 +12,9 @@ public final class Checksum {
    * Return the checksum for the given String input.
    */
   public static long checksum(String input) {
-    Adler32 adler32 = new Adler32();
+    CRC32 checksum = new CRC32();
     final byte[] bytes = input.getBytes(StandardCharsets.UTF_8);
-    adler32.update(bytes, 0, bytes.length);
-    return adler32.getValue();
+    checksum.update(bytes, 0, bytes.length);
+    return checksum.getValue();
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java
index 58342df80..9eceabb0a 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java
@@ -8,11 +8,16 @@ public class ChecksumTest {
 
   @Test
   public void checksum() {
-
     final long val = Checksum.checksum("Hello world");
-    assertThat(val).isEqualTo(413860925L);
-
+    assertThat(val).isEqualTo(2346098258L);
     assertThat(Checksum.checksum("Hello world")).isEqualTo(val);
     assertThat(Checksum.checksum("hello world")).isNotEqualTo(val);
   }
+
+  @Test
+  public void checksum_shortString() {
+    final long val0 = Checksum.checksum("2012-01-11");
+    final long val1 = Checksum.checksum("2012-10-02");
+    assertThat(val0).isNotEqualTo(val1);
+  }
 }

From c66d248e963dc1854256f4206cea1c233596ef4a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 15:42:16 +1200
Subject: [PATCH 311/447] Add MutableValueNext to replace mutableContent such
 that hash compute is only done once

Adds MutableValueInfo.nextDirty() to replace the isEqualToJson() method. The next is computed once and stored. BindablePropertyJsonUpdate makes the .mutableNext(propertyIndex) call to move the next MutableValueInfo and return the json content.
---
 .../io/ebean/bean/EntityBeanIntercept.java    |  34 +++---
 .../java/io/ebean/bean/MutableValueInfo.java  |  11 +-
 .../java/io/ebean/bean/MutableValueNext.java  |  17 +++
 .../server/deploy/BeanPropertyJsonMapper.java | 102 ++++++++++++++----
 .../dmlbind/BindablePropertyJsonUpdate.java   |   8 +-
 5 files changed, 125 insertions(+), 47 deletions(-)
 create mode 100644 ebean-api/src/main/java/io/ebean/bean/MutableValueNext.java

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 99e9334c1..78d8e5f8c 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -105,7 +105,7 @@ public final class EntityBeanIntercept implements Serializable {
    * Holds json content determined at point of dirty check.
    * Stored here on dirty check such that we only convert to json once.
    */
-  private String[] mutableContent;
+  private MutableValueNext[] mutableNext;
 
   /**
    * Create a intercept with a given entity.
@@ -395,7 +395,7 @@ public final class EntityBeanIntercept implements Serializable {
     this.owner._ebean_setEmbeddedLoaded();
     this.lazyLoadProperty = -1;
     this.origValues = null;
-    this.mutableContent = null;
+    this.mutableNext = null;
     for (int i = 0; i < flags.length; i++) {
       flags[i] &= ~(FLAG_CHANGED_PROP | FLAG_ORIG_VALUE_SET);
     }
@@ -1203,23 +1203,29 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * Return the [json] content of a mutable value.
-   */
-  public String mutableContent(int propertyIndex) {
-    return mutableContent == null ? null : mutableContent[propertyIndex];
-  }
-
-  /**
-   * Set the [json] content of a mutable property.
+   * Dirty detection set the next mutable property content and info .
    * <p>
    * Set here as the mutable property dirty detection is based on json content comparison.
    * We only want to perform the json serialisation once so storing it here as part of
    * dirty detection so that we can get it back to bind in insert or update etc.
    */
-  public void mutableContent(int propertyIndex, String content) {
-    if (mutableContent == null) {
-      mutableContent = new String[flags.length];
+  public void mutableNext(int propertyIndex, MutableValueNext next) {
+    if (mutableNext == null) {
+      mutableNext = new MutableValueNext[flags.length];
     }
-    mutableContent[propertyIndex] = content;
+    mutableNext[propertyIndex] = next;
   }
+
+  /**
+   * Update the 'next' mutable info returning the content that was obtained via dirty detection.
+   */
+  public String mutableNext(int propertyIndex) {
+    if (mutableNext == null) {
+      return null;
+    }
+    final MutableValueNext next = mutableNext[propertyIndex];
+    mutableInfo(propertyIndex, next.info());
+    return next.content();
+  }
+
 }
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java b/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
index de8cbee6d..0f9c223aa 100644
--- a/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
@@ -12,12 +12,15 @@ package io.ebean.bean;
 public interface MutableValueInfo {
 
   /**
-   * Compares the given json to an internal value. Can be a hash/checksum comparison
-   * or a plain JSON string comparison (based on {@code @DbJson(keepSource)}).
+   * Compares the given json returning null if deemed unchanged or returning
+   * the MutableValueNext to use if deemed dirty/changed.
+   * <p>
+   * Returning MutableValueNext allows an implementation based on hash/checksum
+   * to only perform that computation once.
    *
-   * @return true if the value is considered unchanged (when comparing in json form).
+   * @return Null if deemed unchanged or the MutableValueNext if deemed changed.
    */
-  boolean isEqualToJson(String json);
+  MutableValueNext nextDirty(String json);
 
   /**
    * Compares the given object to an internal value.
diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableValueNext.java b/ebean-api/src/main/java/io/ebean/bean/MutableValueNext.java
new file mode 100644
index 000000000..401d3c223
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableValueNext.java
@@ -0,0 +1,17 @@
+package io.ebean.bean;
+
+/**
+ * Represents a next value to use for mutable content properties (DbJson with jackson beans).
+ */
+public interface MutableValueNext {
+
+  /**
+   * Return the next content to use. Provided such that we serialise to json once.
+   */
+  String content();
+
+  /**
+   * Return the next MutableValueInfo to use after an update.
+   */
+  MutableValueInfo info();
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index fca7b790b..d3a683e48 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.bean.MutableValueNext;
 import io.ebean.bean.MutableValueInfo;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
@@ -36,6 +37,19 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     }
   }
 
+  /**
+   * Next when no prior MutableValueInfo.
+   */
+  private MutableValueNext next(String json) {
+    if (keepSource) {
+      return new SourceMutableValue(scalarType, json);
+    } else if (dirtyDetection) {
+      return new NextPair(json, new ChecksumMutableValue(scalarType, json));
+    } else {
+      throw new IllegalStateException("Never get here");
+    }
+  }
+
   /**
    * Return true if the mutable value is considered dirty.
    * This is only used for 'mutable' scalar types like hstore etc.
@@ -43,10 +57,17 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   @Override
   boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
     // dirty detection based on json content or checksum of json content
+    // only perform serialisation to json once
     final String json = scalarType.format(value);
     final MutableValueInfo oldHash = ebi.mutableInfo(propertyIndex);
-    if (oldHash == null || !oldHash.isEqualToJson(json)) {
-      ebi.mutableContent(propertyIndex, json); // so we only convert to json once
+    if (oldHash == null) {
+      ebi.mutableNext(propertyIndex, next(json));
+      return true;
+    }
+    // only perform compute of checksum/hash once (if checksum based)
+    final MutableValueNext next = oldHash.nextDirty(json);
+    if (next != null) {
+      ebi.mutableNext(propertyIndex, next);
       return true;
     }
     return false;
@@ -72,34 +93,59 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     }
   }
 
+  private static final class NextPair implements MutableValueNext {
+
+    private final String json;
+    private final MutableValueInfo next;
+
+    NextPair(String json, MutableValueInfo next) {
+      this.json = json;
+      this.next = next;
+    }
+
+    @Override
+    public String content() {
+      return json;
+    }
+
+    @Override
+    public MutableValueInfo info() {
+      return next;
+    }
+  }
+
   /**
-   * Hold checksum of json source content.
+   * Hold checksum of json source content to use for dirty detection.
    * <p>
-   * Dirty detection based on checksum difference on json form.
    * Does not support rebuilding 'oldValue' as no original json content.
    */
-  private static class ChecksumMutableValue implements MutableValueInfo {
+  private static final class ChecksumMutableValue implements MutableValueInfo {
 
     private final ScalarType<?> parent;
     private final long checksum;
 
     ChecksumMutableValue(ScalarType<?> parent, String json) {
       this.parent = parent;
-      this.checksum = checksum(json);
+      this.checksum = Checksum.checksum(json);
     }
 
-    private long checksum(String json) {
-      return Checksum.checksum(json);
+    /**
+     * Create with pre-computed checksum.
+     */
+    ChecksumMutableValue(ScalarType<?> parent, long checksum) {
+      this.parent = parent;
+      this.checksum = checksum;
+    }
+
+    @Override
+    public MutableValueNext nextDirty(String json) {
+      final long nextChecksum = Checksum.checksum(json);
+      return nextChecksum == checksum ? null : new NextPair(json, new ChecksumMutableValue(parent, nextChecksum));
     }
 
     @Override
     public boolean isEqualToObject(Object obj) {
-      return isEqualToJson(parent.format(obj));
-    }
-
-    @Override
-    public boolean isEqualToJson(String json) {
-      return checksum(json) == checksum;
+      return Checksum.checksum(parent.format(obj)) == checksum;
     }
 
     @Override
@@ -109,9 +155,9 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   }
 
   /**
-   * Hold original json source content. This supports rebuilding the 'oldValue'.
+   * Hold json source content. This supports rebuilding the 'oldValue'.
    */
-  private static class SourceMutableValue implements MutableValueInfo {
+  private static final class SourceMutableValue implements MutableValueInfo, MutableValueNext {
 
     private final String originalJson;
     private final ScalarType<?> parent;
@@ -122,13 +168,13 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     }
 
     @Override
-    public boolean isEqualToObject(Object obj) {
-      return isEqualToJson(parent.format(obj));
+    public MutableValueNext nextDirty(String json) {
+      return Objects.equals(originalJson, json) ? null : new SourceMutableValue(parent, json);
     }
 
     @Override
-    public boolean isEqualToJson(String json) {
-      return Objects.equals(originalJson, json);
+    public boolean isEqualToObject(Object obj) {
+      return Objects.equals(originalJson, parent.format(obj));
     }
 
     @Override
@@ -136,16 +182,26 @@ public class BeanPropertyJsonMapper extends BeanProperty {
       // rebuild the 'oldValue' for change log etc
       return parent.parse(originalJson);
     }
+
+    @Override
+    public String content() {
+      return originalJson;
+    }
+
+    @Override
+    public MutableValueInfo info() {
+      return this;
+    }
   }
 
   /**
    * No dirty detection on json content.
    */
-  private static class NoDirtyDetection implements MutableValueInfo {
+  private static final class NoDirtyDetection implements MutableValueInfo {
 
     @Override
-    public boolean isEqualToJson(String json) {
-      return true; // treat as not dirty
+    public MutableValueNext nextDirty(String json) {
+      return null; // treat as not dirty
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
index 5a94d0e0e..cfa056a63 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
-import io.ebean.bean.MutableValueInfo;
 import io.ebeaninternal.server.deploy.BeanProperty;
 
 import java.sql.SQLException;
@@ -26,11 +25,8 @@ class BindablePropertyJsonUpdate extends BindableProperty {
     if (bean == null) {
       request.bind(null, prop);
     } else {
-      // on update store hash and push json
-      final String json = bean._ebean_getIntercept().mutableContent(propertyIndex);
-      final MutableValueInfo hash = prop.createMutableInfo(json);
-      bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
-      request.pushJson(json);
+      // update mutableInfo and push json
+      request.pushJson(bean._ebean_getIntercept().mutableNext(propertyIndex));
       request.bind(prop.getValue(bean), prop);
     }
   }

From 5aa8557168add6acf9bc7d016dc30eddb57c2e25 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 16:29:10 +1200
Subject: [PATCH 312/447] Update tests only - TestJacksonPlainBean with
 dirtyDetection = false property

---
 .../org/tests/model/json/EBasicPlain.java     | 11 ++++++++
 .../model/json/TestJacksonPlainBean.java      | 26 ++++++++++---------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
index f3705aa16..401e66fa1 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
@@ -17,6 +17,9 @@ public class EBasicPlain {
   @DbJson(length = 500)
   PlainBean plainBean;
 
+  @DbJson(length = 500, dirtyDetection = false)
+  PlainBean plainBean2;
+
   @Version
   long version;
 
@@ -44,6 +47,14 @@ public class EBasicPlain {
     this.plainBean = plainBean;
   }
 
+  public PlainBean getPlainBean2() {
+    return plainBean2;
+  }
+
+  public void setPlainBean2(PlainBean plainBean2) {
+    this.plainBean2 = plainBean2;
+  }
+
   public long getVersion() {
     return version;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
index 0e3d22aa7..f77f2f8b6 100644
--- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
+++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
@@ -16,25 +16,20 @@ public class TestJacksonPlainBean {
     DB.getDefault();
     LoggedSqlCollector.start();
 
-    PlainBean content = new PlainBean();
-    content.setAlong(42);
-    content.setName("foo");
-
+    PlainBean content = new PlainBean("foo", 42);
     EBasicPlain bean = new EBasicPlain();
     bean.setAttr("attr0");
     bean.setPlainBean(content);
-
+    bean.setPlainBean2(new PlainBean("bar", 27));
 
     DB.save(bean);
-    expectedSql(0, "insert into ebasic_plain (attr, plain_bean, version) values (?,?,?)");
-
+    expectedSql(0, "insert into ebasic_plain (attr, plain_bean, plain_bean2, version) values (?,?,?,?)");
 
     // inserted plainBean has not been mutated
     bean.setAttr("attr1");
     DB.save(bean);
     expectedSql(0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
 
-
     // inserted plainBean has now been mutated
     content.setName("notFoo");
     bean.setAttr("attr2");
@@ -50,17 +45,24 @@ public class TestJacksonPlainBean {
     DB.save(found);
     expectedSql(1, "update ebasic_plain set plain_bean=?, version=? where id=? and version=?");
 
-
-    // update bean, mutate PlainBean only
+    // dirtyDetection = false, so not included in update
+    found.getPlainBean2().setName("Modification Ignored");
+    // dirtyDetection = true, mutation detected
     plainBean.setName("mod2");
     DB.save(found);
     expectedSql(0, "update ebasic_plain set plain_bean=?, version=? where id=? and version=?");
 
-
     // update bean, not mutating PlainBean
     found.setAttr("attr3");
     DB.save(found);
-    expectedSql(LoggedSqlCollector.stop(), 0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+
+    // dirtyDetection = false, set a new plainBean2 instance, included in update
+    found.setPlainBean2(new PlainBean("bar", 27));
+    DB.save(found);
+    expectedSql( 0, "update ebasic_plain set plain_bean2=?, version=? where id=? and version=?");
+
+    LoggedSqlCollector.stop();
   }
 
   private void expectedSql(int i, String s) {

From 20becf951d02754f4003cb88a1b5aa1ea522de3c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 23:11:42 +1200
Subject: [PATCH 313/447] Use MutationDetection replacing dirtyDetection and
 keepSource

Also adds NoMutationDetection to support NONE
---
 ebean-api/pom.xml                             |  2 +-
 .../server/deploy/BeanPropertyJsonMapper.java | 46 ++++++-------------
 .../deploy/meta/DeployBeanProperty.java       | 39 ++++------------
 .../deploy/meta/DeployBeanPropertyLists.java  | 42 ++---------------
 .../server/deploy/parse/DeployUtil.java       | 16 +++----
 .../server/type/DefaultTypeManager.java       |  3 +-
 .../type/ScalarTypeJsonObjectMapper.java      | 35 +++++++++++++-
 .../org/tests/model/json/EBasicJsonList.java  | 11 ++---
 .../org/tests/model/json/EBasicPlain.java     |  4 +-
 .../model/json/TestJacksonPlainBean.java      |  5 +-
 10 files changed, 76 insertions(+), 127 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 649f85822..503c2f2c5 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>7.1</version>
+      <version>7.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index d3a683e48..f1efc39f7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -1,9 +1,10 @@
 package io.ebeaninternal.server.deploy;
 
+import io.ebean.annotation.MutationDetection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.bean.MutableValueNext;
 import io.ebean.bean.MutableValueInfo;
+import io.ebean.bean.MutableValueNext;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
@@ -14,26 +15,24 @@ import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Objects;
 
+/**
+ * Handle json property with MutationDetection of SOURCE or HASH only.
+ */
 public class BeanPropertyJsonMapper extends BeanProperty {
 
-  private static final NoDirtyDetection NO_DIRTY_DETECTION = new NoDirtyDetection();
-  private final boolean dirtyDetection;
-  private final boolean keepSource;
+  private final boolean sourceDetection;
 
   public BeanPropertyJsonMapper(BeanDescriptor<?> desc, DeployBeanProperty deployProp) {
     super(desc, deployProp);
-    this.dirtyDetection = deployProp.isDirtyDetection();
-    this.keepSource = deployProp.isKeepSource();
+    this.sourceDetection = deployProp.getMutationDetection() == MutationDetection.SOURCE;
   }
 
   @Override
   public MutableValueInfo createMutableInfo(String json) {
-    if (keepSource) {
+    if (sourceDetection) {
       return new SourceMutableValue(scalarType, json);
-    } else if (dirtyDetection) {
-      return new ChecksumMutableValue(scalarType, json);
     } else {
-      return NO_DIRTY_DETECTION;
+      return new ChecksumMutableValue(scalarType, json);
     }
   }
 
@@ -41,22 +40,19 @@ public class BeanPropertyJsonMapper extends BeanProperty {
    * Next when no prior MutableValueInfo.
    */
   private MutableValueNext next(String json) {
-    if (keepSource) {
+    if (sourceDetection) {
       return new SourceMutableValue(scalarType, json);
-    } else if (dirtyDetection) {
-      return new NextPair(json, new ChecksumMutableValue(scalarType, json));
     } else {
-      throw new IllegalStateException("Never get here");
+      return new NextPair(json, new ChecksumMutableValue(scalarType, json));
     }
   }
 
   /**
-   * Return true if the mutable value is considered dirty.
-   * This is only used for 'mutable' scalar types like hstore etc.
+   * Return true if the json property is considered dirty.
    */
   @Override
   boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
-    // dirty detection based on json content or checksum of json content
+    // mutation detection based on json content or checksum of json content
     // only perform serialisation to json once
     final String json = scalarType.format(value);
     final MutableValueInfo oldHash = ebi.mutableInfo(propertyIndex);
@@ -193,20 +189,4 @@ public class BeanPropertyJsonMapper extends BeanProperty {
       return this;
     }
   }
-
-  /**
-   * No dirty detection on json content.
-   */
-  private static final class NoDirtyDetection implements MutableValueInfo {
-
-    @Override
-    public MutableValueNext nextDirty(String json) {
-      return null; // treat as not dirty
-    }
-
-    @Override
-    public boolean isEqualToObject(Object obj) {
-      return true; // treat as not dirty
-    }
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 060ce802f..3da06d559 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -1,18 +1,6 @@
 package io.ebeaninternal.server.deploy.meta;
 
-import io.ebean.annotation.CreatedTimestamp;
-import io.ebean.annotation.DocCode;
-import io.ebean.annotation.DocProperty;
-import io.ebean.annotation.DocSortable;
-import io.ebean.annotation.Formula;
-import io.ebean.annotation.Platform;
-import io.ebean.annotation.SoftDelete;
-import io.ebean.annotation.UpdatedTimestamp;
-import io.ebean.annotation.WhenCreated;
-import io.ebean.annotation.WhenModified;
-import io.ebean.annotation.Where;
-import io.ebean.annotation.WhoCreated;
-import io.ebean.annotation.WhoModified;
+import io.ebean.annotation.*;
 import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.dbplatform.DbDefaultValue;
 import io.ebean.config.dbplatform.DbEncrypt;
@@ -39,7 +27,6 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.sql.Types;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -109,8 +96,7 @@ public class DeployBeanProperty {
 
   private boolean jsonSerialize = true;
   private boolean jsonDeserialize = true;
-  private boolean dirtyDetection;
-  private boolean keepSource;
+  private MutationDetection mutationDetection;
 
   private boolean dbEncrypted;
   private DbEncryptFunction dbEncryptFunction;
@@ -329,18 +315,15 @@ public class DeployBeanProperty {
     this.jsonDeserialize = jsonDeserialize;
   }
 
-  /**
-   * Return true if we should have JSON dirty detection on this property.
-   */
-  public boolean isDirtyDetection() {
-    return dirtyDetection;
+  public MutationDetection getMutationDetection() {
+    if (mutationDetection == null) {
+      mutationDetection = MutationDetection.DEFAULT;
+    }
+    return mutationDetection;
   }
 
-  /**
-   * Return true if we should store source JSON content on this property.
-   */
-  public boolean isKeepSource() {
-    return keepSource;
+  public void setMutationDetection(MutationDetection dirtyDetection) {
+    this.mutationDetection = dirtyDetection;
   }
 
   /**
@@ -1221,8 +1204,4 @@ public class DeployBeanProperty {
     return scalarType != null && scalarType.isJsonMapper();
   }
 
-  public void setJsonOptions(boolean dirtyDetection, boolean keepSource) {
-    this.dirtyDetection = dirtyDetection;
-    this.keepSource = keepSource;
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 9843f8e5c..90503c93f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -22,47 +22,28 @@ public class DeployBeanPropertyLists {
   private static final NoopSetter NOOP_SETTER = new NoopSetter();
 
   private BeanProperty versionProperty;
-
   private BeanProperty unmappedJson;
-
   private BeanProperty draft;
-
   private BeanProperty draftDirty;
-
   private BeanProperty tenant;
-
   private final BeanDescriptor<?> desc;
-
   private final LinkedHashMap<String, BeanProperty> propertyMap;
-
   private BeanProperty id;
 
   private final List<BeanProperty> local = new ArrayList<>();
-
   private final List<BeanProperty> mutable = new ArrayList<>();
-
   private final List<BeanPropertyAssocMany<?>> manys = new ArrayList<>();
-
   private final List<BeanProperty> nonManys = new ArrayList<>();
-
   private final List<BeanProperty> aggs = new ArrayList<>();
-
   private final List<BeanPropertyAssocOne<?>> ones = new ArrayList<>();
-
   private final List<BeanPropertyAssocOne<?>> onesImported = new ArrayList<>();
-
   private final List<BeanPropertyAssocOne<?>> embedded = new ArrayList<>();
-
   private final List<BeanProperty> baseScalar = new ArrayList<>();
-
   private final List<BeanProperty> transients = new ArrayList<>();
-
   private final List<BeanProperty> nonTransients = new ArrayList<>();
-
   private final BeanPropertyAssocOne<?> unidirectional;
   private final BeanProperty orderColumn;
 
-  @SuppressWarnings({"unchecked"})
   public DeployBeanPropertyLists(BeanDescriptorMap owner, BeanDescriptor<?> desc, DeployBeanDescriptor<?> deploy) {
     this.desc = desc;
 
@@ -78,7 +59,7 @@ public class DeployBeanPropertyLists {
     this.orderColumn = deployOrderColumn != null ? new BeanPropertyOrderColumn(desc, deployOrderColumn) : null;
 
     DeployBeanPropertyAssocOne<?> deployUnidirectional = deploy.getUnidirectional();
-    this.unidirectional = deployUnidirectional == null ? null : new BeanPropertyAssocOne(owner, desc, deployUnidirectional);
+    this.unidirectional = deployUnidirectional == null ? null : new BeanPropertyAssocOne<>(owner, desc, deployUnidirectional);
 
     this.propertyMap = new LinkedHashMap<>();
 
@@ -119,7 +100,7 @@ public class DeployBeanPropertyLists {
     }
 
     if (orderColumn != null) {
-      orderColumn.setDeployOrder(order++);
+      orderColumn.setDeployOrder(order);
       allocateToList(orderColumn);
       propertyMap.put(orderColumn.getName(), orderColumn);
     }
@@ -146,7 +127,6 @@ public class DeployBeanPropertyLists {
   }
 
   private void setImportedPrimaryKeysFor(DeployBeanDescriptor<?> deploy, DeployBeanPropertyAssocOne<?> id) {
-
     for (DeployBeanProperty prop : id.getTargetDeploy().properties()) {
       DeployBeanProperty match = findImported(deploy, prop);
       if (match != null) {
@@ -156,7 +136,6 @@ public class DeployBeanPropertyLists {
   }
 
   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();
@@ -172,7 +151,6 @@ public class DeployBeanPropertyLists {
         return assocOne;
       }
     }
-
     return null;
   }
 
@@ -360,7 +338,6 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty getSoftDeleteProperty() {
-
     for (BeanProperty prop : nonManys) {
       if (prop.isSoftDelete()) {
         return prop;
@@ -377,7 +354,6 @@ public class DeployBeanPropertyLists {
    * Return the properties set via generated values on insert.
    */
   public BeanProperty[] getGeneratedInsert() {
-
     List<BeanProperty> list = new ArrayList<>();
     for (BeanProperty prop : nonTransients) {
       GeneratedProperty gen = prop.getGeneratedProperty();
@@ -392,7 +368,6 @@ public class DeployBeanPropertyLists {
    * Return the properties set via generated values on update.
    */
   public BeanProperty[] getGeneratedUpdate() {
-
     List<BeanProperty> list = new ArrayList<>();
     for (BeanProperty prop : nonTransients) {
       GeneratedProperty gen = prop.getGeneratedProperty();
@@ -430,8 +405,7 @@ public class DeployBeanPropertyLists {
         }
       }
     }
-
-    return (BeanPropertyAssocOne[]) list.toArray(new BeanPropertyAssocOne[0]);
+    return list.toArray(new BeanPropertyAssocOne<?>[0]);
   }
 
   private BeanPropertyAssocMany<?>[] getMany2Many() {
@@ -441,8 +415,7 @@ public class DeployBeanPropertyLists {
         list.add(prop);
       }
     }
-
-    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[0]);
+    return list.toArray(new BeanPropertyAssocMany<?>[0]);
   }
 
   private BeanPropertyAssocMany<?>[] getMany(Mode mode) {
@@ -463,25 +436,20 @@ public class DeployBeanPropertyLists {
           break;
       }
     }
-
-    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[0]);
+    return list.toArray(new BeanPropertyAssocMany<?>[0]);
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   private BeanProperty createBeanProperty(BeanDescriptorMap owner, DeployBeanProperty deployProp) {
-
     if (deployProp instanceof DeployBeanPropertyAssocOne) {
       return new BeanPropertyAssocOne(owner, desc, (DeployBeanPropertyAssocOne) deployProp);
     }
-
     if (deployProp instanceof DeployBeanPropertySimpleCollection<?>) {
       return new BeanPropertySimpleCollection(desc, (DeployBeanPropertySimpleCollection) deployProp);
     }
-
     if (deployProp instanceof DeployBeanPropertyAssocMany) {
       return new BeanPropertyAssocMany(desc, (DeployBeanPropertyAssocMany) deployProp);
     }
-
     if (deployProp.isJsonMapper()) {
       return new BeanPropertyJsonMapper(desc, deployProp);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 2245b0c4c..0792c66d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -1,10 +1,6 @@
 package io.ebeaninternal.server.deploy.parse;
 
-import io.ebean.annotation.DbArray;
-import io.ebean.annotation.DbJson;
-import io.ebean.annotation.DbJsonB;
-import io.ebean.annotation.DbJsonType;
-import io.ebean.annotation.DbMap;
+import io.ebean.annotation.*;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.EncryptDeploy;
 import io.ebean.config.EncryptDeployManager;
@@ -214,21 +210,21 @@ public class DeployUtil {
    */
   void setDbJsonType(DeployBeanProperty prop, DbJson dbJsonType) {
     int dbType = getDbJsonStorage(dbJsonType.storage());
-    setDbJsonType(prop, dbType, dbJsonType.length(), dbJsonType.dirtyDetection(), dbJsonType.keepSource());
+    setDbJsonType(prop, dbType, dbJsonType.length(), dbJsonType.mutationDetection());
   }
 
   void setDbJsonBType(DeployBeanProperty prop, DbJsonB dbJsonB) {
-    setDbJsonType(prop, DbPlatformType.JSONB, dbJsonB.length(), dbJsonB.dirtyDetection(), dbJsonB.keepSource());
+    setDbJsonType(prop, DbPlatformType.JSONB, dbJsonB.length(), dbJsonB.mutationDetection());
   }
 
-  private void setDbJsonType(DeployBeanProperty prop, int dbType, int dbLength, boolean dirtyDetection, boolean keepSource) {
+  private void setDbJsonType(DeployBeanProperty prop, int dbType, int dbLength, MutationDetection mutationDetection) {
+    prop.setDbType(dbType);
+    prop.setMutationDetection(mutationDetection);
     ScalarType<?> scalarType = typeManager.getJsonScalarType(prop, dbType, dbLength);
     if (scalarType == null) {
       throw new RuntimeException("No ScalarType for JSON property [" + prop + "] [" + dbType + "]");
     }
-    prop.setDbType(dbType);
     prop.setScalarType(scalarType);
-    prop.setJsonOptions(dirtyDetection, keepSource);
     if (dbType == Types.VARCHAR || dbLength > 0) {
       // determine the db column size
       int columnLength = (dbLength > 0) ? dbLength : DEFAULT_JSON_VARCHAR_LENGTH;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index befe46b20..28999e838 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -2,7 +2,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.*;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.JsonConfig;
@@ -426,7 +425,7 @@ public final class DefaultTypeManager implements TypeManager {
     if (objectMapper == null) {
       throw new IllegalArgumentException("Type [" + type + "] unsupported for @DbJson mapping - Jackson ObjectMapper not present");
     }
-    return ScalarTypeJsonObjectMapper.createTypeFor(jsonManager, (AnnotatedField) prop.getJacksonField(), dbType, docType);
+    return ScalarTypeJsonObjectMapper.createTypeFor(jsonManager, prop, dbType, docType);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 14425c6c9..7fb3aa4b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
+import io.ebean.annotation.MutationDetection;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
@@ -15,6 +16,7 @@ import io.ebean.text.TextException;
 import io.ebeaninternal.json.ModifyAwareList;
 import io.ebeaninternal.json.ModifyAwareMap;
 import io.ebeaninternal.json.ModifyAwareSet;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
@@ -34,8 +36,16 @@ class ScalarTypeJsonObjectMapper {
   /**
    * Create and return the appropriate ScalarType.
    */
-  static ScalarType<?> createTypeFor(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+  static ScalarType<?> createTypeFor(TypeJsonManager jsonManager, DeployBeanProperty prop, int dbType, DocPropertyType docType) {
+    AnnotatedField field = (AnnotatedField) prop.getJacksonField();
     Class<?> type = field.getRawType();
+
+    MutationDetection mode = prop.getMutationDetection();
+    if (mode == MutationDetection.NONE) {
+      return new NoMutationDetection(jsonManager, field, dbType, type);
+    } else if (mode != MutationDetection.DEFAULT) {
+      return new GenericObject(jsonManager, field, dbType, type);
+    }
     if (Set.class.equals(type)) {
       return new OmSet(jsonManager, field, dbType, docType);
     }
@@ -45,11 +55,32 @@ class ScalarTypeJsonObjectMapper {
     if (Map.class.equals(type)) {
       return new OmMap(jsonManager, field, dbType);
     }
+    prop.setMutationDetection(MutationDetection.HASH);
     return new GenericObject(jsonManager, field, dbType, type);
   }
 
   /**
-   * Maps any type (Object) using Jackson ObjectMapper.
+   * No mutation detection on this json property.
+   */
+  private static class NoMutationDetection extends Base<Object> {
+
+    NoMutationDetection(TypeJsonManager jsonManager, AnnotatedField field, int dbType, Class<?> rawType) {
+      super(Object.class, jsonManager, field, dbType, DocPropertyType.OBJECT, rawType);
+    }
+
+    @Override
+    public boolean isMutable() {
+      return false;
+    }
+
+    @Override
+    public boolean isDirty(Object value) {
+      return false;
+    }
+  }
+
+  /**
+   * Supports HASH and SOURCE dirty detection modes.
    */
   private static class GenericObject extends Base<Object> {
 
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
index 05d9807b5..d5ce2c309 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
@@ -7,12 +7,9 @@ import io.ebean.annotation.DbJsonType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+
+import static io.ebean.annotation.MutationDetection.SOURCE;
 
 @Entity
 public class EBasicJsonList {
@@ -31,7 +28,7 @@ public class EBasicJsonList {
   @DbJson(length = 700)
   Map<String, PlainBean> beanMap = new LinkedHashMap<>();
 
-  @DbJson(length = 500, keepSource = true) // such that we can rebuild old values
+  @DbJson(length = 500, mutationDetection = SOURCE) // such that we can rebuild old values
   PlainBean plainBean;
 
   @DbJson(length = 50)
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
index 401e66fa1..051b4a344 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java
@@ -6,6 +6,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
 
+import static io.ebean.annotation.MutationDetection.NONE;
+
 @Entity
 public class EBasicPlain {
 
@@ -17,7 +19,7 @@ public class EBasicPlain {
   @DbJson(length = 500)
   PlainBean plainBean;
 
-  @DbJson(length = 500, dirtyDetection = false)
+  @DbJson(length = 500, mutationDetection = NONE) // only update when property set
   PlainBean plainBean2;
 
   @Version
diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
index f77f2f8b6..c0fe82b26 100644
--- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
+++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
@@ -60,7 +60,7 @@ public class TestJacksonPlainBean {
     // dirtyDetection = false, set a new plainBean2 instance, included in update
     found.setPlainBean2(new PlainBean("bar", 27));
     DB.save(found);
-    expectedSql( 0, "update ebasic_plain set plain_bean2=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_plain set plain_bean2=?, version=? where id=? and version=?");
 
     LoggedSqlCollector.stop();
   }
@@ -69,7 +69,4 @@ public class TestJacksonPlainBean {
     assertThat(LoggedSqlCollector.current().get(i)).contains(s);
   }
 
-  private void expectedSql(List<String> sql, int i, String s) {
-    assertThat(sql.get(i)).contains(s);
-  }
 }

From 20e0eb102193d4b7f69f4fd45295e345055ca013 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 23:17:11 +1200
Subject: [PATCH 314/447] Re-enable TestDbJson_Jackson3 via adding
 mutationDetection = HASH to beanList property

  @DbJsonB(mutationDetection = HASH)
  List<PlainBean> beanList;
---
 .../src/test/java/org/tests/json/TestDbJson_Jackson3.java  | 7 ++-----
 .../src/test/java/org/tests/model/json/EBasicJsonList.java | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index e8d8abdfd..2f74be109 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -161,10 +161,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     final EBasicJsonList found = DB.find(EBasicJsonList.class, bean.getId());
     found.getBeanList().get(0).setName("p1-mod");
 
-//    BeanState state = DB.getBeanState(found);
-//    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList");
-    // this test fails, because we have a OmList instead of a GenericObject
-    // TODO: Can/Should we enhance the @DbJson/@DbJsonB annotations with a property "dirtyDetection"
-
+    BeanState state = DB.getBeanState(found);
+    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList");
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
index d5ce2c309..f76d282f7 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
@@ -9,6 +9,7 @@ import javax.persistence.Id;
 import javax.persistence.Version;
 import java.util.*;
 
+import static io.ebean.annotation.MutationDetection.HASH;
 import static io.ebean.annotation.MutationDetection.SOURCE;
 
 @Entity
@@ -22,7 +23,7 @@ public class EBasicJsonList {
   @DbJson(length = 700, name = "beans")
   Set<PlainBean> beanSet;
 
-  @DbJsonB
+  @DbJsonB(mutationDetection = HASH)
   List<PlainBean> beanList;
 
   @DbJson(length = 700)

From 822fb7325a244abf3a390ed59bf9ca2ce755a7c8 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 29 Jul 2021 23:37:29 +1200
Subject: [PATCH 315/447] Due to mutableNext handling, with
 checkMutableProperties() even when known dirty go into
 beanProperty.checkMutable()

As per rPraml's PR and comment

Due to handling of mutableNext we need  checkMutableProperties() to call into what is now beanProperty.checkMutable() even when we already know it's dirty.
---
 .../java/io/ebeaninternal/server/deploy/BeanDescriptor.java   | 4 ++--
 .../java/io/ebeaninternal/server/deploy/BeanProperty.java     | 4 ++--
 .../ebeaninternal/server/deploy/BeanPropertyJsonMapper.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index d165b1489..8f0fea0f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3198,9 +3198,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   public void checkMutableProperties(EntityBeanIntercept ebi) {
     for (BeanProperty beanProperty : propertiesMutable) {
       int propertyIndex = beanProperty.getPropertyIndex();
-      if (!ebi.isDirtyProperty(propertyIndex) && ebi.isLoadedProperty(propertyIndex)) {
+      if (ebi.isLoadedProperty(propertyIndex)) {
         Object value = beanProperty.getValue(ebi.getOwner());
-        if (value != null && beanProperty.isDirtyValue(value, ebi)) {
+        if (beanProperty.checkMutable(value, ebi.isDirtyProperty(propertyIndex), ebi)) {
           // mutable scalar value which is considered dirty so mark
           // it as such so that it is included in an update
           ebi.markPropertyAsChanged(propertyIndex);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index fc5a8364f..a33d183ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -1018,8 +1018,8 @@ 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.
    */
-  boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
-    return scalarType.isDirty(value);
+  boolean checkMutable(Object value, boolean alreadyDirty, EntityBeanIntercept ebi) {
+    return alreadyDirty || value != null && scalarType.isDirty(value);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index f1efc39f7..c9280c8c0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -51,7 +51,7 @@ public class BeanPropertyJsonMapper extends BeanProperty {
    * Return true if the json property is considered dirty.
    */
   @Override
-  boolean isDirtyValue(Object value, EntityBeanIntercept ebi) {
+  boolean checkMutable(Object value, boolean alreadyDirty, EntityBeanIntercept ebi) {
     // mutation detection based on json content or checksum of json content
     // only perform serialisation to json once
     final String json = scalarType.format(value);

From 1fad6e910c5f38d58590d5b4afff313f43bfccb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler=20=28JPo=29?= <jonas.poehler@foconis.de>
Date: Fri, 19 Mar 2021 15:40:21 +0100
Subject: [PATCH 316/447] FIX: do not override empty (json) collections with
 null
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Original: https://github.com/ebean-orm/ebean/commit/5551c35ec2496a9d62ab0afcaecbed739f17aa7c
Signed-off-by: Jonas Pöhler (JPo) <jonas.poehler@foconis.de>
---
 .../server/query/SqlBeanLoad.java              | 18 ++++++++++++------
 .../java/org/tests/json/TestDbJson_List.java   | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index ac1386e11..c1119e525 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -6,6 +6,9 @@ import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.DbReadContext;
 
+import java.util.Collection;
+import java.util.Map;
+
 /**
  * Controls the loading of property data into a bean.
  * <p>
@@ -70,12 +73,7 @@ public class SqlBeanLoad {
 
     try {
       Object dbVal = prop.read(ctx);
-      if (!refreshLoading) {
-        prop.setValue(bean, dbVal);
-      } else {
-        prop.setValueIntercept(bean, dbVal);
-      }
-
+      load(prop, dbVal);
       return dbVal;
 
     } catch (Exception e) {
@@ -89,6 +87,14 @@ public class SqlBeanLoad {
    * Load the given value into the property.
    */
   public void load(BeanProperty target, Object dbVal) {
+    if (dbVal == null) {
+      Object current = target.getValue(bean);
+      if ((current instanceof Collection && ((Collection<?>) current).isEmpty())
+        || current instanceof Map && ((Map<?, ?>) current).isEmpty()) {
+        dbVal = current; // do not modify
+      }
+    }
+
     if (!refreshLoading) {
       target.setValue(bean, dbVal);
     } else {
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index 28fd78221..d00bb3541 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -221,4 +221,18 @@ public class TestDbJson_List extends BaseTestCase {
 
     DB.delete(bean);
   }
+
+  @Test
+  public void testNullToEmpty() {
+    EBasicJsonList bean = new EBasicJsonList();
+    bean.setFlags(null);
+    bean.setTags(null);
+    bean.setBeanMap(null);
+    DB.save(bean);
+
+    bean = DB.find(EBasicJsonList.class)
+      .setId(bean.getId()).findOne();
+
+    assertThat(bean.getFlags()).isEmpty();
+  }
 }

From 1f0ac1f1c12ea54b8738f284061a9f27e7c196bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Thu, 29 Jul 2021 16:50:08 +0200
Subject: [PATCH 317/447] ADD: Testcases for List and Map as well

---
 ebean-core/src/test/java/org/tests/json/TestDbJson_List.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index d00bb3541..e2d04b657 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -234,5 +234,7 @@ public class TestDbJson_List extends BaseTestCase {
       .setId(bean.getId()).findOne();
 
     assertThat(bean.getFlags()).isEmpty();
+    assertThat(bean.getTags()).isEmpty();
+    assertThat(bean.getBeanMap()).isEmpty();
   }
 }

From 4cebb367debec308a665dd74cee8a8bfd2e934c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Thu, 29 Jul 2021 17:09:24 +0200
Subject: [PATCH 318/447] FIX: subquery could not not have a where clause

---
 .../server/query/CQueryPredicates.java             |  3 ++-
 .../test/java/org/tests/query/TestQueryExists.java | 14 +++++++++++++-
 .../test/java/org/tests/query/TestSubQuery.java    | 12 +++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index c41f830c6..bc0588949 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -22,6 +22,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -411,7 +412,7 @@ public class CQueryPredicates {
    * Return the bind values for the where expression.
    */
   public List<Object> getWhereExprBindValues() {
-    return where.getBindValues();
+    return where == null ? Collections.emptyList() : where.getBindValues();
   }
 
   /**
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
index 93155bf9a..d72a1ae0d 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
@@ -4,7 +4,6 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebeantest.LoggedSql;
-
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -111,4 +110,17 @@ public class TestQueryExists extends BaseTestCase {
 
     assertThat(sql).contains("not exists (");
   }
+
+  @Test
+  public void testExistsNoWhere() {
+    ResetBasicData.reset();
+
+    Query<Order> subQuery = Ebean.find(Order.class).alias("sq").select("id");
+    Query<Customer> query = Ebean.find(Customer.class).alias("qt").where().notExists(subQuery).query();
+
+    query.findList();
+    String sql = query.getGeneratedSql();
+
+    assertThat(sql).contains("not exists (select sq.id from o_order sq)");
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
index db9eb7cbd..5de3f9290 100644
--- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
@@ -44,7 +44,17 @@ public class TestSubQuery extends BaseTestCase {
     Query<Order> sq = DB.createQuery(Order.class).select("id").where()
       .isIn("details.product.id", productIds).query();
 
-    DB.find(Order.class).where().isIn("id", sq).findList();
+    assertThat(DB.find(Order.class).where().isIn("id", sq).findList()).hasSize(2);
+  }
+
+  @Test
+  public void test_IsInNoWhere() {
+    ResetBasicData.reset();
+
+    Query<Order> sq = DB.createQuery(Order.class).select("id");
+    int expectedSize = DB.find(Order.class).findCount(); // expect everything
+
+    assertThat(DB.find(Order.class).where().isIn("id", sq).findList()).hasSize(expectedSize);
   }
 
   public void testCompositeKey() {

From 777d3222220a5bda2c7fd5ffac730c9985d61614 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 14:51:38 +1200
Subject: [PATCH 319/447] #2279 - Remove _ebean_getMarker() from EntityBean
 interface - not actually required

---
 ebean-api/src/main/java/io/ebean/bean/EntityBean.java | 11 -----------
 .../server/deploy/ElementEntityBean.java              |  5 -----
 ebean-core/src/test/resources/ebean.mf                |  1 +
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBean.java b/ebean-api/src/main/java/io/ebean/bean/EntityBean.java
index 03d1195c8..ee54991ad 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBean.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBean.java
@@ -27,17 +27,6 @@ public interface EntityBean extends Serializable {
     throw new NotEnhancedException();
   }
 
-  /**
-   * Return the enhancement marker value.
-   * <p>
-   * This is the class name of the enhanced class and used to check that all
-   * entity classes are enhanced (specifically not just a super class).
-   * </p>
-   */
-  default String _ebean_getMarker() {
-    throw new NotEnhancedException();
-  }
-
   /**
    * Create and return a new entity bean instance.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
index 366ba5a97..49dfccdc8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
@@ -28,11 +28,6 @@ class ElementEntityBean implements EntityBean {
     return properties[pos];
   }
 
-  @Override
-  public String _ebean_getMarker() {
-    return null;
-  }
-
   @Override
   public Object _ebean_newInstance() {
     return new ElementEntityBean(properties);
diff --git a/ebean-core/src/test/resources/ebean.mf b/ebean-core/src/test/resources/ebean.mf
index c18791604..7d34f1de5 100644
--- a/ebean-core/src/test/resources/ebean.mf
+++ b/ebean-core/src/test/resources/ebean.mf
@@ -3,4 +3,5 @@ profile-location: true
 entity-packages: org,misc
 transactional-packages: org
 querybean-packages: none
+synthetic: false
 

From a4708770175ef160426d8dd479a9f924656e2301 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 14:52:49 +1200
Subject: [PATCH 320/447] Update kotlin-querybean-generator pom to make kotlin
 in IntelliJ happy

---
 kotlin-querybean-generator/pom.xml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 9b257b3b3..c3a487ecf 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
@@ -12,7 +13,7 @@
   <artifactId>kotlin-querybean-generator</artifactId>
 
   <properties>
-    <kotlin.version>1.5.0</kotlin.version>
+    <kotlin.version>1.5.30-M1</kotlin.version>
   </properties>
 
   <dependencies>
@@ -51,7 +52,7 @@
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
       <version>${kotlin.version}</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -111,10 +112,23 @@
               </annotationProcessorPaths>
             </configuration>
           </execution>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <source>src/main/java</source>
+                <source>target/generated-sources/kapt/test</source>
+                <source>target/generated-sources/kaptKotlin/test</source>
+              </sourceDirs>
+            </configuration>
+          </execution>
         </executions>
         <configuration>
           <jvmTarget>1.8</jvmTarget>
-<!--          <args></args>-->
         </configuration>
       </plugin>
       <plugin>
@@ -133,6 +147,13 @@
               <goal>testCompile</goal>
             </goals>
           </execution>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
         </executions>
         <configuration>
           <source>1.8</source>

From 03004452ac7e0dc08c897e1807139e976bc5f9fe Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 14:53:32 +1200
Subject: [PATCH 321/447] ebean.mf set back to synthetic: true

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

diff --git a/ebean-core/src/test/resources/ebean.mf b/ebean-core/src/test/resources/ebean.mf
index 7d34f1de5..fc2fd6902 100644
--- a/ebean-core/src/test/resources/ebean.mf
+++ b/ebean-core/src/test/resources/ebean.mf
@@ -3,5 +3,5 @@ profile-location: true
 entity-packages: org,misc
 transactional-packages: org
 querybean-packages: none
-synthetic: false
+synthetic: true
 

From c43e2e695686d861f8d4982f52f28f73bd27d99f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 15:34:54 +1200
Subject: [PATCH 322/447] Update TestDbJson_Jackson3

---
 .../org/tests/json/TestDbJson_Jackson3.java   | 62 +++++++++++++++++++
 .../tests/model/json/EBasicJsonJackson3.java  | 21 ++++++-
 2 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 2f74be109..145790457 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -164,4 +164,66 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     BeanState state = DB.getBeanState(found);
     assertThat(state.getChangedProps()).containsExactlyInAnyOrder("beanList");
   }
+
+  @Test
+  public void update_with_differentDbJsonSettings() {
+    PlainBeanDirtyAware contentBean1 = new PlainBeanDirtyAware("x", 42);
+    PlainBeanDirtyAware contentBean2 = new PlainBeanDirtyAware("y", 43);
+    PlainBeanDirtyAware contentBean3 = new PlainBeanDirtyAware("z", 44);
+
+    EBasicJsonJackson3 bean = new EBasicJsonJackson3();
+    bean.setName("b1");
+    bean.setPlainValue(contentBean1);
+    bean.setPlainValue2(contentBean2);
+    bean.setPlainValue3(contentBean3);
+
+    BeanState state = DB.getBeanState(bean);
+    // a new bean is not considered as dirty (thus have no changed props)
+    assertThat(state.isDirty()).isFalse();
+    assertThat(state.isNewOrDirty()).isTrue();
+    assertThat(state.getChangedProps()).isEmpty();
+
+    bean.save();
+
+    bean = DB.find(EBasicJsonJackson3.class, bean.getId());
+    state = DB.getBeanState(bean);
+    // a fresh loaded bean is also not considered as dirty
+    assertThat(state.isDirty()).isFalse();
+    assertThat(state.isNewOrDirty()).isFalse();
+    assertThat(state.getChangedProps()).isEmpty();
+
+    bean.getPlainValue().setName("a"); // has keepSource=true
+
+    assertThat(state.isDirty()).isTrue();
+    assertThat(state.getChangedProps()).containsExactly("plainValue");
+
+    bean.getPlainValue2().setName("b");
+    assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainValue", "plainValue2");
+
+    bean.getPlainValue3().setName("c"); // has dirtyDetection = false
+
+    Map<String, ValuePair> dirtyValues = state.getDirtyValues();
+    assertThat(dirtyValues).hasSize(2).containsKeys("plainValue", "plainValue2");
+
+    assertThat(dirtyValues.get("plainValue")).hasToString("name:a,name:x"); // SOURCE -> origValue present
+    assertThat(dirtyValues.get("plainValue2")).hasToString("name:b,null");  // without SOURCE no origValue present
+
+    LoggedSql.start();
+    bean.save();
+    List<String> sql = LoggedSql.collect();
+    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set plain_value=?, plain_value2=?, version=? where id=?");
+
+    bean = DB.find(EBasicJsonJackson3.class, bean.getId());
+    LoggedSql.collect(); // ignore the select
+    assertThat(bean.getPlainValue().getName()).isEqualTo("a");
+    assertThat(bean.getPlainValue2().getName()).isEqualTo("b");
+    assertThat(bean.getPlainValue3().getName()).isEqualTo("z"); // value is not updated
+
+    bean.getPlainValue3().setName("c");
+    bean.getPlainValue3().setMarkedDirty(true); // This is ignored because it is MutationDetection.NONE
+    bean.save();
+    // no update as plainValue3 has MutationDetection.NONE (ModifyAwareType = NONE isn't an expected combination to me)
+    assertThat(LoggedSql.collect()).isEmpty();
+    LoggedSql.stop();
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java
index 45375b516..cee12d9e7 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java
@@ -2,11 +2,15 @@ package org.tests.model.json;
 
 import io.ebean.Model;
 import io.ebean.annotation.DbJson;
+import io.ebean.annotation.MutationDetection;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
 
+import static io.ebean.annotation.MutationDetection.NONE;
+import static io.ebean.annotation.MutationDetection.SOURCE;
+
 @Entity
 public class EBasicJsonJackson3 extends Model {
 
@@ -15,12 +19,15 @@ public class EBasicJsonJackson3 extends Model {
 
   String name;
 
-  @DbJson(length = 500)
+  @DbJson(length = 500, mutationDetection = SOURCE)
   PlainBeanDirtyAware plainValue;
 
   @DbJson(length = 500)
   PlainBeanDirtyAware plainValue2;
-  
+
+  @DbJson(length = 500, mutationDetection = NONE)
+  PlainBeanDirtyAware plainValue3;
+
   @Version
   long version;
 
@@ -55,7 +62,15 @@ public class EBasicJsonJackson3 extends Model {
   public void setPlainValue2(PlainBeanDirtyAware plainValue2) {
     this.plainValue2 = plainValue2;
   }
-  
+
+  public PlainBeanDirtyAware getPlainValue3() {
+    return plainValue3;
+  }
+
+  public void setPlainValue3(PlainBeanDirtyAware plainValue3) {
+    this.plainValue3 = plainValue3;
+  }
+
   public long getVersion() {
     return version;
   }

From ea741d01699d107f7f88fed1057c91abe2d578c4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 15:41:52 +1200
Subject: [PATCH 323/447] Update TestDbJson_Jackson3 with comments

---
 .../src/test/java/org/tests/json/TestDbJson_Jackson3.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index 145790457..ac10f2a16 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -66,7 +66,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     found.setName("b1-mod2");
     found.getPlainValue().setName("b");
-    found.getPlainValue().setMarkedDirty(true);
+    // found.getPlainValue().setMarkedDirty(true); // Irrelevant for SOURCE or HASH based mutation detection
 
     found.save();
 
@@ -192,7 +192,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     assertThat(state.isNewOrDirty()).isFalse();
     assertThat(state.getChangedProps()).isEmpty();
 
-    bean.getPlainValue().setName("a"); // has keepSource=true
+    bean.getPlainValue().setName("a"); // has SOURCE
 
     assertThat(state.isDirty()).isTrue();
     assertThat(state.getChangedProps()).containsExactly("plainValue");
@@ -200,7 +200,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     bean.getPlainValue2().setName("b");
     assertThat(state.getChangedProps()).containsExactlyInAnyOrder("plainValue", "plainValue2");
 
-    bean.getPlainValue3().setName("c"); // has dirtyDetection = false
+    bean.getPlainValue3().setName("c"); // has mutationDetection = NONE
 
     Map<String, ValuePair> dirtyValues = state.getDirtyValues();
     assertThat(dirtyValues).hasSize(2).containsKeys("plainValue", "plainValue2");

From ca1636ff9edb0c22177875af8d5f26643ccba83c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 17:16:05 +1200
Subject: [PATCH 324/447] Fix when json/jackson bean inserted as null and not
 changed

Expectation is that it is not included in update (still null, no change)
---
 .../server/deploy/BeanPropertyJsonMapper.java |  3 +++
 .../model/json/TestJacksonPlainBean.java      | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index c9280c8c0..bc7392287 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -57,6 +57,9 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     final String json = scalarType.format(value);
     final MutableValueInfo oldHash = ebi.mutableInfo(propertyIndex);
     if (oldHash == null) {
+      if (value == null) {
+        return false; // no change, still null
+      }
       ebi.mutableNext(propertyIndex, next(json));
       return true;
     }
diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
index c0fe82b26..24f0a35f8 100644
--- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
+++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
@@ -10,6 +10,31 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJacksonPlainBean {
 
+  @Test
+  public void insertNullStayNull() {
+
+    // insert with jackson beans as null
+    EBasicPlain bean = new EBasicPlain();
+    bean.setAttr("n0");
+    DB.save(bean);
+
+    LoggedSqlCollector.start();
+    bean.setAttr("n1");
+    DB.save(bean);
+    expectedSql(0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+
+    bean.setPlainBean(new PlainBean("x", 1));
+    DB.save(bean);
+    expectedSql(0, "update ebasic_plain set plain_bean=?, version=? where id=? and version=?");
+
+    final EBasicPlain found = DB.find(EBasicPlain.class, bean.getId());
+    found.setAttr("n2");
+    DB.save(found);
+    expectedSql(1, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+
+    LoggedSqlCollector.stop();
+  }
+
   @Test
   public void insertUpdate() {
 

From 7bd7640c631e586c953439ec60104e66baa52330 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 17:18:28 +1200
Subject: [PATCH 325/447] Update test TestDbJson_Jackson3 showing HASH mode is
 used even on ModifyAwareType

---
 .../src/test/java/org/tests/json/TestDbJson_Jackson3.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index ac10f2a16..bc89a0eb5 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -224,6 +224,12 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     bean.save();
     // no update as plainValue3 has MutationDetection.NONE (ModifyAwareType = NONE isn't an expected combination to me)
     assertThat(LoggedSql.collect()).isEmpty();
+
+    bean.getPlainValue2().setName("b2"); // effectively HASH mode mutation detection
+    bean.save();
+    sql = LoggedSql.collect();
+    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set plain_value2=?, version=? where id=? and version=?");
+
     LoggedSql.stop();
   }
 }

From d9f7531e81ee29459aab29386cfb6eb34baf637d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 17:26:46 +1200
Subject: [PATCH 326/447] Tidy tests only - TestDbJson_Jackson3
 TestJacksonPlainBean

---
 .../org/tests/json/TestDbJson_Jackson3.java   | 33 ++++++++-----------
 .../model/json/TestJacksonPlainBean.java      | 14 ++++----
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index bc89a0eb5..c1cc3c40d 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -59,20 +59,15 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     LoggedSql.start();
     found.save();
-
-    List<String> sql = LoggedSql.collect();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set name=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_json_jackson3 set name=?, version=? where id=? and version=?");
 
     found.setName("b1-mod2");
     found.getPlainValue().setName("b");
     // found.getPlainValue().setMarkedDirty(true); // Irrelevant for SOURCE or HASH based mutation detection
 
     found.save();
-
-    sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set name=?, plain_value=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_json_jackson3 set name=?, plain_value=?, version=? where id=? and version=?");
+    LoggedSql.stop();
 
     final EBasicJsonJackson3 found2 = DB.find(EBasicJsonJackson3.class, bean.getId());
 
@@ -112,20 +107,16 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     LoggedSql.start();
     DB.save(found);
 
-    List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
     // plain_bean=?, no longer included with MD5 dirty detection
-    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
+    expectedSql(0, "update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
 
     assertThat(EBasicJsonListPersistController.updatedValues.entrySet())
       .extracting(Map.Entry::toString)
       .containsExactlyInAnyOrder("beanList=null,[name:a]","name=p1-mod,p1","version=2,1");
 
-
     assertThat(DB.getBeanState(found).isDirty()).isFalse();
 
     found.getPlainBean().setName("b");
-
     assertThat(DB.getBeanState(found).isDirty()).isTrue();
 
     state = DB.getBeanState(found);
@@ -138,14 +129,14 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     LoggedSql.start();
     DB.save(found);
 
-    sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
     // plain_bean=?, no longer included with MD5 dirty detection
-    assertThat(sql.get(0)).contains("update ebasic_json_list set plain_bean=?, version=? where id=?");
+    expectedSql(0, "update ebasic_json_list set plain_bean=?, version=? where id=?");
 
     assertThat(EBasicJsonListPersistController.updatedValues.entrySet())
       .extracting(Map.Entry::toString)
       .containsExactlyInAnyOrder("plainBean=name:b,name:a", "version=3,2");
+
+    LoggedSql.stop();
   }
 
   @Test
@@ -210,8 +201,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     LoggedSql.start();
     bean.save();
-    List<String> sql = LoggedSql.collect();
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set plain_value=?, plain_value2=?, version=? where id=?");
+    expectedSql(0, "update ebasic_json_jackson3 set plain_value=?, plain_value2=?, version=? where id=?");
 
     bean = DB.find(EBasicJsonJackson3.class, bean.getId());
     LoggedSql.collect(); // ignore the select
@@ -227,9 +217,12 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     bean.getPlainValue2().setName("b2"); // effectively HASH mode mutation detection
     bean.save();
-    sql = LoggedSql.collect();
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set plain_value2=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_json_jackson3 set plain_value2=?, version=? where id=? and version=?");
 
     LoggedSql.stop();
   }
+
+  private void expectedSql(int i, String s) {
+    assertThat(LoggedSql.collect().get(i)).contains(s);
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
index 24f0a35f8..b2237731d 100644
--- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
+++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
@@ -1,11 +1,9 @@
 package org.tests.model.json;
 
 import io.ebean.DB;
-import org.ebeantest.LoggedSqlCollector;
+import io.ebeantest.LoggedSql;
 import org.junit.Test;
 
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJacksonPlainBean {
@@ -18,7 +16,7 @@ public class TestJacksonPlainBean {
     bean.setAttr("n0");
     DB.save(bean);
 
-    LoggedSqlCollector.start();
+    LoggedSql.start();
     bean.setAttr("n1");
     DB.save(bean);
     expectedSql(0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
@@ -32,14 +30,14 @@ public class TestJacksonPlainBean {
     DB.save(found);
     expectedSql(1, "update ebasic_plain set attr=?, version=? where id=? and version=?");
 
-    LoggedSqlCollector.stop();
+    LoggedSql.stop();
   }
 
   @Test
   public void insertUpdate() {
 
     DB.getDefault();
-    LoggedSqlCollector.start();
+    LoggedSql.start();
 
     PlainBean content = new PlainBean("foo", 42);
     EBasicPlain bean = new EBasicPlain();
@@ -87,11 +85,11 @@ public class TestJacksonPlainBean {
     DB.save(found);
     expectedSql(0, "update ebasic_plain set plain_bean2=?, version=? where id=? and version=?");
 
-    LoggedSqlCollector.stop();
+    LoggedSql.stop();
   }
 
   private void expectedSql(int i, String s) {
-    assertThat(LoggedSqlCollector.current().get(i)).contains(s);
+    assertThat(LoggedSql.collect().get(i)).contains(s);
   }
 
 }

From ceea705a76a8eb72132c6ec1019e2eb833f2e166 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 20:20:03 +1200
Subject: [PATCH 327/447] Treat json Jackson collections the same wrt mutation
 detection

---
 .../java/io/ebean/config/DatabaseConfig.java  |  27 -----
 .../server/type/DefaultTypeManager.java       |   6 +-
 .../server/type/InitObjectMapper.java         |  22 ++++
 .../type/ScalarTypeJsonObjectMapper.java      | 102 ++----------------
 .../server/type/TypeJsonManager.java          |  46 +-------
 .../io/ebean/config/ServerConfigTest.java     |   4 -
 .../java/org/tests/json/TestDbJson_List.java  |  14 +--
 .../org/tests/model/json/EBasicJsonList.java  |   1 +
 8 files changed, 41 insertions(+), 181 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index bc3ae587f..476007ebe 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -193,12 +193,6 @@ public class DatabaseConfig {
    */
   private JsonConfig.Include jsonInclude = JsonConfig.Include.ALL;
 
-  /**
-   * When true then by default DbJson beans are assumed to be dirty.
-   * I believe we want to change this default to false in the future.
-   */
-  private boolean jsonDirtyByDefault = true;
-
   /**
    * The database platform name. Used to imply a DatabasePlatform to use.
    */
@@ -743,26 +737,6 @@ public class DatabaseConfig {
     this.jsonInclude = jsonInclude;
   }
 
-  /**
-   * Return true if DbJson beans are assumed dirty by default.
-   * <p>
-   * That is, when true beans that do not implement ModifyAwareType are by
-   * default assumed to be dirty and included in updates.
-   */
-  public boolean isJsonDirtyByDefault() {
-    return jsonDirtyByDefault;
-  }
-
-  /**
-   * Set to false if we want DbJson beans to not be assumed to be dirty.
-   * <p>
-   * That is, when true beans that do not implement ModifyAwareType are by
-   * default assumed to be dirty and included in updates.
-   */
-  public void setJsonDirtyByDefault(boolean jsonDirtyByDefault) {
-    this.jsonDirtyByDefault = jsonDirtyByDefault;
-  }
-
   /**
    * Return the name of the Database.
    */
@@ -2935,7 +2909,6 @@ public class DatabaseConfig {
     jsonInclude = p.getEnum(JsonConfig.Include.class, "jsonInclude", jsonInclude);
     jsonDateTime = p.getEnum(JsonConfig.DateTime.class, "jsonDateTime", jsonDateTime);
     jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);
-    jsonDirtyByDefault = p.getBoolean("jsonDirtyByDefault", jsonDirtyByDefault);
 
     runMigration = p.getBoolean("migration.run", runMigration);
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 28999e838..8ffb15372 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -134,7 +134,7 @@ public final class DefaultTypeManager implements TypeManager {
     this.postgres = isPostgres(config.getDatabasePlatform());
     this.objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
     this.objectMapper = (objectMapperPresent) ? initObjectMapper(config) : null;
-    this.jsonManager = (objectMapperPresent) ? new TypeJsonManager(postgres, objectMapper, config.isJsonDirtyByDefault()) : null;
+    this.jsonManager = (objectMapperPresent) ? new TypeJsonManager(postgres, objectMapper) : null;
     this.extraTypeFactory = new DefaultTypeFactory(config);
     this.arrayTypeListFactory = arrayTypeListFactory(config.getDatabasePlatform());
     this.arrayTypeSetFactory = arrayTypeSetFactory(config.getDatabasePlatform());
@@ -556,7 +556,7 @@ public final class DefaultTypeManager implements TypeManager {
       // no override or further mapping required
       return scalarType;
     }
-    ScalarTypeEnum<?> scalarEnum = (ScalarTypeEnum<?>)scalarType;
+    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)");
@@ -673,7 +673,7 @@ public final class DefaultTypeManager implements TypeManager {
   private Object initObjectMapper(DatabaseConfig config) {
     Object objectMapper = config.getObjectMapper();
     if (objectMapper == null) {
-      objectMapper = new ObjectMapper();
+      objectMapper = InitObjectMapper.init();
       config.setObjectMapper(objectMapper);
     }
     return objectMapper;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java
new file mode 100644
index 000000000..90a86ec79
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java
@@ -0,0 +1,22 @@
+package io.ebeaninternal.server.type;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * Initialise the Jackson ObjectMapper.
+ */
+class InitObjectMapper {
+
+  /**
+   * Create and return the default ObjectMapper.
+   */
+  static Object init() {
+    SimpleModule module = new SimpleModule();
+    module.addAbstractTypeMapping(Set.class, LinkedHashSet.class);
+    return new ObjectMapper().registerModule(module);
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 7fb3aa4b4..334f4b232 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -13,9 +13,6 @@ import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
-import io.ebeaninternal.json.ModifyAwareList;
-import io.ebeaninternal.json.ModifyAwareMap;
-import io.ebeaninternal.json.ModifyAwareSet;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 import javax.persistence.PersistenceException;
@@ -24,9 +21,6 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * Supports @DbJson properties using Jackson ObjectMapper.
@@ -38,25 +32,14 @@ class ScalarTypeJsonObjectMapper {
    */
   static ScalarType<?> createTypeFor(TypeJsonManager jsonManager, DeployBeanProperty prop, int dbType, DocPropertyType docType) {
     AnnotatedField field = (AnnotatedField) prop.getJacksonField();
-    Class<?> type = field.getRawType();
-
     MutationDetection mode = prop.getMutationDetection();
     if (mode == MutationDetection.NONE) {
-      return new NoMutationDetection(jsonManager, field, dbType, type);
+      return new NoMutationDetection(jsonManager, field, dbType, docType);
     } else if (mode != MutationDetection.DEFAULT) {
-      return new GenericObject(jsonManager, field, dbType, type);
-    }
-    if (Set.class.equals(type)) {
-      return new OmSet(jsonManager, field, dbType, docType);
-    }
-    if (List.class.equals(type)) {
-      return new OmList(jsonManager, field, dbType, docType);
-    }
-    if (Map.class.equals(type)) {
-      return new OmMap(jsonManager, field, dbType);
+      return new GenericObject(jsonManager, field, dbType, docType);
     }
     prop.setMutationDetection(MutationDetection.HASH);
-    return new GenericObject(jsonManager, field, dbType, type);
+    return new GenericObject(jsonManager, field, dbType, docType);
   }
 
   /**
@@ -64,8 +47,8 @@ class ScalarTypeJsonObjectMapper {
    */
   private static class NoMutationDetection extends Base<Object> {
 
-    NoMutationDetection(TypeJsonManager jsonManager, AnnotatedField field, int dbType, Class<?> rawType) {
-      super(Object.class, jsonManager, field, dbType, DocPropertyType.OBJECT, rawType);
+    NoMutationDetection(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+      super(Object.class, jsonManager, field, dbType, docType);
     }
 
     @Override
@@ -84,8 +67,8 @@ class ScalarTypeJsonObjectMapper {
    */
   private static class GenericObject extends Base<Object> {
 
-    GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, Class<?> rawType) {
-      super(Object.class, jsonManager, field, dbType, DocPropertyType.OBJECT, rawType);
+    GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+      super(Object.class, jsonManager, field, dbType, docType);
     }
 
     @Override
@@ -128,60 +111,6 @@ class ScalarTypeJsonObjectMapper {
     }
   }
 
-  /**
-   * Type for Sets wrapping the ObjectMapper Set as a ModifyAwareSet.
-   */
-  @SuppressWarnings("rawtypes")
-  private static class OmSet extends Base<Set> {
-
-    OmSet(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
-      super(Set.class, jsonManager, field, dbType, docType);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Set read(DataReader reader) throws SQLException {
-      Set value = super.read(reader);
-      return value == null ? null : new ModifyAwareSet(value);
-    }
-  }
-
-  /**
-   * Type for Lists wrapping the ObjectMapper List as a ModifyAwareList.
-   */
-  @SuppressWarnings("rawtypes")
-  private static class OmList extends Base<List> {
-
-    OmList(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
-      super(List.class, jsonManager, field, dbType, docType);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List read(DataReader reader) throws SQLException {
-      List value = super.read(reader);
-      return value == null ? null : new ModifyAwareList(value);
-    }
-  }
-
-  /**
-   * Type for Map wrapping the ObjectMapper Map as a ModifyAwareMap.
-   */
-  @SuppressWarnings("rawtypes")
-  private static class OmMap extends Base<Map> {
-
-    OmMap(TypeJsonManager jsonManager, AnnotatedField field, int dbType) {
-      super(Map.class, jsonManager, field, dbType, DocPropertyType.OBJECT);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map read(DataReader reader) throws SQLException {
-      Map value = super.read(reader);
-      return value == null ? null : new ModifyAwareMap(value);
-    }
-  }
-
   /**
    * ScalarType that uses Jackson ObjectMapper to marshall/unmarshall to/from JSON
    * and storing them in one of JSON, JSONB, VARCHAR, CLOB or BLOB.
@@ -193,39 +122,22 @@ class ScalarTypeJsonObjectMapper {
     protected final JavaType deserType;
     protected final String pgType;
     private final DocPropertyType docType;
-    private final TypeJsonManager.DirtyHandler dirtyHandler;
 
     Base(Class<T> cls, TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
-      this(cls, jsonManager, field, dbType, docType, cls);
-    }
-
-    Base(Class<T> cls, TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType, Class<?> rawType) {
       super(cls, false, dbType);
       this.objectReader = jsonManager.objectMapper();
       this.pgType = jsonManager.postgresType(dbType);
       this.docType = docType;
-      this.dirtyHandler = jsonManager.dirtyHandler(cls, rawType);
       final JacksonTypeHelper helper = new JacksonTypeHelper(field, objectReader);
       this.deserType = helper.type();
       this.objectWriter = helper.objectWriter();
     }
 
-    /**
-     * Consider as a mutable type. Use the isDirty() method to check for dirty state.
-     */
     @Override
     public boolean isMutable() {
       return true;
     }
 
-    /**
-     * Return true if the value should be considered dirty (and included in an update).
-     */
-    @Override
-    public boolean isDirty(Object value) {
-      return dirtyHandler.isDirty(value);
-    }
-
     @Override
     public T read(DataReader reader) throws SQLException {
       String json = reader.getString();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
index baea26dec..9cc0b5f0d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
@@ -2,25 +2,16 @@ package io.ebeaninternal.server.type;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.ModifyAwareType;
-import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DbPlatformType;
 
 class TypeJsonManager {
 
-  interface DirtyHandler {
-    boolean isDirty(Object value);
-  }
-
   private final boolean postgres;
   private final ObjectMapper objectMapper;
-  private final DirtyHandler defaultHandler;
-  private final DirtyHandler modifyAwareHandler;
 
-  TypeJsonManager(boolean postgres, Object objectMapper, boolean defaultDirty) {
+  TypeJsonManager(boolean postgres, Object objectMapper) {
     this.postgres = postgres;
     this.objectMapper = (ObjectMapper) objectMapper;
-    this.defaultHandler = new DefaultHandler(defaultDirty);
-    this.modifyAwareHandler = new ModifyAwareHandler();
   }
 
   ObjectMapper objectMapper() {
@@ -39,17 +30,6 @@ class TypeJsonManager {
     return null;
   }
 
-  /**
-   * Return the DirtyHandler to use.
-   */
-  DirtyHandler dirtyHandler(Class<?> cls, Class<?> rawType) {
-    if (!Object.class.equals(cls) || ModifyAwareType.class.isAssignableFrom(rawType)) {
-      // Set, List and Map are modify aware
-      return modifyAwareHandler;
-    }
-    return defaultHandler;
-  }
-
   /**
    * Return true if the value should be considered dirty (and included in an update).
    */
@@ -71,28 +51,4 @@ class TypeJsonManager {
     }
   }
 
-  static final class ModifyAwareHandler implements DirtyHandler {
-    @Override
-    public boolean isDirty(Object value) {
-      return checkModifyAware(value);
-    }
-  }
-
-  /**
-   * Effectively constant based on {@link DatabaseConfig#isJsonDirtyByDefault()}
-   */
-  static final class DefaultHandler implements DirtyHandler {
-
-    private final boolean dirty;
-
-    DefaultHandler(boolean dirty) {
-      this.dirty = dirty;
-    }
-
-    @Override
-    public boolean isDirty(Object value) {
-      return dirty;
-    }
-  }
-
 }
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
index dde2cb216..55eb1f06e 100644
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -104,9 +104,6 @@ public class ServerConfigTest {
     assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
     assertEquals(JsonConfig.DateTime.MILLIS, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.MILLIS, serverConfig.getJsonDate());
-    assertFalse(serverConfig.isJsonDirtyByDefault());
-    serverConfig.setJsonDirtyByDefault(true);
-    assertTrue(serverConfig.isJsonDirtyByDefault());
 
     assertEquals("r0,users,orgs", serverConfig.getEnabledL2Regions());
 
@@ -159,7 +156,6 @@ public class ServerConfigTest {
     assertFalse(serverConfig.isIdGeneratorAutomatic());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
-    assertTrue(serverConfig.isJsonDirtyByDefault());
     assertTrue(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
     assertTrue(serverConfig.isAutoLoadModuleInfo());
 
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index f43d6f23c..13e85a160 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -76,10 +76,11 @@ public class TestDbJson_List extends BaseTestCase {
     update_when_dirty();
     update_when_dirty_flags();
     update_when_dirty_SetListMap();
+
+    DB.delete(found);
   }
 
-  //@Test//(dependsOnMethods = "insert")
-  public void json_parse_format() {
+  private void json_parse_format() {
 
     String asJson = DB.json().toJson(found);
     assertThat(asJson).contains("\"tags\":[\"one\",\"two\"]");
@@ -104,8 +105,7 @@ public class TestDbJson_List extends BaseTestCase {
     assertThat(fromJson.getBeanMap()).hasSize(2);
   }
 
-  //@Test//(dependsOnMethods = "insert")
-  public void update_when_notDirty() {
+  private void update_when_notDirty() {
 
     found.setName("mod");
     LoggedSqlCollector.start();
@@ -117,7 +117,7 @@ public class TestDbJson_List extends BaseTestCase {
     assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, version=? where");
   }
 
-  public void update_when_dirty() {
+  private void update_when_dirty() {
 
     //found.setName("modAgain");
     found.getTags().add("three");
@@ -131,7 +131,7 @@ public class TestDbJson_List extends BaseTestCase {
     assertSql(sql.get(0)).contains("update ebasic_json_list set tags=?, version=? where id=? and version=?");
   }
 
-  public void update_when_dirty_flags() {
+  private void update_when_dirty_flags() {
 
     //found.setName("modAgain");
     found.getFlags().remove(42L);
@@ -145,7 +145,7 @@ public class TestDbJson_List extends BaseTestCase {
     assertSql(sql.get(0)).contains("update ebasic_json_list set flags=?, version=? where id=? and version=?;");
   }
 
-  public void update_when_dirty_SetListMap() {
+  private void update_when_dirty_SetListMap() {
 
     //found.setName("modAgain");
     found.getBeanSet().clear();
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
index f76d282f7..885e85bf8 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java
@@ -20,6 +20,7 @@ public class EBasicJsonList {
 
   String name;
 
+  // @JsonDeserialize(as=LinkedHashSet.class)
   @DbJson(length = 700, name = "beans")
   Set<PlainBean> beanSet;
 

From 2691221168c83dc155fb0cd401f7c58cef25576d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 22:53:51 +1200
Subject: [PATCH 328/447] #2278 - Do not override empty json collections, when
 database value is null

---
 .../ebeaninternal/server/deploy/BeanProperty.java   | 13 +++++++++++++
 .../server/deploy/BeanPropertyJsonMapper.java       |  3 +++
 .../test/java/org/tests/json/TestDbJson_List.java   |  3 +--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index a33d183ea..d564a1f7a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -50,6 +50,7 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -623,9 +624,21 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return scalarType.read(reader);
   }
 
+  protected Object checkForEmpty(EntityBean bean) {
+    final Object value = getValue(bean);
+    if (value instanceof Collection && ((Collection<?>) value).isEmpty()
+      || value instanceof Map && ((Map<?, ?>) value).isEmpty()) {
+      return value;
+    }
+    return null;
+  }
+
   public Object readSet(DataReader reader, EntityBean bean) throws SQLException {
     try {
       Object value = scalarType.read(reader);
+      if (value == null) {
+        value = checkForEmpty(bean);
+      }
       if (bean != null) {
         setValue(bean, value);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index bc7392287..0b7cdebbc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -76,6 +76,9 @@ public class BeanPropertyJsonMapper extends BeanProperty {
   public Object readSet(DataReader reader, EntityBean bean) throws SQLException {
     try {
       Object value = scalarType.read(reader);
+      if (value == null) {
+        value = checkForEmpty(bean);
+      }
       if (bean != null) {
         setValue(bean, value);
         String json = reader.popJson();
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index 8378888b2..647aa6eff 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -234,8 +234,7 @@ public class TestDbJson_List extends BaseTestCase {
     bean.setBeanMap(null);
     DB.save(bean);
 
-    bean = DB.find(EBasicJsonList.class)
-      .setId(bean.getId()).findOne();
+    bean = DB.find(EBasicJsonList.class).setId(bean.getId()).findOne();
 
     assertThat(bean.getFlags()).isEmpty();
     assertThat(bean.getTags()).isEmpty();

From 443e826f618b0ea35b53fb5b4b004d52912d6e4e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 23:22:06 +1200
Subject: [PATCH 329/447] #2278 - Embedded bean override with DbJson property

---
 .../deploy/BeanEmbeddedMetaFactory.java       |  6 +-----
 .../server/deploy/BeanProperty.java           | 11 +++++-----
 .../server/deploy/BeanPropertyAssocOne.java   | 20 +++++++++----------
 .../server/deploy/BeanPropertyJsonMapper.java | 10 ++++++++++
 .../org/tests/model/embedded/EAddress.java    | 14 +++++++++++++
 .../org/tests/model/embedded/EPerson.java     |  3 ++-
 .../nativesql/TestNativeWithEmbedded.java     | 11 ++++++----
 7 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index af6e7b9e4..5def0dc64 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -42,11 +42,7 @@ class BeanEmbeddedMetaFactory {
       int dbScale = dbScale(column, sourceProperties[i]);
       String colDefn = getDbColumnDefn(column, sourceProperties[i]);
       BeanPropertyOverride overrides = new BeanPropertyOverride(dbColumn, dbNullable, dbLength, dbScale, colDefn);
-      if (sourceProperties[i] instanceof BeanPropertyAssocOne) {
-        embeddedProperties[i] = new BeanPropertyAssocOne((BeanPropertyAssocOne)sourceProperties[i], overrides);
-      } else {
-        embeddedProperties[i] = new BeanProperty(sourceProperties[i], overrides);
-      }
+      embeddedProperties[i] = sourceProperties[i].override(overrides);
     }
 
     return new BeanEmbeddedMeta(embeddedProperties);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index d564a1f7a..ad054c59b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -365,13 +365,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return InternString.intern(s);
   }
 
+  public BeanProperty override(BeanPropertyOverride override) {
+    return new BeanProperty(this, override);
+  }
+
   /**
-   * Create a Matching BeanProperty with some attributes overridden.
-   * <p>
-   * Primarily for supporting Embedded beans with overridden dbColumn
-   * mappings.
+   * Create a Matching BeanProperty with some attributes overridden for Embedded beans.
    */
-  public BeanProperty(BeanProperty source, BeanPropertyOverride override) {
+  protected BeanProperty(BeanProperty source, BeanPropertyOverride override) {
     this.descriptor = source.descriptor;
     this.propertyIndex = source.propertyIndex;
     this.name = source.getName();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index ca81267eb..9a69b8c9c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -94,10 +94,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
-  /**
-   * Copy constructor for ManyToOne inside Embeddable.
-   */
-  public BeanPropertyAssocOne(BeanPropertyAssocOne source, BeanPropertyOverride override) {
+  @Override
+  public BeanPropertyAssocOne<?> override(BeanPropertyOverride override) {
+    return new BeanPropertyAssocOne<>(this, override);
+  }
+
+  protected BeanPropertyAssocOne(BeanPropertyAssocOne<T> source, BeanPropertyOverride override) {
     super(source, override);
     primaryKeyExport = source.primaryKeyExport;
     primaryKeyJoin = source.primaryKeyJoin;
@@ -255,12 +257,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   private SqlUpdate deleteByParentIdList(List<Object> parentIds) {
-
-    StringBuilder sb = new StringBuilder(100);
-    sb.append(deleteByParentIdInSql);
-    sb.append(targetIdBinder.getIdInValueExpr(false, parentIds.size()));
-
-    DefaultSqlUpdate delete = new DefaultSqlUpdate(sb.toString());
+    String sql = deleteByParentIdInSql + targetIdBinder.getIdInValueExpr(false, parentIds.size());
+    DefaultSqlUpdate delete = new DefaultSqlUpdate(sql);
     bindParentIds(delete, parentIds);
     return delete;
   }
@@ -501,7 +499,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return targetDescriptor.getIdProperty();
   }
 
-  ScalarType getIdScalarType() {
+  ScalarType<?> getIdScalarType() {
     return targetDescriptor.getIdProperty().scalarType;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index 0b7cdebbc..bc13b1a8b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -27,6 +27,16 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     this.sourceDetection = deployProp.getMutationDetection() == MutationDetection.SOURCE;
   }
 
+  private BeanPropertyJsonMapper(BeanPropertyJsonMapper source, BeanPropertyOverride override) {
+    super(source, override);
+    this.sourceDetection = source.sourceDetection;
+  }
+
+  @Override
+  public BeanProperty override(BeanPropertyOverride override) {
+    return new BeanPropertyJsonMapper(this, override);
+  }
+
   @Override
   public MutableValueInfo createMutableInfo(String json) {
     if (sourceDetection) {
diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java
index 86911152b..356399005 100644
--- a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java
+++ b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java
@@ -1,5 +1,8 @@
 package org.tests.model.embedded;
 
+import io.ebean.annotation.DbJson;
+import org.tests.model.json.PlainBean;
+
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.EnumType;
@@ -18,6 +21,9 @@ public class EAddress {
   @Enumerated(EnumType.STRING)
   EAddressStatus status;
 
+  @DbJson
+  PlainBean jbean;
+
   public String getStreet() {
     return street;
   }
@@ -42,6 +48,14 @@ public class EAddress {
     this.city = city;
   }
 
+  public PlainBean getJbean() {
+    return jbean;
+  }
+
+  public void setJbean(PlainBean jbean) {
+    this.jbean = jbean;
+  }
+
   public EAddressStatus getStatus() {
     return status;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java
index 1e85b1041..8a0c60446 100644
--- a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java
+++ b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java
@@ -24,7 +24,8 @@ public class EPerson {
   @Embedded
   @AttributeOverrides({
     @AttributeOverride(name = "city", column = @Column(name = "addr_city")),
-    @AttributeOverride(name = "status", column = @Column(name = "addr_status"))
+    @AttributeOverride(name = "status", column = @Column(name = "addr_status")),
+    @AttributeOverride(name = "jbean", column = @Column(name = "addr_jbean"))
   })
   EAddress address;
 
diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java
index b6e4287a0..09084ccc2 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java
@@ -1,12 +1,13 @@
 package org.tests.rawsql.nativesql;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.embedded.EAddress;
 import org.tests.model.embedded.EPerson;
+import org.tests.model.json.PlainBean;
 
 import java.util.List;
 
@@ -22,20 +23,22 @@ public class TestNativeWithEmbedded extends BaseTestCase {
     EAddress address = new EAddress();
     address.setStreet("1 foo st");
     address.setCity("barv");
+    address.setJbean(new PlainBean("hi", 3));
     person.setAddress(address);
 
-    Ebean.save(person);
+    DB.save(person);
 
-    String sql = "select id, name, street, suburb, addr_city, addr_status from eperson where id = ?";
+    String sql = "select id, name, street, suburb, addr_city, addr_status, addr_jbean from eperson where id = ?";
 
     LoggedSqlCollector.start();
 
-    Query<EPerson> query = Ebean.findNative(EPerson.class, sql);
+    Query<EPerson> query = DB.findNative(EPerson.class, sql);
     query.setParameter(person.getId());
     EPerson one = query.findOne();
 
     assertThat(one.getName()).isEqualTo("Frank");
     assertThat(one.getAddress().getStreet()).isEqualTo("1 foo st");
+    assertThat(one.getAddress().getJbean().getName()).isEqualTo("hi");
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);

From d601a88d827cafdfaa879060e882df1b01370ee4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 30 Jul 2021 23:53:28 +1200
Subject: [PATCH 330/447] #2278 - Move null to empty json collections check to
 BeanPropertyJsonBasic

---
 .../server/deploy/BeanProperty.java           | 14 -----
 .../server/deploy/BeanPropertyJsonBasic.java  | 58 +++++++++++++++++++
 .../server/deploy/BeanPropertyJsonMapper.java |  2 +-
 .../deploy/meta/DeployBeanProperty.java       |  6 +-
 .../deploy/meta/DeployBeanPropertyLists.java  |  3 +
 .../server/deploy/parse/DeployUtil.java       |  3 -
 .../org/tests/model/embedded/EAddress.java    | 12 ++++
 .../model/json/EBasicJsonMapVarchar.java      |  2 +-
 .../nativesql/TestNativeWithEmbedded.java     |  8 ++-
 9 files changed, 85 insertions(+), 23 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index ad054c59b..413d0b460 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -625,27 +625,13 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return scalarType.read(reader);
   }
 
-  protected Object checkForEmpty(EntityBean bean) {
-    final Object value = getValue(bean);
-    if (value instanceof Collection && ((Collection<?>) value).isEmpty()
-      || value instanceof Map && ((Map<?, ?>) value).isEmpty()) {
-      return value;
-    }
-    return null;
-  }
-
   public Object readSet(DataReader reader, EntityBean bean) throws SQLException {
     try {
       Object value = scalarType.read(reader);
-      if (value == null) {
-        value = checkForEmpty(bean);
-      }
       if (bean != null) {
         setValue(bean, value);
       }
       return value;
-    } catch (TextException e) {
-      throw e;
     } catch (Exception e) {
       throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java
new file mode 100644
index 000000000..6593186a6
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java
@@ -0,0 +1,58 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.bean.EntityBean;
+import io.ebean.core.type.DataReader;
+import io.ebean.text.TextException;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+import javax.persistence.PersistenceException;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * A DbJson property that does not use Jackson ObjectMapper.
+ */
+public class BeanPropertyJsonBasic extends BeanProperty {
+
+  public BeanPropertyJsonBasic(BeanDescriptor<?> descriptor, DeployBeanProperty deploy) {
+    super(descriptor, deploy);
+  }
+
+  protected BeanPropertyJsonBasic(BeanProperty source, BeanPropertyOverride override) {
+    super(source, override);
+  }
+
+  @Override
+  public BeanProperty override(BeanPropertyOverride override) {
+    return new BeanPropertyJsonBasic(this, override);
+  }
+
+  protected Object checkForEmpty(EntityBean bean) {
+    final Object value = getValue(bean);
+    if (value instanceof Collection && ((Collection<?>) value).isEmpty()
+      || value instanceof Map && ((Map<?, ?>) value).isEmpty()) {
+      return value;
+    }
+    return null;
+  }
+
+  @Override
+  public Object readSet(DataReader reader, EntityBean bean) throws SQLException {
+    try {
+      Object value = scalarType.read(reader);
+      if (value == null) {
+        value = checkForEmpty(bean);
+      }
+      if (bean != null) {
+        setValue(bean, value);
+      }
+      return value;
+    } catch (TextException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
+    }
+  }
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index bc13b1a8b..fdea2e449 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -18,7 +18,7 @@ import java.util.Objects;
 /**
  * Handle json property with MutationDetection of SOURCE or HASH only.
  */
-public class BeanPropertyJsonMapper extends BeanProperty {
+public class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
 
   private final boolean sourceDetection;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 3da06d559..5e5455b2f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -316,9 +316,6 @@ public class DeployBeanProperty {
   }
 
   public MutationDetection getMutationDetection() {
-    if (mutationDetection == null) {
-      mutationDetection = MutationDetection.DEFAULT;
-    }
     return mutationDetection;
   }
 
@@ -1204,4 +1201,7 @@ public class DeployBeanProperty {
     return scalarType != null && scalarType.isJsonMapper();
   }
 
+  boolean isJsonType() {
+    return mutationDetection != null;
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 90503c93f..5466d5bca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -453,6 +453,9 @@ public class DeployBeanPropertyLists {
     if (deployProp.isJsonMapper()) {
       return new BeanPropertyJsonMapper(desc, deployProp);
     }
+    if (deployProp.isJsonType()) {
+      return new BeanPropertyJsonBasic(desc, deployProp);
+    }
     return new BeanProperty(desc, deployProp);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 0792c66d5..68cb1c741 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -205,9 +205,6 @@ public class DeployUtil {
     }
   }
 
-  /**
-   * This property is marked as a Lob object.
-   */
   void setDbJsonType(DeployBeanProperty prop, DbJson dbJsonType) {
     int dbType = getDbJsonStorage(dbJsonType.storage());
     setDbJsonType(prop, dbType, dbJsonType.length(), dbJsonType.mutationDetection());
diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java
index 356399005..4b737f0f5 100644
--- a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java
+++ b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java
@@ -7,6 +7,7 @@ import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import java.util.Map;
 
 @Embeddable
 public class EAddress {
@@ -24,6 +25,9 @@ public class EAddress {
   @DbJson
   PlainBean jbean;
 
+  @DbJson
+  Map<String, Object> jraw;
+
   public String getStreet() {
     return street;
   }
@@ -56,6 +60,14 @@ public class EAddress {
     this.jbean = jbean;
   }
 
+  public Map<String, Object> getJraw() {
+    return jraw;
+  }
+
+  public void setJraw(Map<String, Object> jraw) {
+    this.jraw = jraw;
+  }
+
   public EAddressStatus getStatus() {
     return status;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java
index c08c4e9fe..2b470ef45 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java
@@ -20,7 +20,7 @@ public class EBasicJsonMapVarchar {
   String name;
 
   @DbJson(storage = DbJsonType.VARCHAR)//, length = 2200)
-    Map<String, Object> content;
+  Map<String, Object> content;
 
   public Long getId() {
     return id;
diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java
index 09084ccc2..39f63c31b 100644
--- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java
+++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java
@@ -9,7 +9,9 @@ import org.tests.model.embedded.EAddress;
 import org.tests.model.embedded.EPerson;
 import org.tests.model.json.PlainBean;
 
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -18,17 +20,20 @@ public class TestNativeWithEmbedded extends BaseTestCase {
   @Test
   public void test() {
 
+    Map<String, Object> rawMap = new LinkedHashMap<>();
+    rawMap.put("a","1");
     EPerson person = new EPerson();
     person.setName("Frank");
     EAddress address = new EAddress();
     address.setStreet("1 foo st");
     address.setCity("barv");
     address.setJbean(new PlainBean("hi", 3));
+    address.setJraw(rawMap);
     person.setAddress(address);
 
     DB.save(person);
 
-    String sql = "select id, name, street, suburb, addr_city, addr_status, addr_jbean from eperson where id = ?";
+    String sql = "select id, name, street, suburb, addr_city, addr_status, addr_jbean, jraw from eperson where id = ?";
 
     LoggedSqlCollector.start();
 
@@ -39,6 +44,7 @@ public class TestNativeWithEmbedded extends BaseTestCase {
     assertThat(one.getName()).isEqualTo("Frank");
     assertThat(one.getAddress().getStreet()).isEqualTo("1 foo st");
     assertThat(one.getAddress().getJbean().getName()).isEqualTo("hi");
+    assertThat(one.getAddress().getJraw().get("a")).isEqualTo("1");
 
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(1);

From 928b90122f7bced174610da0c97d28810d6aabc4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 2 Aug 2021 20:15:51 +1200
Subject: [PATCH 331/447] #2283 - ddl-generator - Add
 DbMigration.addPlatform(Platform) with default sub-directory based on
 Platform

---
 .../io/ebean/dbmigration/DbMigration.java     | 16 +++--
 .../dbmigration/DefaultDbMigration.java       | 62 +++++++++----------
 .../dbmigration/LastMigration.java            |  5 +-
 .../dbmigration/model/MigrationModel.java     | 12 ++--
 .../dbmigration/DbMigrationGenerateTest.java  | 12 ++--
 5 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
index 96b8aa16e..36a53ba48 100644
--- a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -196,19 +196,23 @@ public interface DbMigration {
   void setLockTimeout(int seconds);
 
   /**
-   * Add an additional platform to write the migration DDL.
+   * Add a platform to write the migration DDL.
    * <p>
    * Use this when you want to generate sql scripts for multiple database platforms
    * from the migration (e.g. generate migration sql for MySql, Postgres and Oracle).
    * </p>
    */
+  void addPlatform(Platform platform);
+
+  /**
+   * Add a platform to write with a given prefix.
+   */
   void addPlatform(Platform platform, String prefix);
 
   /**
-   * Add an additional databasePlatform to write the migration DDL.
+   * Add a databasePlatform to write the migration DDL.
    * <p>
    * Use this when you want to add preconfigured database platforms.
-   * </p>
    */
   void addDatabasePlatform(DatabasePlatform databasePlatform, String prefix);
 
@@ -256,9 +260,9 @@ public interface DbMigration {
    *
    *   migration.setPathToResources("src/main/resources");
    *
-   *   migration.addPlatform(Platform.POSTGRES, "pg");
-   *   migration.addPlatform(Platform.MYSQL, "mysql");
-   *   migration.addPlatform(Platform.ORACLE, "oracle");
+   *   migration.addPlatform(Platform.POSTGRES);
+   *   migration.addPlatform(Platform.MYSQL);
+   *   migration.addPlatform(Platform.ORACLE);
    *
    *   migration.generateMigration();
    *
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 1c790c607..0a7b0edee 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -259,13 +259,12 @@ public class DefaultDbMigration implements DbMigration {
     }
   }
 
-  /**
-   * Add an additional platform to write the migration DDL.
-   * <p>
-   * Use this when you want to generate sql scripts for multiple database platforms
-   * from the migration (e.g. generate migration sql for MySql, Postgres and Oracle).
-   * </p>
-   */
+  @Override
+  public void addPlatform(Platform platform) {
+    String prefix = platform.base().name().toLowerCase();
+    addPlatform(platform, prefix);
+  }
+
   @Override
   public void addPlatform(Platform platform, String prefix) {
     platforms.add(new Pair(getPlatform(platform), prefix));
@@ -286,7 +285,7 @@ public class DefaultDbMigration implements DbMigration {
    *
    *       DbMigration migration = DbMigration.create();
    *       migration.setPathToResources("src/main/resources");
-   *       migration.setPlatform(DbPlatformName.ORACLE);
+   *       migration.setPlatform(Platform.ORACLE);
    *
    *       migration.generateMigration();
    *
@@ -298,9 +297,9 @@ public class DefaultDbMigration implements DbMigration {
    *       DbMigration migration = DbMigration.create();
    *       migration.setPathToResources("src/main/resources");
    *
-   *       migration.addPlatform(DbPlatformName.POSTGRES, "pg");
-   *       migration.addPlatform(DbPlatformName.MYSQL, "mysql");
-   *       migration.addPlatform(DbPlatformName.ORACLE, "mysql");
+   *       migration.addPlatform(Platform.POSTGRES);
+   *       migration.addPlatform(Platform.MYSQL);
+   *       migration.addPlatform(Platform.ORACLE);
    *
    *       migration.generateMigration();
    *
@@ -318,10 +317,9 @@ public class DefaultDbMigration implements DbMigration {
     return generateMigrationFor(true);
   }
 
-  private String generateMigrationFor(boolean dbinitMigration) throws IOException {
-
-    // use this flag to stop other plugins like full DDL generation
+  private String generateMigrationFor(boolean initMigration) throws IOException {
     if (!online) {
+      // use this flag to stop other plugins like full DDL generation
       DbOffline.setGenerateMigration();
       if (databasePlatform == null && !platforms.isEmpty()) {
         // for multiple platform generation the first platform
@@ -334,8 +332,8 @@ public class DefaultDbMigration implements DbMigration {
       configurePlatforms();
     }
     try {
-      Request request = createRequest(dbinitMigration);
-      if (!dbinitMigration) {
+      Request request = createRequest(initMigration);
+      if (!initMigration) {
         // repeatable migrations
         if (platforms.isEmpty()) {
           generateExtraDdl(request.migrationDir, databasePlatform, request.isTablePartitioning());
@@ -512,31 +510,31 @@ public class DefaultDbMigration implements DbMigration {
     return version;
   }
 
-  private Request createRequest(boolean dbinitMigration) {
-    return new Request(dbinitMigration);
+  private Request createRequest(boolean initMigration) {
+    return new Request(initMigration);
   }
 
   private class Request {
 
-    final boolean dbinitMigration;
+    final boolean initMigration;
     final File migrationDir;
     final File modelDir;
     final CurrentModel currentModel;
     final ModelContainer migrated;
     final ModelContainer current;
 
-    private Request(boolean dbinitMigration) {
-      this.dbinitMigration = dbinitMigration;
+    private Request(boolean initMigration) {
+      this.initMigration = initMigration;
       this.currentModel = new CurrentModel(server, constraintNaming);
       this.current = currentModel.read();
-      this.migrationDir = getMigrationDirectory(dbinitMigration);
-      if (dbinitMigration) {
+      this.migrationDir = getMigrationDirectory(initMigration);
+      if (initMigration) {
         this.modelDir = null;
         this.migrated = new ModelContainer();
       } else {
         this.modelDir = getModelDirectory(migrationDir);
         MigrationModel migrationModel = new MigrationModel(modelDir, modelSuffix);
-        this.migrated = migrationModel.read(dbinitMigration);
+        this.migrated = migrationModel.read(false);
       }
     }
 
@@ -551,7 +549,7 @@ public class DefaultDbMigration implements DbMigration {
       // 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 LastMigration.nextVersion(migDirectory, modelDir, initMigration);
     }
 
     /**
@@ -588,7 +586,7 @@ public class DefaultDbMigration implements DbMigration {
     String fullVersion = getFullVersion(request.nextVersion(), dropsFor);
 
     logInfo("generating migration:%s", fullVersion);
-    if (!request.dbinitMigration && !writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
+    if (!request.initMigration && !writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
       logError("migration already exists, not generating DDL");
       return null;
     } else {
@@ -782,17 +780,15 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Return the file path to write the xml and sql to.
    */
-  File getMigrationDirectory(boolean dbinitMigration) {
-
+  File getMigrationDirectory(boolean initMigration) {
     // 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 = getMigrationPath(dbinitMigration);
-
-    // expect to be a path to something like - src/main/resources/dbmigration/model
+    String resourcePath = getMigrationPath(initMigration);
+    // expect to be a path to something like - src/main/resources/dbmigration
     File path = new File(resourceRootDir, resourcePath);
     if (!path.exists()) {
       if (!path.mkdirs()) {
@@ -802,8 +798,8 @@ public class DefaultDbMigration implements DbMigration {
     return path;
   }
 
-  private String getMigrationPath(boolean dbinitMigration) {
-    return dbinitMigration ? migrationInitPath : migrationPath;
+  private String getMigrationPath(boolean initMigration) {
+    return initMigration ? migrationInitPath : migrationPath;
   }
 
   /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
index 20b9a19c3..0a3353068 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
@@ -20,13 +20,12 @@ class LastMigration {
   /**
    * Return the next migation version given the migration directory.
    */
-  static String nextVersion(File migDir, File modelDir, boolean dbinitMigration) {
-
+  static String nextVersion(File migDir, File modelDir, boolean initMigration) {
     String last = lastVersion(migDir, modelDir);
     if (last == null) {
       return null;
     }
-    return (dbinitMigration) ? last : MigrationVersion.parse(last).nextVersion();
+    return (initMigration) ? last : MigrationVersion.parse(last).nextVersion();
   }
 
   /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index 6fe5ed66b..2ad1001bb 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -34,16 +34,14 @@ 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.
+   * @param initMigration If true we don't apply model changes, migration is from scratch.
    */
-  public ModelContainer read(boolean dbinitMigration) {
-
-    readMigrations(dbinitMigration);
+  public ModelContainer read(boolean initMigration) {
+    readMigrations(initMigration);
     return model;
   }
 
-  private void readMigrations(boolean dbinitMigration) {
-
+  private void readMigrations(boolean initMigration) {
     // find all the migration xml files
     File[] xmlFiles = modelDirectory.listFiles(pathname -> pathname.getName().toLowerCase().endsWith(modelSuffix));
     if (xmlFiles == null || xmlFiles.length == 0) {
@@ -57,7 +55,7 @@ public class MigrationModel {
     // sort into version order before applying
     Collections.sort(resources);
 
-    if (!dbinitMigration) {
+    if (!initMigration) {
       for (MigrationResource migrationResource : resources) {
         logger.debug("read {}", migrationResource);
         model.apply(migrationResource.read(), migrationResource.getVersion());
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index 1efaacee3..0063a75cf 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -46,16 +46,16 @@ public class DbMigrationGenerateTest {
 
     // migration.addPlatform(Platform.GENERIC, "generic"); there is no ddl handler for generic
     // migration.addPlatform(Platform.SQLANYWHERE, "sqlanywhere"); and sqlanywhere
-    migration.addPlatform(Platform.DB2, "db2");
-    migration.addPlatform(Platform.H2, "h2");
+    migration.addPlatform(Platform.DB2);
+    migration.addPlatform(Platform.H2);
     migration.addPlatform(Platform.HSQLDB, "hsqldb");
     migration.addPlatform(Platform.MYSQL, "mysql");
     migration.addPlatform(Platform.MYSQL55, "mysql55");
-    migration.addPlatform(Platform.POSTGRES, "postgres");
-    migration.addPlatform(Platform.ORACLE, "oracle");
-    migration.addPlatform(Platform.SQLITE, "sqlite");
+    migration.addPlatform(Platform.POSTGRES);
+    migration.addPlatform(Platform.ORACLE);
+    migration.addPlatform(Platform.SQLITE);
     migration.addPlatform(Platform.SQLSERVER17, "sqlserver17");
-    migration.addPlatform(Platform.HANA, "hana");
+    migration.addPlatform(Platform.HANA);
 
     DatabaseConfig config = new DatabaseConfig();
     config.setName("migrationtest");

From 71223895ac458f18e7d1ca6d7c2b01d99bce43fb Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 2 Aug 2021 20:38:05 +1200
Subject: [PATCH 332/447] #2283 - ddl-generator - Refactor tidy whitespace etc

---
 .../io/ebean/dbmigration/DbMigration.java     | 19 ++----
 .../dbmigration/LastMigration.java            |  3 +-
 .../UnknownResourcePathException.java         |  1 -
 .../dbmigration/model/CurrentModel.java       | 10 +--
 .../model/MCompoundUniqueConstraint.java      |  4 --
 .../dbmigration/model/MConfiguration.java     |  3 +-
 .../dbmigration/model/MIndex.java             |  4 +-
 .../dbmigration/model/MTable.java             | 65 ++-----------------
 .../dbmigration/model/MTableIdentity.java     |  2 -
 .../dbmigration/model/MigrationModel.java     | 16 +----
 .../dbmigration/model/MigrationResource.java  |  3 +-
 .../dbmigration/model/ModelContainer.java     |  5 +-
 .../dbmigration/model/ModelDiff.java          | 16 ++---
 .../dbmigration/model/PendingDrops.java       | 12 ----
 .../dbmigration/model/PlatformDdlWriter.java  |  5 --
 15 files changed, 22 insertions(+), 146 deletions(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
index 36a53ba48..55753f4a2 100644
--- a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -16,7 +16,6 @@ import java.util.ServiceLoader;
  * <p>
  * Typically this is run as a main method in src/test once a developer is happy
  * with the next set of changes to the model.
- * </p>
  *
  * <h3>Example: Run for a single specific platform</h3>
  *
@@ -39,11 +38,9 @@ import java.util.ServiceLoader;
  * are no longer being used by the application. These changes are called
  * "pending drops" and we must explicitly specify to include these in
  * a generated migration.
- * </p>
  * <p>
  * Use <code>setGeneratePendingDrop()</code> to specify a prior migration
  * that has drop column changes that we want to generate a migration for.
- * </p>
  *
  * <h3>Example: Generate for pending drops</h3>
  *
@@ -67,7 +64,6 @@ public interface DbMigration {
    * Create a DbMigration implementation to use.
    */
   static DbMigration create() {
-
     Iterator<DbMigration> loader = ServiceLoader.load(DbMigration.class).iterator();
     if (loader.hasNext()) {
       return loader.next();
@@ -76,7 +72,7 @@ public interface DbMigration {
   }
 
   /**
-   * Set to false to suppress logging to System out.
+   * Set logging to System out (defaults to true).
    */
   void setLogToSystemOut(boolean logToSystemOut);
 
@@ -105,13 +101,12 @@ public interface DbMigration {
   void setMigrationPath(String migrationPath);
 
   /**
-   * Set the server to use to determine the current model.
-   * Typically this is not called explicitly.
+   * Set the server to use to determine the current model. Usually this is not called explicitly.
    */
   void setServer(Database database);
 
   /**
-   * Set the DatabaseConfig to use. Typically this is not called explicitly.
+   * Set the DatabaseConfig to use. Usually this is not called explicitly.
    */
   void setServerConfig(DatabaseConfig config);
 
@@ -119,7 +114,6 @@ public interface DbMigration {
    * Set the specific platform to generate DDL for.
    * <p>
    * If not set this defaults to the platform of the default database.
-   * </p>
    */
   void setPlatform(Platform platform);
 
@@ -127,17 +121,15 @@ public interface DbMigration {
    * Set the specific platform to generate DDL for.
    * <p>
    * If not set this defaults to the platform of the default database.
-   * </p>
    */
   void setPlatform(DatabasePlatform databasePlatform);
 
   /**
-   * Set to false to turn off strict mode.
+   * Set to false in order to turn off strict mode.
    * <p>
    * Strict mode checks that a column changed to non-null on an existing table via DB migration has a default
    * value specified. Set this to false if that isn't the case but it is known that all the existing rows have
    * a value specified (there are no existing null values for the column).
-   * </p>
    */
   void setStrictMode(boolean strictMode);
 
@@ -182,7 +174,6 @@ public interface DbMigration {
    * Set to true if ALTER TABLE ADD FOREIGN KEY should be generated with an option to skip validation.
    * <p>
    * Currently this is only useful for Postgres DDL adding the <code>NOT VALID</code> option.
-   * </p>
    */
   void setAddForeignKeySkipCheck(boolean addForeignKeySkipCheck);
 
@@ -191,7 +182,6 @@ public interface DbMigration {
    * <p>
    * Currently this is only useful for Postgres migrations adding a <code>set lock_timeout</code>
    * statement to the generated database migration.
-   * </p>
    */
   void setLockTimeout(int seconds);
 
@@ -200,7 +190,6 @@ public interface DbMigration {
    * <p>
    * Use this when you want to generate sql scripts for multiple database platforms
    * from the migration (e.g. generate migration sql for MySql, Postgres and Oracle).
-   * </p>
    */
   void addPlatform(Platform platform);
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
index 0a3353068..07a80add9 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
@@ -29,10 +29,9 @@ class LastMigration {
   }
 
   /**
-   * Return the last migation version given the migration directory.
+   * Return the last migration version given the migration directory.
    */
   static String lastVersion(File migDirectory, File modelDir) {
-
     List<MigrationVersion> versions = new ArrayList<>();
 
     File[] sqlFiles = migDirectory.listFiles(pathname -> includeSqlFile(pathname.getName().toLowerCase()));
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
index 9ecfde157..c8b29872a 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
@@ -4,7 +4,6 @@ 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 {
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index 11189be94..0ff9a9bc4 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -27,25 +27,17 @@ import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
 public class CurrentModel {
 
   private final SpiEbeanServer server;
-
   private final DatabasePlatform databasePlatform;
-
   private final DbConstraintNaming constraintNaming;
-
   private final boolean platformTypes;
-
   private final boolean jaxbPresent;
-
   private final String ddlHeader;
+  private final DdlOptions ddlOptions = new DdlOptions();
 
   private ModelContainer model;
-
   private ChangeSet changeSet;
-
   private DdlWrite write;
 
-  private DdlOptions ddlOptions = new DdlOptions();
-
   /**
    * Construct with a given EbeanServer instance for DDL create all generation, not migration.
    */
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
index c7c63769d..fbb2e2460 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
@@ -20,19 +20,15 @@ import static io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns.s
 public class MCompoundUniqueConstraint {
 
   private final String name;
-
   /**
    * Flag if true indicates this was specifically created for a OneToOne mapping.
    */
   private final boolean oneToOne;
-
   /**
    * The columns combined to be unique.
    */
   private final String[] columns;
-
   private final String platforms;
-
   private String[] nullableColumns;
 
   /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
index 43387a5c7..178f35c8d 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
@@ -4,7 +4,7 @@ import io.ebeaninternal.dbmigration.migration.Configuration;
 import io.ebeaninternal.dbmigration.migration.DefaultTablespace;
 
 /**
- * Holds configuration such as the default tablespaces to use for tables,
+ * Holds configuration such as the default tablespace to use for tables,
  * indexes, history tables etc.
  */
 public class MConfiguration {
@@ -32,7 +32,6 @@ public class MConfiguration {
    * </p>
    */
   public void apply(Configuration configuration) {
-
     DefaultTablespace defaultTablespace = configuration.getDefaultTablespace();
     if (defaultTablespace != null) {
       String tables = defaultTablespace.getTables();
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
index 976bde5f3..710241a69 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
@@ -13,8 +13,8 @@ import java.util.Objects;
  */
 public class MIndex {
 
-  private String tableName;
-  private String indexName;
+  private final String tableName;
+  private final String indexName;
   private String platforms;
   private List<String> columns = new ArrayList<>();
   private boolean unique;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 82a687eb7..71faa1c44 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -48,67 +48,32 @@ public class MTable {
 
   private static final Logger logger = LoggerFactory.getLogger(MTable.class);
 
-  /**
-   * Table name.
-   */
   private final String name;
-
-  /**
-   * The associated draft table.
-   */
   private MTable draftTable;
-
   /**
    * Marked true for draft tables. These need to have their FK references adjusted
    * after all the draft tables have been identified.
    */
   private boolean draft;
-
   private PartitionMeta partitionMeta;
-
-  /**
-   * Primary key name.
-   */
   private String pkName;
-
-  /**
-   * Table comment.
-   */
   private String comment;
-
-  /**
-   * Tablespace to use.
-   */
   private String tablespace;
-
   private String storageEngine;
-
-  /**
-   * Tablespace to use for indexes on this table.
-   */
   private String indexTablespace;
-
   private IdentityMode identityMode;
-
-  /**
-   * If set to true this table should has history support.
-   */
   private boolean withHistory;
-
-  /**
-   * The columns on the table.
-   */
-  private Map<String, MColumn> columns = new LinkedHashMap<>();
+  private final Map<String, MColumn> columns = new LinkedHashMap<>();
 
   /**
    * Compound unique constraints.
    */
-  private List<MCompoundUniqueConstraint> uniqueConstraints = new ArrayList<>();
+  private final List<MCompoundUniqueConstraint> uniqueConstraints = new ArrayList<>();
 
   /**
    * Compound foreign keys.
    */
-  private List<MCompoundForeignKey> compoundKeys = new ArrayList<>();
+  private final List<MCompoundForeignKey> compoundKeys = new ArrayList<>();
 
   /**
    * Column name for the 'When created' column. This can be used for the initial effective start date when adding
@@ -121,7 +86,7 @@ public class MTable {
    */
   private AddColumn addColumn;
 
-  private List<String> droppedColumns = new ArrayList<>();
+  private final List<String> droppedColumns = new ArrayList<>();
 
   public MTable(BeanDescriptor<?> descriptor) {
     this.name = descriptor.getBaseTable();
@@ -153,18 +118,15 @@ public class MTable {
    * later when creating the CreateTable object.
    */
   public MTable createDraftTable() {
-
     draftTable = new MTable(name + "_draft");
     draftTable.draft = true;
     draftTable.whenCreatedColumn = whenCreatedColumn;
     // compoundKeys
     // compoundUniqueConstraints
     draftTable.identityMode = identityMode;
-
     for (MColumn col : allColumns()) {
       draftTable.addColumn(col.copyForDraft());
     }
-
     return draftTable;
   }
 
@@ -239,7 +201,6 @@ public class MTable {
    * Return the CreateTable migration for this table.
    */
   public CreateTable createTable() {
-
     CreateTable createTable = new CreateTable();
     createTable.setName(name);
     createTable.setPkName(pkName);
@@ -258,22 +219,18 @@ public class MTable {
     if (draft) {
       createTable.setDraft(Boolean.TRUE);
     }
-
     for (MColumn column : allColumns()) {
       // filter out draftOnly columns from the base table
       if (draft || !column.isDraftOnly()) {
         createTable.getColumn().add(column.createColumn());
       }
     }
-
     for (MCompoundForeignKey compoundKey : compoundKeys) {
       createTable.getForeignKey().add(compoundKey.createForeignKey());
     }
-
     for (MCompoundUniqueConstraint constraint : uniqueConstraints) {
       createTable.getUniqueConstraint().add(constraint.getUniqueConstraint());
     }
-
     return createTable;
   }
 
@@ -281,7 +238,6 @@ public class MTable {
    * Compare to another version of the same table to perform a diff.
    */
   public void compare(ModelDiff modelDiff, MTable newTable) {
-
     if (withHistory != newTable.withHistory) {
       if (withHistory) {
         DropHistoryTable dropHistoryTable = new DropHistoryTable();
@@ -308,14 +264,12 @@ public class MTable {
       modelDiff.addTableComment(addTableComment);
     }
 
-
     compareCompoundKeys(modelDiff, newTable);
     compareUniqueKeys(modelDiff, newTable);
   }
 
   private void compareColumns(ModelDiff modelDiff, MTable newTable) {
     addColumn = null;
-
     Map<String, MColumn> newColumnMap = newTable.getColumns();
 
     // compare newColumns to existing columns (look for new and diff columns)
@@ -374,10 +328,10 @@ public class MTable {
     currentKeys.removeAll(newTable.getUniqueConstraints());
     newKeys.removeAll(getUniqueConstraints());
 
-    for (MCompoundUniqueConstraint currentKey: currentKeys) {
+    for (MCompoundUniqueConstraint currentKey : currentKeys) {
       modelDiff.addUniqueConstraint(currentKey.dropUniqueConstraint(name));
     }
-    for (MCompoundUniqueConstraint newKey: newKeys) {
+    for (MCompoundUniqueConstraint newKey : newKeys) {
       modelDiff.addUniqueConstraint(newKey.addUniqueConstraint(name));
     }
   }
@@ -489,7 +443,6 @@ public class MTable {
   }
 
   public List<String> allHistoryColumns(boolean includeDropped) {
-
     List<String> columnNames = new ArrayList<>(columns.size());
     for (MColumn column : columns.values()) {
       if (column.isIncludeInHistory()) {
@@ -595,7 +548,6 @@ public class MTable {
    * Sometimes the case for a primaryKey that is also a foreign key.
    */
   public MColumn addColumn(String dbCol, String columnDefn, boolean notnull) {
-
     MColumn existingColumn = getColumn(dbCol);
     if (existingColumn != null) {
       if (notnull) {
@@ -613,7 +565,6 @@ public class MTable {
    * Add a 'new column' to the AddColumn migration object.
    */
   private void diffNewColumn(MColumn newColumn) {
-
     if (addColumn == null) {
       addColumn = new AddColumn();
       addColumn.setTableName(name);
@@ -631,7 +582,6 @@ public class MTable {
    * Add a 'drop column' to the diff.
    */
   private void diffDropColumn(ModelDiff modelDiff, MColumn existingColumn) {
-
     DropColumn dropColumn = new DropColumn();
     dropColumn.setTableName(name);
     dropColumn.setColumnName(existingColumn.getName());
@@ -640,7 +590,6 @@ public class MTable {
       // table as well as the base table
       dropColumn.setWithHistory(Boolean.TRUE);
     }
-
     modelDiff.addDropColumn(dropColumn);
   }
 
@@ -661,7 +610,6 @@ public class MTable {
    * </p>
    */
   public void checkDuplicateForeignKeys() {
-
     if (hasDuplicateForeignKeys()) {
       int counter = 1;
       for (MCompoundForeignKey fk : compoundKeys) {
@@ -687,7 +635,6 @@ public class MTable {
    * Adjust the references (FK) if it should relate to a draft table.
    */
   public void adjustReferences(ModelContainer modelContainer) {
-
     Collection<MColumn> cols = allColumns();
     for (MColumn col : cols) {
       String references = col.getReferences();
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
index 5e4bb2306..f226ebaec 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
@@ -17,7 +17,6 @@ public class MTableIdentity {
    * Return the IdentityMode from CreateTable.
    */
   public static IdentityMode fromCreateTable(CreateTable createTable) {
-
     IdType type = fromType(createTable.getIdentityType());
     IdentityGenerated generated = fromGenerated(createTable.getIdentityGenerated());
     int start = toInt(createTable.getIdentityStart(), createTable.getSequenceInitial());
@@ -39,7 +38,6 @@ public class MTableIdentity {
    * Set the IdentityMode to the CreateTable model.
    */
   public static void toCreateTable(IdentityMode identityMode, CreateTable createTable) {
-
     if (!identityMode.isPlatformDefault()) {
       createTable.setIdentityType(toType(identityMode.getIdType()));
     }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index 2ad1001bb..9c49ad0aa 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -18,13 +18,9 @@ public class MigrationModel {
   private static final Logger logger = LoggerFactory.getLogger(MigrationModel.class);
 
   private final ModelContainer model = new ModelContainer();
-
   private final File modelDirectory;
-
   private final String modelSuffix;
 
-  private MigrationVersion lastVersion;
-
   public MigrationModel(File modelDirectory, String modelSuffix) {
     this.modelDirectory = modelDirectory;
     this.modelSuffix = modelSuffix;
@@ -58,14 +54,9 @@ public class MigrationModel {
     if (!initMigration) {
       for (MigrationResource migrationResource : resources) {
         logger.debug("read {}", migrationResource);
-        model.apply(migrationResource.read(), migrationResource.getVersion());
+        model.apply(migrationResource.read(), migrationResource.version());
       }
     }
-
-    // remember the last version
-    if (!resources.isEmpty()) {
-      lastVersion = resources.get(resources.size() - 1).getVersion();
-    }
   }
 
   private MigrationVersion createVersion(File xmlFile) {
@@ -73,9 +64,4 @@ public class MigrationModel {
     String versionName = fileName.substring(0, fileName.length() - modelSuffix.length());
     return MigrationVersion.parse(versionName);
   }
-
-  public String getNextVersion(String initialVersion) {
-
-    return lastVersion == null ? initialVersion : lastVersion.nextVersion();
-  }
 }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
index eff454813..ae4950a4e 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
@@ -31,7 +31,7 @@ public class MigrationResource implements Comparable<MigrationResource> {
   /**
    * Return the version associated with this resource.
    */
-  public MigrationVersion getVersion() {
+  public MigrationVersion version() {
     return version;
   }
 
@@ -39,7 +39,6 @@ public class MigrationResource implements Comparable<MigrationResource> {
    * Read and return the migration from the resource.
    */
   public Migration read() {
-
     return MigrationXmlReader.read(migrationFile);
   }
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index 3f75064d2..dc19ef137 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -37,19 +37,16 @@ import java.util.TreeSet;
 public class ModelContainer {
 
   private final Set<String> schemas = new TreeSet<>();
-
   /**
    * All the tables in the model.
    */
   private final Map<String, MTable> tables = new LinkedHashMap<>();
 
   /**
-   * All the non unique non foreign key indexes.
+   * All the non-unique non-foreign key indexes.
    */
   private final Map<String, MIndex> indexes = new LinkedHashMap<>();
-
   private final PendingDrops pendingDrops = new PendingDrops();
-
   private final List<MTable> partitionedTables = new ArrayList<>();
 
   public ModelContainer() {
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
index 2babc7c6c..367c13ca5 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
@@ -53,29 +53,24 @@ public class ModelDiff {
     this.baseModel = new ModelContainer();
   }
 
-
   /**
-   * Return true if the apply and drop changes are both empty.
-   * This means there are no migration changes.
+   * Return true if apply and drop changes are both empty. This means there are no migration changes.
    */
   public boolean isEmpty() {
     return applyChanges.isEmpty() && dropChanges.isEmpty();
   }
 
   /**
-   * Return the diff as a migration potentially containing
-   * an apply changeSet and a drop changeSet.
+   * Return the diff as a migration potentially containing an apply changeSet and a drop changeSet.
    */
   public Migration getMigration() {
-
     Migration migration = new Migration();
     if (!applyChanges.isEmpty()) {
-      // add a non empty apply changeSet
+      // add a non-empty apply changeSet
       migration.getChangeSet().add(getApplyChangeSet());
     }
-
     if (!dropChanges.isEmpty()) {
-      // add a non empty drop changeSet
+      // add a non-empty drop changeSet
       migration.getChangeSet().add(getDropChangeSet());
     }
     return migration;
@@ -121,7 +116,6 @@ public class ModelDiff {
    * Compare to a 'newer' model and collect the differences.
    */
   public void compareTo(ModelContainer newModel) {
-
     Map<String, MTable> newTables = newModel.getTables();
     for (MTable newTable : newTables.values()) {
 
@@ -179,7 +173,6 @@ public class ModelDiff {
    * Compare tables looking for add/drop/modify columns etc.
    */
   protected void compareTables(MTable currentTable, MTable newTable) {
-
     currentTable.compare(this, newTable);
   }
 
@@ -187,7 +180,6 @@ public class ModelDiff {
    * Compare tables looking for add/drop/modify columns etc.
    */
   protected void compareIndexes(MIndex currentIndex, MIndex newIndex) {
-
     currentIndex.compare(this, newIndex);
   }
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
index 9a0bdd242..bd7e7c96b 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
@@ -24,7 +24,6 @@ public class PendingDrops {
    * Add a 'pending drops' changeSet for the given version.
    */
   public void add(MigrationVersion version, ChangeSet changeSet) {
-
     Entry entry = map.computeIfAbsent(version.normalised(), k -> new Entry(version));
     entry.add(changeSet);
   }
@@ -33,7 +32,6 @@ public class PendingDrops {
    * Return the list of versions with pending drops.
    */
   public List<String> pendingDrops() {
-
     List<String> versions = new ArrayList<>();
     for (Entry value : map.values()) {
       if (value.hasPendingDrops()) {
@@ -48,7 +46,6 @@ public class PendingDrops {
    * to remove the (unsuppressed) pending drops for this version.
    */
   public boolean appliedDropsFor(ChangeSet changeSet) {
-
     MigrationVersion version = MigrationVersion.parse(changeSet.getDropsFor());
 
     Entry entry = map.get(version.normalised());
@@ -68,7 +65,6 @@ public class PendingDrops {
    * </p>
    */
   public Migration migrationForVersion(String pendingVersion) {
-
     Entry entry = getEntry(pendingVersion);
 
     Migration migration = new Migration();
@@ -96,7 +92,6 @@ public class PendingDrops {
   }
 
   private Entry getEntry(String pendingVersion) {
-
     if ("next".equalsIgnoreCase(pendingVersion)) {
       Iterator<Entry> it = map.values().iterator();
       if (it.hasNext()) {
@@ -115,7 +110,6 @@ public class PendingDrops {
    * Register pending drop columns on history tables to the new model.
    */
   public void registerPendingHistoryDropColumns(ModelContainer newModel) {
-
     for (Entry entry : map.values()) {
       for (ChangeSet changeSet : entry.list) {
         newModel.registerPendingHistoryDropColumns(changeSet);
@@ -140,7 +134,6 @@ public class PendingDrops {
   static class Entry {
 
     final MigrationVersion version;
-
     final List<ChangeSet> list = new ArrayList<>();
 
     Entry(MigrationVersion version) {
@@ -180,7 +173,6 @@ public class PendingDrops {
      * removed all the changeSets (and there are no suppressForever ones).
      */
     boolean removeDrops(ChangeSet appliedDrops) {
-
       Iterator<ChangeSet> iterator = list.iterator();
       while (iterator.hasNext()) {
         ChangeSet next = iterator.next();
@@ -199,20 +191,16 @@ public class PendingDrops {
      * Remove the applied drops from the pending ones matching by table name and column name.
      */
     private void removeMatchingChanges(ChangeSet pendingDrops, ChangeSet appliedDrops) {
-
       List<Object> pending = pendingDrops.getChangeSetChildren();
       Iterator<Object> iterator = pending.iterator();
       while (iterator.hasNext()) {
         Object pendingDrop = iterator.next();
         if (pendingDrop instanceof DropColumn && dropColumnIn((DropColumn) pendingDrop, appliedDrops)) {
           iterator.remove();
-
         } else if (pendingDrop instanceof DropTable && dropTableIn((DropTable) pendingDrop, appliedDrops)) {
           iterator.remove();
-
         } else if (pendingDrop instanceof DropHistoryTable && dropHistoryTableIn((DropHistoryTable) pendingDrop, appliedDrops)) {
           iterator.remove();
-
         }
       }
     }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
index f56384477..59da934e4 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
@@ -27,9 +27,7 @@ public class PlatformDdlWriter {
   private static final Logger logger = LoggerFactory.getLogger(PlatformDdlWriter.class);
 
   private final DatabaseConfig databaseConfig;
-
   private final PlatformDdl platformDdl;
-
   private final int lockTimeoutSeconds;
 
   public PlatformDdlWriter(DatabasePlatform platform, DatabaseConfig dbConfig, int lockTimeoutSeconds) {
@@ -42,7 +40,6 @@ public class PlatformDdlWriter {
    * Write the migration as platform specific ddl.
    */
   public void processMigration(Migration dbMigration, DdlWrite write, File writePath, String fullVersion) throws IOException {
-
     DdlHandler handler = handler();
     handler.generateProlog(write);
     if (lockTimeoutSeconds > 0) {
@@ -51,7 +48,6 @@ public class PlatformDdlWriter {
         write.apply().append(lockSql).endOfStatement().newLine();
       }
     }
-
     List<ChangeSet> changeSets = dbMigration.getChangeSet();
     for (ChangeSet changeSet : changeSets) {
       if (isApply(changeSet)) {
@@ -59,7 +55,6 @@ public class PlatformDdlWriter {
       }
     }
     handler.generateEpilog(write);
-
     writePlatformDdl(write, writePath, fullVersion);
   }
 

From 4ba26ee7b761faf69819ee3ed76f622204784d72 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 2 Aug 2021 20:49:30 +1200
Subject: [PATCH 333/447] #2283 - ddl-generator - Refactor tidy
 DefaultDbMigration etc

---
 .../dbmigration/DefaultDbMigration.java       | 89 +++++--------------
 .../dbmigration/LastMigration.java            |  2 +-
 .../DbMigrationDropHistoryTest.java           |  4 +-
 .../dbmigration/DbMigrationGenerateTest.java  |  4 +-
 4 files changed, 25 insertions(+), 74 deletions(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 0a7b0edee..7643eeec2 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -2,7 +2,6 @@ package io.ebeaninternal.dbmigration;
 
 import io.ebean.DB;
 import io.ebean.Database;
-import io.ebean.EbeanServer;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DbConstraintNaming;
@@ -79,20 +78,12 @@ import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
 public class DefaultDbMigration implements DbMigration {
 
   protected static final Logger logger = LoggerFactory.getLogger("io.ebean.GenerateMigration");
-
   private static final String initialVersion = "1.0";
-
   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.
-   */
   protected final boolean online;
-
+  private boolean logToSystemOut = true;
   protected SpiEbeanServer server;
-
   protected String pathToResources = "src/main/resources";
 
   protected String migrationPath = "dbmigration";
@@ -101,15 +92,10 @@ public class DefaultDbMigration implements DbMigration {
   protected String modelSuffix = ".model.xml";
 
   protected DatabasePlatform databasePlatform;
-
   private boolean vanillaPlatform;
-
   protected List<Pair> platforms = new ArrayList<>();
-
   protected DatabaseConfig databaseConfig;
-
   protected DbConstraintNaming constraintNaming;
-
   protected Boolean strictMode;
   protected Boolean includeGeneratedFileComment;
   protected String header;
@@ -119,7 +105,6 @@ public class DefaultDbMigration implements DbMigration {
   protected String generatePendingDrop;
   private boolean addForeignKeySkipCheck;
   private int lockTimeoutSeconds;
-
   protected boolean includeBuiltInPartitioning = true;
 
   /**
@@ -129,19 +114,6 @@ public class DefaultDbMigration implements DbMigration {
     this.online = false;
   }
 
-  /**
-   * Create using online EbeanServer.
-   */
-  public DefaultDbMigration(EbeanServer server) {
-    this.online = true;
-    setServer(server);
-  }
-
-  /**
-   * Set the path from the current working directory to the application resources.
-   * <p>
-   * This defaults to maven style 'src/main/resources'.
-   */
   @Override
   public void setPathToResources(String pathToResources) {
     this.pathToResources = pathToResources;
@@ -152,19 +124,12 @@ public class DefaultDbMigration implements DbMigration {
     this.migrationPath = migrationPath;
   }
 
-  /**
-   * Set the server to use to determine the current model.
-   * Typically this is not called explicitly.
-   */
   @Override
   public void setServer(Database database) {
     this.server = (SpiEbeanServer) database;
     setServerConfig(server.getServerConfig());
   }
 
-  /**
-   * Set the DatabaseConfig to use. Typically this is not called explicitly.
-   */
   @Override
   public void setServerConfig(DatabaseConfig config) {
     if (this.databaseConfig == null) {
@@ -173,7 +138,6 @@ public class DefaultDbMigration implements DbMigration {
     if (constraintNaming == null) {
       this.constraintNaming = databaseConfig.getConstraintNaming();
     }
-
     Properties properties = config.getProperties();
     if (properties != null) {
       PropertiesWrapper props = new PropertiesWrapper("ebean", config.getName(), properties, null);
@@ -242,7 +206,7 @@ public class DefaultDbMigration implements DbMigration {
   @Override
   public void setPlatform(Platform platform) {
     vanillaPlatform = true;
-    setPlatform(getPlatform(platform));
+    setPlatform(platform(platform));
   }
 
   /**
@@ -267,7 +231,7 @@ public class DefaultDbMigration implements DbMigration {
 
   @Override
   public void addPlatform(Platform platform, String prefix) {
-    platforms.add(new Pair(getPlatform(platform), prefix));
+    platforms.add(new Pair(platform(platform), prefix));
   }
 
   @Override
@@ -402,7 +366,6 @@ public class DefaultDbMigration implements DbMigration {
    * </p>
    */
   private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, boolean tablePartitioning) throws IOException {
-
     if (dbPlatform != null) {
       if (tablePartitioning && includeBuiltInPartitioning) {
         generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltinTablePartitioning());
@@ -427,10 +390,8 @@ public class DefaultDbMigration implements DbMigration {
    * Write (or override) the "repeatable" migration script.
    */
   private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
-
     String fullName = repeatableMigrationName(script.isInit(), script.getName());
     logger.debug("writing repeatable script {}", fullName);
-
     File file = new File(migrationDir, fullName);
     try (FileWriter writer = new FileWriter(file)) {
       writer.write(script.getValue());
@@ -478,12 +439,10 @@ public class DefaultDbMigration implements DbMigration {
    * Generate the diff migration.
    */
   private String generateDiff(Request request) throws IOException {
-
     List<String> pendingDrops = request.getPendingDrops();
     if (!pendingDrops.isEmpty()) {
       logInfo("Pending un-applied drops in versions %s", pendingDrops);
     }
-
     Migration migration = request.createDiffMigration();
     if (migration == null) {
       logInfo("no changes detected - no migration written", null);
@@ -498,11 +457,8 @@ public class DefaultDbMigration implements DbMigration {
    * Generate the migration based on the pendingDrops from a prior version.
    */
   private String generatePendingDrop(Request request, String pendingVersion) throws IOException {
-
     Migration migration = request.migrationForPendingDrop(pendingVersion);
-
     String version = generateMigration(request, migration, pendingVersion);
-
     List<String> pendingDrops = request.getPendingDrops();
     if (!pendingDrops.isEmpty()) {
       logInfo("... remaining pending un-applied drops in versions %s", pendingDrops);
@@ -527,12 +483,12 @@ public class DefaultDbMigration implements DbMigration {
       this.initMigration = initMigration;
       this.currentModel = new CurrentModel(server, constraintNaming);
       this.current = currentModel.read();
-      this.migrationDir = getMigrationDirectory(initMigration);
+      this.migrationDir = migrationDirectory(initMigration);
       if (initMigration) {
         this.modelDir = null;
         this.migrated = new ModelContainer();
       } else {
-        this.modelDir = getModelDirectory(migrationDir);
+        this.modelDir = modelDirectory(migrationDir);
         MigrationModel migrationModel = new MigrationModel(modelDir, modelSuffix);
         this.migrated = migrationModel.read(false);
       }
@@ -547,8 +503,8 @@ public class DefaultDbMigration implements DbMigration {
      */
     String nextVersion() {
       // always read the next version using the main migration directory (not dbinit)
-      File migDirectory = getMigrationDirectory(false);
-      File modelDir = getModelDirectory(migDirectory);
+      File migDirectory = migrationDirectory(false);
+      File modelDir = modelDirectory(migDirectory);
       return LastMigration.nextVersion(migDirectory, modelDir, initMigration);
     }
 
@@ -556,9 +512,7 @@ public class DefaultDbMigration implements DbMigration {
      * Return the migration for the pending drops for a given version.
      */
     Migration migrationForPendingDrop(String pendingVersion) {
-
       Migration migration = migrated.migrationForPendingDrop(pendingVersion);
-
       // register any remaining pending drops
       migrated.registerPendingHistoryDropColumns(current);
       return migration;
@@ -582,9 +536,7 @@ public class DefaultDbMigration implements DbMigration {
   }
 
   private String generateMigration(Request request, Migration dbMigration, String dropsFor) throws IOException {
-
-    String fullVersion = getFullVersion(request.nextVersion(), dropsFor);
-
+    String fullVersion = fullVersion(request.nextVersion(), dropsFor);
     logInfo("generating migration:%s", fullVersion);
     if (!request.initMigration && !writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
       logError("migration already exists, not generating DDL");
@@ -621,15 +573,14 @@ public class DefaultDbMigration implements DbMigration {
    * <p>
    * The full version can contain a comment suffix after a "__" double underscore.
    */
-  private String getFullVersion(String nextVersion, String dropsFor) {
-
-    String version = getVersion();
+  private String fullVersion(String nextVersion, String dropsFor) {
+    String version = version();
     if (version == null) {
       version = (nextVersion != null) ? nextVersion : initialVersion;
     }
 
     String fullVersion = applyPrefix + version;
-    String name = getName();
+    String name = name();
     if (name != null) {
       fullVersion += "__" + toUnderScore(name);
 
@@ -724,7 +675,7 @@ public class DefaultDbMigration implements DbMigration {
    * 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() {
+  private String version() {
     String envVersion = readEnvironment("ddl.migration.version");
     if (!isEmpty(envVersion)) {
       return envVersion.trim();
@@ -744,7 +695,7 @@ public class DefaultDbMigration implements DbMigration {
    * is a short description of the feature.
    * </p>
    */
-  private String getName() {
+  private String name() {
     String envName = readEnvironment("ddl.migration.name");
     if (!isEmpty(envName)) {
       return envName.trim();
@@ -773,21 +724,21 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Return the main migration directory.
    */
-  File getMigrationDirectory() {
-    return getMigrationDirectory(false);
+  File migrationDirectory() {
+    return migrationDirectory(false);
   }
 
   /**
    * Return the file path to write the xml and sql to.
    */
-  File getMigrationDirectory(boolean initMigration) {
+  File migrationDirectory(boolean initMigration) {
     // 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 = getMigrationPath(initMigration);
+    String resourcePath = migrationPath(initMigration);
     // expect to be a path to something like - src/main/resources/dbmigration
     File path = new File(resourceRootDir, resourcePath);
     if (!path.exists()) {
@@ -798,14 +749,14 @@ public class DefaultDbMigration implements DbMigration {
     return path;
   }
 
-  private String getMigrationPath(boolean initMigration) {
+  private String migrationPath(boolean initMigration) {
     return initMigration ? migrationInitPath : migrationPath;
   }
 
   /**
    * Return the model directory (relative to the migration directory).
    */
-  private File getModelDirectory(File migrationDirectory) {
+  private File modelDirectory(File migrationDirectory) {
     if (modelPath == null || modelPath.isEmpty()) {
       return migrationDirectory;
     }
@@ -819,7 +770,7 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Return the DatabasePlatform given the platform key.
    */
-  protected DatabasePlatform getPlatform(Platform platform) {
+  protected DatabasePlatform platform(Platform platform) {
     switch (platform) {
       case H2:
         return new H2Platform();
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
index 07a80add9..17ac65aa9 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
@@ -18,7 +18,7 @@ class LastMigration {
   private static final String MODEL_XML = ".model.xml";
 
   /**
-   * Return the next migation version given the migration directory.
+   * Return the next migration version given the migration directory.
    */
   static String nextVersion(File migDir, File modelDir, boolean initMigration) {
     String last = lastVersion(migDir, modelDir);
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
index db91e14c9..320406a7c 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
@@ -54,8 +54,8 @@ public class DbMigrationDropHistoryTest {
     migration.setServer(server);
 
     // First, we clean up the output-directory
-    assertThat(migration.getMigrationDirectory().getAbsolutePath()).contains("migrationtest-history");
-    Files.walk(migration.getMigrationDirectory().toPath())
+    assertThat(migration.migrationDirectory().getAbsolutePath()).contains("migrationtest-history");
+    Files.walk(migration.migrationDirectory().toPath())
       .filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
 
     // then we generate migration scripts for v1_0
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index 0063a75cf..befead534 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -70,8 +70,8 @@ public class DbMigrationGenerateTest {
     migration.setServer(server);
 
     // First, we clean up the output-directory
-    assertThat(migration.getMigrationDirectory().getAbsolutePath()).contains("migrationtest");
-    Files.walk(migration.getMigrationDirectory().toPath())
+    assertThat(migration.migrationDirectory().getAbsolutePath()).contains("migrationtest");
+    Files.walk(migration.migrationDirectory().toPath())
       .filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
 
     // then we generate migration scripts for v1_0

From 589ee7a5ea6baee0a011a4a97c0440097297b31d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 2 Aug 2021 23:59:49 +1200
Subject: [PATCH 334/447] #2284 - ENH: ddl-generator - add optional generation
 of idx_<platform>.migrations file

---
 .../io/ebean/dbmigration/DbMigration.java     |   8 ++
 .../dbmigration/DefaultDbMigration.java       |  27 +++-
 .../dbmigration/IndexMigration.java           | 125 ++++++++++++++++++
 .../ebeaninternal/dbmigration/MChecksum.java  |  29 ++++
 .../dbmigration/DbMigrationGenerateTest.java  |  18 +--
 .../dbmigration/IndexMigrationTest.java       |  67 ++++++++++
 .../dbmigration/MChecksumTest.java            |  18 +++
 .../dbmigration/index/1.0__hello.sql          |   1 +
 .../resources/dbmigration/index/1.1__foo.sql  |   1 +
 .../resources/dbmigration/index/I__init_1.sql |   1 +
 .../resources/dbmigration/index/R__view_1.sql |   1 +
 .../dbmigration/index2/I__init_1.sql          |   1 +
 .../dbmigration/index2/R__view_1.sql          |   1 +
 .../dbmigration/index2/g1/1.0__a.sql          |   1 +
 .../dbmigration/index2/g1/1.1__b.sql          |   1 +
 .../dbmigration/index2/g2/2.0__a.sql          |   1 +
 .../dbmigration/index2/g2/2.1__2b.sql         |   1 +
 17 files changed, 293 insertions(+), 9 deletions(-)
 create mode 100644 ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
 create mode 100644 ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/MChecksum.java
 create mode 100644 ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java
 create mode 100644 ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index/1.0__hello.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index/1.1__foo.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index/I__init_1.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index/R__view_1.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index2/I__init_1.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index2/R__view_1.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.0__a.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.1__b.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.0__a.sql
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.1__2b.sql

diff --git a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
index 55753f4a2..ec6db4597 100644
--- a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -133,6 +133,14 @@ public interface DbMigration {
    */
   void setStrictMode(boolean strictMode);
 
+  /**
+   * Set to include generation of the index migration file.
+   * <p>
+   * When true this generates a {@code idx_<platform>.migrations} file. This can be used by the migration
+   * runner to improve performance of running migrations, especially when no migration changes have occurred.
+   */
+  void setIncludeIndex(boolean generateIndexFile);
+
   /**
    * Set to true to include a generated header comment in the DDL script.
    */
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 7643eeec2..7f2a90558 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -106,6 +106,7 @@ public class DefaultDbMigration implements DbMigration {
   private boolean addForeignKeySkipCheck;
   private int lockTimeoutSeconds;
   protected boolean includeBuiltInPartitioning = true;
+  protected boolean includeIndex;
 
   /**
    * Create for offline migration generation.
@@ -182,6 +183,11 @@ public class DefaultDbMigration implements DbMigration {
     this.generatePendingDrop = generatePendingDrop;
   }
 
+  @Override
+  public void setIncludeIndex(boolean includeIndex) {
+    this.includeIndex = includeIndex;
+  }
+
   @Override
   public void setIncludeGeneratedFileComment(boolean includeGeneratedFileComment) {
     this.includeGeneratedFileComment = includeGeneratedFileComment;
@@ -273,7 +279,26 @@ public class DefaultDbMigration implements DbMigration {
    */
   @Override
   public String generateMigration() throws IOException {
-    return generateMigrationFor(false);
+    final String version = generateMigrationFor(false);
+    if (includeIndex) {
+      generateIndex(version);
+    }
+    return version;
+  }
+
+  /**
+   * Generate the {@code idx_platform.migrations} file.
+   */
+  private void generateIndex(String version) throws IOException {
+    final boolean overwrite = version != null;
+    final File topDir = migrationDirectory(false);
+    if (!platforms.isEmpty()) {
+      for (Pair pair : platforms) {
+        new IndexMigration(topDir, pair).generate(overwrite);
+      }
+    } else {
+      new IndexMigration(topDir, databasePlatform).generate(overwrite);
+    }
   }
 
   @Override
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
new file mode 100644
index 000000000..215c18e72
--- /dev/null
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
@@ -0,0 +1,125 @@
+package io.ebeaninternal.dbmigration;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.migration.MigrationVersion;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Stack;
+
+/**
+ * Generate a migration index file.
+ * <p>
+ * This is a file that has all the migrations listed in order with checksum of the file content.
+ */
+class IndexMigration {
+
+  private static final String eol = "\n";
+  private final List<Entry> all = new ArrayList<>();
+  private final File topDir;
+  private final DatabasePlatform databasePlatform;
+  private final File indexFile;
+  private final Stack<String> pathStack = new Stack<>();
+
+  IndexMigration(File topDir, DatabasePlatform databasePlatform) {
+    this.topDir = topDir;
+    this.databasePlatform = databasePlatform;
+    this.indexFile = init();
+  }
+
+  IndexMigration(File topDir, DefaultDbMigration.Pair pair) {
+    this.topDir = new File(topDir, pair.prefix);
+    this.databasePlatform = pair.platform;
+    this.indexFile = init();
+  }
+
+  File init() {
+    pathStack.push("");
+    String name = "idx_" + databasePlatform.getPlatform().base().name().toLowerCase() + ".migrations";
+    return new File(topDir, name);
+  }
+
+  void generate(boolean overwrite) throws IOException {
+    if (!overwrite && indexFile.exists()) {
+      return;
+    }
+    readSqlFiles(topDir);
+    generateIndex();
+  }
+
+  private void generateIndex() throws IOException {
+    Collections.sort(all);
+    FileWriter writer = new FileWriter(indexFile);
+    for (Entry entry : all) {
+      writeChecksumPadded(writer, entry.checksum);
+      writer.write(entry.fileName);
+      writer.write(eol);
+    }
+    writer.write(eol);
+    writer.close();
+  }
+
+  private void writeChecksumPadded(FileWriter writer, int checksum) throws IOException {
+    final String asStr = String.valueOf(checksum);
+    writer.write(asStr);
+    writer.write(',');
+    int max = 15 - asStr.length();
+    for (int i = 0; i < max; i++) {
+      writer.write(' ');
+    }
+  }
+
+  private void readSqlFiles(File dir) {
+    final File[] files = dir.listFiles();
+    if (files != null && files.length > 0) {
+      for (File file : files) {
+        if (file.isDirectory()) {
+          readDirectory(file);
+        }
+        final String lowerName = file.getName().toLowerCase();
+        if (lowerName.endsWith(".sql")) {
+          addEntry(file);
+        }
+      }
+    }
+  }
+
+  private void readDirectory(File dir) {
+    final String current = pathStack.peek();
+    pathStack.push(current + dir.getName() + "/");
+    readSqlFiles(dir);
+    pathStack.pop();
+  }
+
+  private void addEntry(File sqlFile) {
+    final String relativePath = pathStack.peek();
+    final String fileName = sqlFile.getName();
+    final String name = fileName.substring(0, fileName.length() - 4);
+    final MigrationVersion version = MigrationVersion.parse(name);
+    final int checksum = MChecksum.calculate(sqlFile);
+    all.add(new Entry(checksum, version, relativePath + fileName));
+  }
+
+  static class Entry implements Comparable<Entry> {
+
+    private final int checksum;
+    private final String fileName;
+    private final MigrationVersion version;
+
+    Entry(int checksum, MigrationVersion version, String fileName) {
+      this.checksum = checksum;
+      this.version = version;
+      this.fileName = fileName;
+    }
+
+    @Override
+    public int compareTo(Entry other) {
+      return version.compareTo(other.version);
+    }
+  }
+
+}
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/MChecksum.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/MChecksum.java
new file mode 100644
index 000000000..9c533992e
--- /dev/null
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/MChecksum.java
@@ -0,0 +1,29 @@
+package io.ebeaninternal.dbmigration;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.CRC32;
+
+/**
+ * Calculates the checksum for the given file content.
+ */
+class MChecksum {
+
+  /**
+   * Returns the checksum of the file. Agnostic of encoding and new line character.
+   */
+  static int calculate(File file) {
+    try {
+      final CRC32 crc32 = new CRC32();
+      BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
+      String line;
+      while ((line = bufferedReader.readLine()) != null) {
+        final byte[] lineBytes = line.getBytes(StandardCharsets.UTF_8);
+        crc32.update(lineBytes, 0, lineBytes.length);
+      }
+      return (int) crc32.getValue();
+    } catch (IOException e) {
+      throw new UncheckedIOException("Failed to calculate checksum", e);
+    }
+  }
+}
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
index befead534..f5bf01a56 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
@@ -27,20 +27,22 @@ public class DbMigrationGenerateTest {
 
   private static final Logger logger = LoggerFactory.getLogger(DbMigrationGenerateTest.class);
 
-  @Test
-  public void invokeTest() throws IOException {
-    main(null);
+  public static void main(String[] args) throws IOException {
+    run("ebean-ddl-generator/src/test/resources");
   }
 
-  public static void main(String[] args) throws IOException {
+  @Test
+  public void invokeTest() throws IOException {
+    run("src/test/resources");
+  }
 
-    logger.info("start");
+  public static void run(String pathToResources) throws IOException {
+    logger.info("start current directory: " + new File(".").getAbsolutePath());
 
     DefaultDbMigration migration = new DefaultDbMigration();
-
+    migration.setIncludeIndex(true);
     // We use src/test/resources as output directory (so we see in GIT if files will change)
-
-    migration.setPathToResources("src/test/resources");
+    migration.setPathToResources(pathToResources);
     migration.setMigrationPath("db/migration");
     migration.setMigrationPath(null); // use the default for this test
 
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java
new file mode 100644
index 000000000..5a04d8917
--- /dev/null
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java
@@ -0,0 +1,67 @@
+package io.ebeaninternal.dbmigration;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class IndexMigrationTest {
+
+  @Test
+  public void index() throws IOException {
+    File topDir = new File("src/test/resources/dbmigration/index");
+    if (!topDir.exists()) {
+      throw new IllegalStateException("Not expected - dir does not exist " + topDir.getAbsolutePath());
+    }
+    DatabasePlatform pg = new PostgresPlatform();
+    IndexMigration indexMigration = new IndexMigration(topDir, pg);
+    indexMigration.generate(true);
+
+
+    File expected = new File(topDir, "idx_postgres.migrations");
+    assertThat(expected).exists();
+
+    final List<String> expectedLines = Arrays.asList(
+      "-965417868,     I__init_1.sql",
+      "907060870,      1.0__hello.sql",
+      "-1938594527,    1.1__foo.sql",
+      "-1960070312,    R__view_1.sql");
+
+    final List<String> lines = Files.readAllLines(expected.toPath(), StandardCharsets.UTF_8);
+    assertThat(lines).containsAll(expectedLines);
+  }
+
+  @Test
+  public void index2_withSubDirectories() throws IOException {
+    File topDir = new File("src/test/resources/dbmigration/index2");
+    if (!topDir.exists()) {
+      throw new IllegalStateException("Not expected - dir does not exist " + topDir.getAbsolutePath());
+    }
+    DatabasePlatform pg = new H2Platform();
+    IndexMigration indexMigration = new IndexMigration(topDir, pg);
+    indexMigration.generate(true);
+
+    File expected = new File(topDir, "idx_h2.migrations");
+    assertThat(expected).exists();
+
+    final List<String> expectedLines = Arrays.asList(
+      "-965417868,     I__init_1.sql",
+      "-390611389,     g1/1.0__a.sql",
+      "1908338681,     g1/1.1__b.sql",
+      "-1776543936,    g2/2.0__a.sql",
+      "253052666,      g2/2.1__2b.sql",
+      "-1960070312,    R__view_1.sql");
+
+    final List<String> lines = Files.readAllLines(expected.toPath(), StandardCharsets.UTF_8);
+    assertThat(lines).containsAll(expectedLines);
+  }
+}
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java
new file mode 100644
index 000000000..e52c43755
--- /dev/null
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java
@@ -0,0 +1,18 @@
+package io.ebeaninternal.dbmigration;
+
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MChecksumTest {
+
+  @Test
+  public void calculate() {
+    File file = new File("src/test/resources/dbmigration/index/1.0__hello.sql");
+    assertThat(file).exists();
+
+    assertThat(MChecksum.calculate(file)).isEqualTo(907060870);
+  }
+}
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index/1.0__hello.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index/1.0__hello.sql
new file mode 100644
index 000000000..ce0136250
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index/1.0__hello.sql
@@ -0,0 +1 @@
+hello
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index/1.1__foo.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index/1.1__foo.sql
new file mode 100644
index 000000000..257cc5642
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index/1.1__foo.sql
@@ -0,0 +1 @@
+foo
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index/I__init_1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index/I__init_1.sql
new file mode 100644
index 000000000..b1b716105
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index/I__init_1.sql
@@ -0,0 +1 @@
+init
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index/R__view_1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index/R__view_1.sql
new file mode 100644
index 000000000..0f2416ebf
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index/R__view_1.sql
@@ -0,0 +1 @@
+Something
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index2/I__init_1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index2/I__init_1.sql
new file mode 100644
index 000000000..b1b716105
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index2/I__init_1.sql
@@ -0,0 +1 @@
+init
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index2/R__view_1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index2/R__view_1.sql
new file mode 100644
index 000000000..0f2416ebf
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index2/R__view_1.sql
@@ -0,0 +1 @@
+Something
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.0__a.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.0__a.sql
new file mode 100644
index 000000000..789819226
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.0__a.sql
@@ -0,0 +1 @@
+a
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.1__b.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.1__b.sql
new file mode 100644
index 000000000..617807982
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g1/1.1__b.sql
@@ -0,0 +1 @@
+b
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.0__a.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.0__a.sql
new file mode 100644
index 000000000..94226dabb
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.0__a.sql
@@ -0,0 +1 @@
+2a
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.1__2b.sql b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.1__2b.sql
new file mode 100644
index 000000000..b8a4cf4af
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index2/g2/2.1__2b.sql
@@ -0,0 +1 @@
+2b

From db34afe867af3e2df20d3546c2e039c412a50bd4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 3 Aug 2021 00:03:02 +1200
Subject: [PATCH 335/447] #2284 - ENH: ddl-generator - add optional generation
 of idx_<platform>.migrations file

---
 .../resources/dbmigration/index/idx_postgres.migrations    | 5 +++++
 .../test/resources/dbmigration/index2/idx_h2.migrations    | 7 +++++++
 .../dbmigration/migrationtest/db2/idx_db2.migrations       | 6 ++++++
 .../dbmigration/migrationtest/h2/idx_h2.migrations         | 6 ++++++
 .../dbmigration/migrationtest/hana/idx_hana.migrations     | 6 ++++++
 .../dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations | 6 ++++++
 .../dbmigration/migrationtest/mysql/idx_mysql.migrations   | 6 ++++++
 .../dbmigration/migrationtest/mysql55/idx_mysql.migrations | 6 ++++++
 .../dbmigration/migrationtest/oracle/idx_oracle.migrations | 6 ++++++
 .../migrationtest/postgres/idx_postgres.migrations         | 6 ++++++
 .../dbmigration/migrationtest/sqlite/idx_sqlite.migrations | 6 ++++++
 .../migrationtest/sqlserver17/idx_sqlserver.migrations     | 7 +++++++
 12 files changed, 73 insertions(+)
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index/idx_postgres.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/index2/idx_h2.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/idx_h2.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/idx_hana.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/idx_mysql.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/idx_mysql.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/idx_oracle.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/idx_postgres.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/idx_sqlite.migrations
 create mode 100644 ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/idx_sqlserver.migrations

diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index/idx_postgres.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/index/idx_postgres.migrations
new file mode 100644
index 000000000..2ccea54d7
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index/idx_postgres.migrations
@@ -0,0 +1,5 @@
+-965417868,     I__init_1.sql
+907060870,      1.0__hello.sql
+-1938594527,    1.1__foo.sql
+-1960070312,    R__view_1.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/index2/idx_h2.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/index2/idx_h2.migrations
new file mode 100644
index 000000000..ef6e14321
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/index2/idx_h2.migrations
@@ -0,0 +1,7 @@
+-965417868,     I__init_1.sql
+-390611389,     g1/1.0__a.sql
+1908338681,     g1/1.1__b.sql
+-1776543936,    g2/2.0__a.sql
+253052666,      g2/2.1__2b.sql
+-1960070312,    R__view_1.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations
new file mode 100644
index 000000000..ec4208068
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations
@@ -0,0 +1,6 @@
+441570368,      1.0__initial.sql
+-94595879,      1.1.sql
+578073685,      1.2__dropsFor_1.1.sql
+-509420890,     1.3.sql
+-1475628451,    1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/idx_h2.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/idx_h2.migrations
new file mode 100644
index 000000000..fb21ce854
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/idx_h2.migrations
@@ -0,0 +1,6 @@
+-745768926,     1.0__initial.sql
+39858255,       1.1.sql
+1616986842,     1.2__dropsFor_1.1.sql
+-1513154593,    1.3.sql
+374569329,      1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/idx_hana.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/idx_hana.migrations
new file mode 100644
index 000000000..984c4bb50
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/idx_hana.migrations
@@ -0,0 +1,6 @@
+-1536923954,    1.0__initial.sql
+1039838314,     1.1.sql
+562867593,      1.2__dropsFor_1.1.sql
+1566488731,     1.3.sql
+1030652294,     1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations
new file mode 100644
index 000000000..ee5e2bd41
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations
@@ -0,0 +1,6 @@
+2097980375,     1.0__initial.sql
+2086418403,     1.1.sql
+-1462014216,    1.2__dropsFor_1.1.sql
+-2039573992,    1.3.sql
+2106151405,     1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/idx_mysql.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/idx_mysql.migrations
new file mode 100644
index 000000000..2ce271cdc
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/idx_mysql.migrations
@@ -0,0 +1,6 @@
+1075178692,     1.0__initial.sql
+880212944,      1.1.sql
+1029390755,     1.2__dropsFor_1.1.sql
+-380371830,     1.3.sql
+1085680731,     1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/idx_mysql.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/idx_mysql.migrations
new file mode 100644
index 000000000..9bf86f51e
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/idx_mysql.migrations
@@ -0,0 +1,6 @@
+-1087663151,    1.0__initial.sql
+880212944,      1.1.sql
+1029390755,     1.2__dropsFor_1.1.sql
+-380371830,     1.3.sql
+1085680731,     1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/idx_oracle.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/idx_oracle.migrations
new file mode 100644
index 000000000..533b50b15
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/idx_oracle.migrations
@@ -0,0 +1,6 @@
+1164675950,     1.0__initial.sql
+-1916315387,    1.1.sql
+238598298,      1.2__dropsFor_1.1.sql
+483114276,      1.3.sql
+1213528478,     1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/idx_postgres.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/idx_postgres.migrations
new file mode 100644
index 000000000..7e74e6b50
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/idx_postgres.migrations
@@ -0,0 +1,6 @@
+1329543701,     1.0__initial.sql
+-1877647184,    1.1.sql
+-1861367028,    1.2__dropsFor_1.1.sql
+-1798982281,    1.3.sql
+1959776888,     1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/idx_sqlite.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/idx_sqlite.migrations
new file mode 100644
index 000000000..919841fde
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/idx_sqlite.migrations
@@ -0,0 +1,6 @@
+1429491518,     1.0__initial.sql
+-347121868,     1.1.sql
+1359055889,     1.2__dropsFor_1.1.sql
+-1764531063,    1.3.sql
+-1070218324,    1.4__dropsFor_1.3.sql
+
diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/idx_sqlserver.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/idx_sqlserver.migrations
new file mode 100644
index 000000000..f7cd1c04a
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/idx_sqlserver.migrations
@@ -0,0 +1,7 @@
+-2122378240,    I__create_procs.sql
+-1048913407,    1.0__initial.sql
+615613536,      1.1.sql
+-1805601919,    1.2__dropsFor_1.1.sql
+-1791137342,    1.3.sql
+460536923,      1.4__dropsFor_1.3.sql
+

From a06f7bea41f53a4b77763b602730dbf0bd413d78 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Aug 2021 12:55:42 +1200
Subject: [PATCH 336/447] Tidy javadoc for MutableValueInfo

---
 ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java b/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
index 0f9c223aa..27716b13c 100644
--- a/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
+++ b/ebean-api/src/main/java/io/ebean/bean/MutableValueInfo.java
@@ -4,10 +4,10 @@ package io.ebean.bean;
  * Holds information on mutable values (like plain beans stored as json).
  * <p>
  * Used internally in EntityBeanIntercept for dirty detection on mutable values.
- * Typically dirty detection is based on a hash/checksum of json content or the
+ * Typically, mutation detection is based on a hash/checksum of json content or the
  * original json content itself.
  * <p>
- * Refer to the mapping options {@code @DbJson(dirtyDetection)} and {@code @DbJson(keepSource)}.
+ * Refer to the mapping options {@code @DbJson(mutationDetection)}.
  */
 public interface MutableValueInfo {
 

From 2043fdf7e1a8b845b383c5287a965cb2fe8ba9e7 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Aug 2021 13:12:18 +1200
Subject: [PATCH 337/447] #2274 Add DatabaseConfig jsonMutationDetection
 property setting the global default mode

---
 .../java/io/ebean/config/DatabaseConfig.java  | 28 +++++++++++++++++--
 .../server/type/DefaultTypeManager.java       |  2 +-
 .../type/ScalarTypeJsonObjectMapper.java      |  3 +-
 .../server/type/TypeJsonManager.java          |  9 +++++-
 .../io/ebean/config/ServerConfigTest.java     |  7 ++++-
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 476007ebe..d1f0346b5 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -7,9 +7,7 @@ import io.ebean.EbeanVersion;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.Transaction;
-import io.ebean.annotation.Encrypted;
-import io.ebean.annotation.PersistBatch;
-import io.ebean.annotation.Platform;
+import io.ebean.annotation.*;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
@@ -193,6 +191,11 @@ public class DatabaseConfig {
    */
   private JsonConfig.Include jsonInclude = JsonConfig.Include.ALL;
 
+  /**
+   * The default mode used for {@code @DbJson} with Jackson ObjectMapper.
+   */
+  private MutationDetection jsonMutationDetection = MutationDetection.HASH;
+
   /**
    * The database platform name. Used to imply a DatabasePlatform to use.
    */
@@ -737,6 +740,24 @@ public class DatabaseConfig {
     this.jsonInclude = jsonInclude;
   }
 
+  /**
+   * Return the default MutableDetection to use with {@code @DbJson} using Jackson.
+   *
+   * @see DbJson#mutationDetection()
+   */
+  public MutationDetection getJsonMutationDetection() {
+    return jsonMutationDetection;
+  }
+
+  /**
+   * Set the default MutableDetection to use with {@code @DbJson} using Jackson.
+   *
+   * @see DbJson#mutationDetection()
+   */
+  public void setJsonMutationDetection(MutationDetection jsonMutationDetection) {
+    this.jsonMutationDetection = jsonMutationDetection;
+  }
+
   /**
    * Return the name of the Database.
    */
@@ -2909,6 +2930,7 @@ public class DatabaseConfig {
     jsonInclude = p.getEnum(JsonConfig.Include.class, "jsonInclude", jsonInclude);
     jsonDateTime = p.getEnum(JsonConfig.DateTime.class, "jsonDateTime", jsonDateTime);
     jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);
+    jsonMutationDetection = p.getEnum(MutationDetection.class, "jsonMutationDetection", jsonMutationDetection);
 
     runMigration = p.getBoolean("migration.run", runMigration);
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 8ffb15372..1400b2180 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -134,7 +134,7 @@ public final class DefaultTypeManager implements TypeManager {
     this.postgres = isPostgres(config.getDatabasePlatform());
     this.objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
     this.objectMapper = (objectMapperPresent) ? initObjectMapper(config) : null;
-    this.jsonManager = (objectMapperPresent) ? new TypeJsonManager(postgres, objectMapper) : null;
+    this.jsonManager = (objectMapperPresent) ? new TypeJsonManager(postgres, objectMapper, config.getJsonMutationDetection()) : null;
     this.extraTypeFactory = new DefaultTypeFactory(config);
     this.arrayTypeListFactory = arrayTypeListFactory(config.getDatabasePlatform());
     this.arrayTypeSetFactory = arrayTypeSetFactory(config.getDatabasePlatform());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 334f4b232..7ae24420f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -38,7 +38,8 @@ class ScalarTypeJsonObjectMapper {
     } else if (mode != MutationDetection.DEFAULT) {
       return new GenericObject(jsonManager, field, dbType, docType);
     }
-    prop.setMutationDetection(MutationDetection.HASH);
+    // using the global default MutationDetection mode (defaults to HASH)
+    prop.setMutationDetection(jsonManager.mutationDetection());
     return new GenericObject(jsonManager, field, dbType, docType);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
index 9cc0b5f0d..989ba2729 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
@@ -2,16 +2,23 @@ package io.ebeaninternal.server.type;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.ModifyAwareType;
+import io.ebean.annotation.MutationDetection;
 import io.ebean.config.dbplatform.DbPlatformType;
 
 class TypeJsonManager {
 
   private final boolean postgres;
   private final ObjectMapper objectMapper;
+  private final MutationDetection mutationDetection;
 
-  TypeJsonManager(boolean postgres, Object objectMapper) {
+  TypeJsonManager(boolean postgres, Object objectMapper, MutationDetection mutationDetection) {
     this.postgres = postgres;
     this.objectMapper = (ObjectMapper) objectMapper;
+    this.mutationDetection = mutationDetection;
+  }
+
+  MutationDetection mutationDetection() {
+    return mutationDetection;
   }
 
   ObjectMapper objectMapper() {
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
index 55eb1f06e..46f283e55 100644
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
@@ -1,6 +1,7 @@
 package io.ebean.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.annotation.MutationDetection;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.datasource.DataSourceConfig;
@@ -62,7 +63,7 @@ public class ServerConfigTest {
     props.setProperty("dbOffline", "true");
     props.setProperty("jsonDateTime", "MILLIS");
     props.setProperty("jsonDate", "MILLIS");
-    props.setProperty("jsonDirtyByDefault", "false");
+    props.setProperty("jsonMutationDetection", "NONE");
     props.setProperty("autoReadOnlyDataSource", "true");
     props.setProperty("disableL2Cache", "true");
     props.setProperty("notifyL2CacheInForeground", "true");
@@ -98,6 +99,9 @@ public class ServerConfigTest {
 
     assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
 
+    assertEquals(MutationDetection.NONE, serverConfig.getJsonMutationDetection());
+    serverConfig.setJsonMutationDetection(MutationDetection.SOURCE);
+    assertEquals(MutationDetection.SOURCE, serverConfig.getJsonMutationDetection());
     assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
     assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
@@ -156,6 +160,7 @@ public class ServerConfigTest {
     assertFalse(serverConfig.isIdGeneratorAutomatic());
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
+    assertEquals(MutationDetection.HASH, serverConfig.getJsonMutationDetection());
     assertTrue(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
     assertTrue(serverConfig.isAutoLoadModuleInfo());
 

From a76442641b5eff698a0c36312ab9da3d35549e9d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Aug 2021 13:14:00 +1200
Subject: [PATCH 338/447] Tidy test only - rename ServerConfigTest to
 DatabaseConfigTest and tidy

---
 .../io/ebean/config/DatabaseConfigTest.java   | 194 ++++++++++++++++++
 .../io/ebean/config/ServerConfigTest.java     | 194 ------------------
 2 files changed, 194 insertions(+), 194 deletions(-)
 create mode 100644 ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java
 delete mode 100644 ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java

diff --git a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java
new file mode 100644
index 000000000..dd132a8e3
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java
@@ -0,0 +1,194 @@
+package io.ebean.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.annotation.MutationDetection;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.datasource.DataSourceConfig;
+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;
+import static org.junit.Assert.assertTrue;
+
+public class DatabaseConfigTest {
+
+  @Test
+  public void testLoadFromEbeanProperties() {
+
+    DatabaseConfig config = new DatabaseConfig();
+    config.loadFromProperties();
+
+    assertEquals(PersistBatch.NONE, config.getPersistBatch());
+    assertNotNull(config.getProperties());
+  }
+
+  @Test
+  public void evalPropertiesInput() {
+
+    String home = System.getenv("HOME");
+
+    Properties props = new Properties();
+    props.setProperty("ddl.initSql", "${HOME}/initSql");
+
+    DatabaseConfig config = new DatabaseConfig();
+    config.loadFromProperties(props);
+
+    String ddlInitSql = config.getDdlInitSql();
+    assertThat(ddlInitSql).isEqualTo(home+"/initSql");
+  }
+
+  @Test
+  public void testLoadWithProperties() {
+
+    DatabaseConfig config = new DatabaseConfig();
+    config.setPersistBatch(PersistBatch.NONE);
+    config.setPersistBatchOnCascade(PersistBatch.NONE);
+    config.setAutoReadOnlyDataSource(false);
+    config.setReadOnlyDataSource(null);
+    config.setReadOnlyDataSourceConfig(new DataSourceConfig());
+
+    Properties props = new Properties();
+    props.setProperty("persistBatch", "ALL");
+    props.setProperty("persistBatchOnCascade", "ALL");
+    props.setProperty("dbuuid", "binary");
+    props.setProperty("jdbcFetchSizeFindEach", "42");
+    props.setProperty("jdbcFetchSizeFindList", "43");
+    props.setProperty("backgroundExecutorShutdownSecs", "98");
+    props.setProperty("backgroundExecutorSchedulePoolSize", "4");
+    props.setProperty("dbOffline", "true");
+    props.setProperty("jsonDateTime", "MILLIS");
+    props.setProperty("jsonDate", "MILLIS");
+    props.setProperty("jsonMutationDetection", "NONE");
+    props.setProperty("autoReadOnlyDataSource", "true");
+    props.setProperty("disableL2Cache", "true");
+    props.setProperty("notifyL2CacheInForeground", "true");
+    props.setProperty("idType", "SEQUENCE");
+    props.setProperty("mappingLocations", "classpath:/foo;bar");
+    props.setProperty("namingConvention", "io.ebean.config.MatchingNamingConvention");
+    props.setProperty("idGeneratorAutomatic", "true");
+    props.setProperty("enabledL2Regions", "r0,users,orgs");
+    props.setProperty("caseSensitiveCollation", "false");
+    props.setProperty("loadModuleInfo", "true");
+    props.setProperty("forUpdateNoKey", "true");
+    props.setProperty("defaultServer", "false");
+
+    props.setProperty("queryPlan.enable", "true");
+    props.setProperty("queryPlan.thresholdMicros", "10000");
+    props.setProperty("queryPlan.capture", "true");
+    props.setProperty("queryPlan.capturePeriodSecs", "42");
+    props.setProperty("queryPlan.captureMaxTimeMillis", "560");
+    props.setProperty("queryPlan.captureMaxCount", "7");
+
+    config.loadFromProperties(props);
+
+    assertFalse(config.isDefaultServer());
+    assertTrue(config.isDisableL2Cache());
+    assertTrue(config.isNotifyL2CacheInForeground());
+    assertTrue(config.isDbOffline());
+    assertTrue(config.isAutoReadOnlyDataSource());
+    assertTrue(config.isAutoLoadModuleInfo());
+
+    assertTrue(config.isIdGeneratorAutomatic());
+    assertFalse(config.getPlatformConfig().isCaseSensitiveCollation());
+    assertTrue(config.getPlatformConfig().isForUpdateNoKey());
+
+    assertThat(config.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
+
+    assertEquals(MutationDetection.NONE, config.getJsonMutationDetection());
+    config.setJsonMutationDetection(MutationDetection.SOURCE);
+    assertEquals(MutationDetection.SOURCE, config.getJsonMutationDetection());
+    assertEquals(IdType.SEQUENCE, config.getIdType());
+    assertEquals(PersistBatch.ALL, config.getPersistBatch());
+    assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade());
+    assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid());
+    assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime());
+    assertEquals(JsonConfig.Date.MILLIS, config.getJsonDate());
+
+    assertEquals("r0,users,orgs", config.getEnabledL2Regions());
+
+    assertEquals(42, config.getJdbcFetchSizeFindEach());
+    assertEquals(43, config.getJdbcFetchSizeFindList());
+    assertEquals(4, config.getBackgroundExecutorSchedulePoolSize());
+    assertEquals(98, config.getBackgroundExecutorShutdownSecs());
+
+    assertTrue(config.isQueryPlanEnable());
+    assertEquals(10000, config.getQueryPlanThresholdMicros());
+    assertTrue(config.isQueryPlanCapture());
+    assertEquals(42, config.getQueryPlanCapturePeriodSecs());
+    assertEquals(560, config.getQueryPlanCaptureMaxTimeMillis());
+    assertEquals(7, config.getQueryPlanCaptureMaxCount());
+
+    assertThat(config.getMappingLocations()).containsExactly("classpath:/foo","bar");
+
+    config.setPersistBatch(PersistBatch.NONE);
+    config.setPersistBatchOnCascade(PersistBatch.NONE);
+
+    Properties props1 = new Properties();
+    props1.setProperty("ebean.persistBatch", "ALL");
+    props1.setProperty("ebean.persistBatchOnCascade", "ALL");
+
+    config.setNotifyL2CacheInForeground(true);
+    config.setDisableL2Cache(true);
+    props1.setProperty("ebean.disableL2Cache", "false");
+    props1.setProperty("ebean.notifyL2CacheInForeground", "false");
+
+    config.loadFromProperties(props1);
+    assertFalse(config.isDisableL2Cache());
+    assertFalse(config.isNotifyL2CacheInForeground());
+
+    assertEquals(PersistBatch.ALL, config.getPersistBatch());
+    assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade());
+
+    config.setEnabledL2Regions("r0,orgs");
+    assertEquals("r0,orgs", config.getEnabledL2Regions());
+  }
+
+  @Test
+  public void test_defaults() {
+
+    DatabaseConfig config = new DatabaseConfig();
+    assertTrue(config.isIdGeneratorAutomatic());
+    assertTrue(config.isDefaultServer());
+    assertFalse(config.isAutoPersistUpdates());
+
+    config.setIdGeneratorAutomatic(false);
+    assertFalse(config.isIdGeneratorAutomatic());
+    assertEquals(JsonConfig.DateTime.ISO8601, config.getJsonDateTime());
+    assertEquals(JsonConfig.Date.ISO8601, config.getJsonDate());
+    assertEquals(MutationDetection.HASH, config.getJsonMutationDetection());
+    assertTrue(config.getPlatformConfig().isCaseSensitiveCollation());
+    assertTrue(config.isAutoLoadModuleInfo());
+
+    assertFalse(config.isQueryPlanEnable());
+    assertEquals(Long.MAX_VALUE, config.getQueryPlanThresholdMicros());
+    assertFalse(config.isQueryPlanCapture());
+    assertEquals(600, config.getQueryPlanCapturePeriodSecs());
+    assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
+    assertEquals(10, config.getQueryPlanCaptureMaxCount());
+
+    config.setLoadModuleInfo(false);
+    assertFalse(config.isAutoLoadModuleInfo());
+    config.setAutoPersistUpdates(true);
+    assertTrue(config.isAutoPersistUpdates());
+  }
+
+  @Test
+  public void test_putServiceObject() {
+
+    ObjectMapper objectMapper = new ObjectMapper();
+
+    DatabaseConfig config = new DatabaseConfig();
+    config.putServiceObject(objectMapper);
+
+    ObjectMapper mapper0 = config.getServiceObject(ObjectMapper.class);
+    ObjectMapper mapper1 = (ObjectMapper)config.getServiceObject("objectMapper");
+
+    assertThat(objectMapper).isSameAs(mapper0);
+    assertThat(objectMapper).isSameAs(mapper1);
+  }
+}
diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
deleted file mode 100644
index 46f283e55..000000000
--- a/ebean-core/src/test/java/io/ebean/config/ServerConfigTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package io.ebean.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.ebean.annotation.MutationDetection;
-import io.ebean.annotation.PersistBatch;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.datasource.DataSourceConfig;
-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;
-import static org.junit.Assert.assertTrue;
-
-public class ServerConfigTest {
-
-  @Test
-  public void testLoadFromEbeanProperties() {
-
-    ServerConfig serverConfig = new ServerConfig();
-    serverConfig.loadFromProperties();
-
-    assertEquals(PersistBatch.NONE, serverConfig.getPersistBatch());
-    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() {
-
-    ServerConfig serverConfig = new ServerConfig();
-    serverConfig.setPersistBatch(PersistBatch.NONE);
-    serverConfig.setPersistBatchOnCascade(PersistBatch.NONE);
-    serverConfig.setAutoReadOnlyDataSource(false);
-    serverConfig.setReadOnlyDataSource(null);
-    serverConfig.setReadOnlyDataSourceConfig(new DataSourceConfig());
-
-    Properties props = new Properties();
-    props.setProperty("persistBatch", "ALL");
-    props.setProperty("persistBatchOnCascade", "ALL");
-    props.setProperty("dbuuid", "binary");
-    props.setProperty("jdbcFetchSizeFindEach", "42");
-    props.setProperty("jdbcFetchSizeFindList", "43");
-    props.setProperty("backgroundExecutorShutdownSecs", "98");
-    props.setProperty("backgroundExecutorSchedulePoolSize", "4");
-    props.setProperty("dbOffline", "true");
-    props.setProperty("jsonDateTime", "MILLIS");
-    props.setProperty("jsonDate", "MILLIS");
-    props.setProperty("jsonMutationDetection", "NONE");
-    props.setProperty("autoReadOnlyDataSource", "true");
-    props.setProperty("disableL2Cache", "true");
-    props.setProperty("notifyL2CacheInForeground", "true");
-    props.setProperty("idType", "SEQUENCE");
-    props.setProperty("mappingLocations", "classpath:/foo;bar");
-    props.setProperty("namingConvention", "io.ebean.config.MatchingNamingConvention");
-    props.setProperty("idGeneratorAutomatic", "true");
-    props.setProperty("enabledL2Regions", "r0,users,orgs");
-    props.setProperty("caseSensitiveCollation", "false");
-    props.setProperty("loadModuleInfo", "true");
-    props.setProperty("forUpdateNoKey", "true");
-    props.setProperty("defaultServer", "false");
-
-    props.setProperty("queryPlan.enable", "true");
-    props.setProperty("queryPlan.thresholdMicros", "10000");
-    props.setProperty("queryPlan.capture", "true");
-    props.setProperty("queryPlan.capturePeriodSecs", "42");
-    props.setProperty("queryPlan.captureMaxTimeMillis", "560");
-    props.setProperty("queryPlan.captureMaxCount", "7");
-
-    serverConfig.loadFromProperties(props);
-
-    assertFalse(serverConfig.isDefaultServer());
-    assertTrue(serverConfig.isDisableL2Cache());
-    assertTrue(serverConfig.isNotifyL2CacheInForeground());
-    assertTrue(serverConfig.isDbOffline());
-    assertTrue(serverConfig.isAutoReadOnlyDataSource());
-    assertTrue(serverConfig.isAutoLoadModuleInfo());
-
-    assertTrue(serverConfig.isIdGeneratorAutomatic());
-    assertFalse(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
-    assertTrue(serverConfig.getPlatformConfig().isForUpdateNoKey());
-
-    assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
-
-    assertEquals(MutationDetection.NONE, serverConfig.getJsonMutationDetection());
-    serverConfig.setJsonMutationDetection(MutationDetection.SOURCE);
-    assertEquals(MutationDetection.SOURCE, serverConfig.getJsonMutationDetection());
-    assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
-    assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
-    assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
-    assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
-    assertEquals(JsonConfig.DateTime.MILLIS, serverConfig.getJsonDateTime());
-    assertEquals(JsonConfig.Date.MILLIS, serverConfig.getJsonDate());
-
-    assertEquals("r0,users,orgs", serverConfig.getEnabledL2Regions());
-
-    assertEquals(42, serverConfig.getJdbcFetchSizeFindEach());
-    assertEquals(43, serverConfig.getJdbcFetchSizeFindList());
-    assertEquals(4, serverConfig.getBackgroundExecutorSchedulePoolSize());
-    assertEquals(98, serverConfig.getBackgroundExecutorShutdownSecs());
-
-    assertTrue(serverConfig.isQueryPlanEnable());
-    assertEquals(10000, serverConfig.getQueryPlanThresholdMicros());
-    assertTrue(serverConfig.isQueryPlanCapture());
-    assertEquals(42, serverConfig.getQueryPlanCapturePeriodSecs());
-    assertEquals(560, serverConfig.getQueryPlanCaptureMaxTimeMillis());
-    assertEquals(7, serverConfig.getQueryPlanCaptureMaxCount());
-
-    assertThat(serverConfig.getMappingLocations()).containsExactly("classpath:/foo","bar");
-
-    serverConfig.setPersistBatch(PersistBatch.NONE);
-    serverConfig.setPersistBatchOnCascade(PersistBatch.NONE);
-
-    Properties props1 = new Properties();
-    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());
-
-    assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
-    assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
-
-    serverConfig.setEnabledL2Regions("r0,orgs");
-    assertEquals("r0,orgs", serverConfig.getEnabledL2Regions());
-  }
-
-  @Test
-  public void test_defaults() {
-
-    ServerConfig serverConfig = new ServerConfig();
-    assertTrue(serverConfig.isIdGeneratorAutomatic());
-    assertTrue(serverConfig.isDefaultServer());
-    assertFalse(serverConfig.isAutoPersistUpdates());
-
-    serverConfig.setIdGeneratorAutomatic(false);
-    assertFalse(serverConfig.isIdGeneratorAutomatic());
-    assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
-    assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
-    assertEquals(MutationDetection.HASH, serverConfig.getJsonMutationDetection());
-    assertTrue(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
-    assertTrue(serverConfig.isAutoLoadModuleInfo());
-
-    assertFalse(serverConfig.isQueryPlanEnable());
-    assertEquals(Long.MAX_VALUE, serverConfig.getQueryPlanThresholdMicros());
-    assertFalse(serverConfig.isQueryPlanCapture());
-    assertEquals(600, serverConfig.getQueryPlanCapturePeriodSecs());
-    assertEquals(10000L, serverConfig.getQueryPlanCaptureMaxTimeMillis());
-    assertEquals(10, serverConfig.getQueryPlanCaptureMaxCount());
-
-    serverConfig.setLoadModuleInfo(false);
-    assertFalse(serverConfig.isAutoLoadModuleInfo());
-    serverConfig.setAutoPersistUpdates(true);
-    assertTrue(serverConfig.isAutoPersistUpdates());
-  }
-
-  @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 9a82dbb3e6e22bfac5799cdb0ea405eb354e05aa Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Aug 2021 13:17:32 +1200
Subject: [PATCH 339/447] Bump parent to java8-oss 3.2 with GPG maven plugin
 active only with "release" profile

The GPG maven plugin is now only active with the "release" profile
use -P release when we want to release with GPG signing
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0328ea5b6..465b49402 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>3.1</version>
+    <version>3.2</version>
   </parent>
 
   <groupId>io.ebean</groupId>

From d98a31fa6b64f9dbf0cb57b018c4a6fb38561beb Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Aug 2021 16:53:51 +1200
Subject: [PATCH 340/447] Bump to 12.11.0-SNAPSHOT

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  4 ++--
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 |  8 ++++----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  |  8 ++++----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  2 +-
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 503c2f2c5..9afbb6446 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 1534f122b..0b0355981 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 0e6ebde4d..9f79cc9c2 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.10.1-SNAPSHOT</version>
+        <version>12.11.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index ad1d7c207..35a29a677 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 8303c519d..cfac597fa 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index dec77c4b0..d7267945e 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 5cb459f61..a9b9968b9 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 8275fc989..0ce9ce6ca 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index ff1beee77..a6bfe2ed0 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index d9a2cdd6e..b3ffadfc0 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 097cd9318..d0d5f8ee2 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e889b6204..43b5ee6f3 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index ddd60d284..819328290 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index c3a487ecf..8f3cafa8a 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.10.1-SNAPSHOT</version>
+      <version>12.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 465b49402..b86928387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.10.1-SNAPSHOT</version>
+  <version>12.11.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 27e5d0399..956e39cb5 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.10.1-SNAPSHOT</version>
+    <version>12.11.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From f34e0f5f2b8536f8d452818b0f04582f89c3bf72 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Aug 2021 23:03:02 +1200
Subject: [PATCH 341/447] #2287 - ebean-migration: For multiple platforms
 automatically run the correct migrations

---
 ebean-bom/pom.xml                             |  8 +++---
 ebean-core/pom.xml                            |  4 +--
 .../server/core/DefaultServer.java            |  1 +
 .../server/core/bootup/BootupClasses.java     | 27 +++----------------
 ebean-ddl-generator/pom.xml                   |  2 +-
 .../dbmigration/DefaultDbMigration.java       |  9 +++----
 .../dbmigration/IndexMigration.java           |  5 +---
 .../dbmigration/IndexMigrationTest.java       |  4 +--
 ebean-externalmapping-xml/pom.xml             |  2 +-
 .../xmlmapping/XmlMappingReader.java          |  3 +--
 10 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 9f79cc9c2..35ed6d6a0 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -14,12 +14,12 @@
 
   <properties>
     <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
-    <ebean-migration-auto.version>1.0</ebean-migration-auto.version>
-    <ebean-migration.version>12.4.0</ebean-migration.version>
+    <ebean-migration-auto.version>1.1</ebean-migration-auto.version>
+    <ebean-migration.version>12.11.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
     <ebean-datasource.version>7.0</ebean-datasource.version>
-    <ebean-agent.version>12.10.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.10.0</ebean-maven-plugin.version>
+    <ebean-agent.version>12.11.0</ebean-agent.version>
+    <ebean-maven-plugin.version>12.11.0</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index cfac597fa..3426582d3 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -52,13 +52,13 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>classpath-scanner</artifactId>
-      <version>4.2</version>
+      <version>6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration-auto</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
 
     <!-- keep testing in core using ebean-ddl-generator & ebean-migration -->
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 4aa90ad13..d21f9967f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -397,6 +397,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       if (dbSchema != null) {
         migrationRunner.setDefaultDbSchema(dbSchema);
       }
+      migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase());
       migrationRunner.loadProperties(config.getProperties());
       migrationRunner.run(config.getDataSource());
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
index f7c1a5fea..aba5533e0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.core.bootup;
 
-import io.avaje.classpath.scanner.ClassFilter;
 import io.ebean.annotation.DocStore;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.IdGenerator;
@@ -27,27 +26,23 @@ import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * Interesting classes for a EbeanServer such as Embeddable, Entity,
  * ScalarTypes, Finders, Listeners and Controllers.
  */
-public class BootupClasses implements ClassFilter {
+public class BootupClasses implements Predicate<Class<?>> {
 
   private static final Logger logger = LoggerFactory.getLogger(BootupClasses.class);
 
   private final List<Class<?>> embeddableList = new ArrayList<>();
-
   private final List<Class<?>> entityList = new ArrayList<>();
-
   private final List<Class<? extends ScalarType<?>>> scalarTypeList = new ArrayList<>();
-
   private final List<Class<? extends ScalarTypeConverter<?, ?>>> scalarConverterList = new ArrayList<>();
-
   private final List<Class<? extends AttributeConverter<?, ?>>> attributeConverterList = new ArrayList<>();
 
   // The following objects are instantiated on first request
@@ -55,19 +50,12 @@ public class BootupClasses implements ClassFilter {
   // instance list, that holds the instance. Once a class is instantiated
   // (or added) it will get removed from the candidate list
   private final List<Class<? extends IdGenerator>> idGeneratorCandidates = new ArrayList<>();
-
   private final List<Class<? extends BeanPersistController>> beanPersistControllerCandidates = new ArrayList<>();
-
   private final List<Class<? extends BeanPostLoad>> beanPostLoadCandidates = new ArrayList<>();
-
   private final List<Class<? extends BeanPostConstructListener>> beanPostConstructListenerCandidates = new ArrayList<>();
-
   private final List<Class<? extends BeanFindController>> beanFindControllerCandidates = new ArrayList<>();
-
   private final List<Class<? extends BeanPersistListener>> beanPersistListenerCandidates = new ArrayList<>();
-
   private final List<Class<? extends BeanQueryAdapter>> beanQueryAdapterCandidates = new ArrayList<>();
-
   private final List<Class<? extends ServerConfigStartup>> serverConfigStartupCandidates = new ArrayList<>();
 
   private final List<IdGenerator> idGeneratorInstances = new ArrayList<>();
@@ -98,7 +86,7 @@ public class BootupClasses implements ClassFilter {
   public BootupClasses(List<Class<?>> list) {
     if (list != null) {
       for (Class<?> cls : list) {
-        isMatch(cls);
+        test(cls);
       }
     }
   }
@@ -188,13 +176,11 @@ public class BootupClasses implements ClassFilter {
   }
 
   public void addChangeLogInstances(DatabaseConfig config) {
-
     readAuditPrepare = config.getReadAuditPrepare();
     readAuditLogger = config.getReadAuditLogger();
     changeLogPrepare = config.getChangeLogPrepare();
     changeLogListener = config.getChangeLogListener();
     changeLogRegister = config.getChangeLogRegister();
-
     // if not already set create the implementations found
     // via classpath scanning
     if (readAuditPrepare == null && readAuditPrepareClass != null) {
@@ -341,18 +327,14 @@ public class BootupClasses implements ClassFilter {
   }
 
   @Override
-  public boolean isMatch(Class<?> cls) {
-
+  public boolean test(Class<?> cls) {
     if (isEmbeddable(cls)) {
       embeddableList.add(cls);
-
     } else if (isEntity(cls)) {
       entityList.add(cls);
-
     } else {
       return isInterestingInterface(cls);
     }
-
     return true;
   }
 
@@ -364,7 +346,6 @@ public class BootupClasses implements ClassFilter {
    */
   @SuppressWarnings("unchecked")
   private boolean isInterestingInterface(Class<?> cls) {
-
     if (Modifier.isAbstract(cls.getModifiers())) {
       // do not include abstract classes as we can
       // not instantiate them
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index d7267945e..4035af5f2 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>12.4.0</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 7f2a90558..5bb40fa08 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -281,7 +281,7 @@ public class DefaultDbMigration implements DbMigration {
   public String generateMigration() throws IOException {
     final String version = generateMigrationFor(false);
     if (includeIndex) {
-      generateIndex(version);
+      generateIndex();
     }
     return version;
   }
@@ -289,15 +289,14 @@ public class DefaultDbMigration implements DbMigration {
   /**
    * Generate the {@code idx_platform.migrations} file.
    */
-  private void generateIndex(String version) throws IOException {
-    final boolean overwrite = version != null;
+  private void generateIndex() throws IOException {
     final File topDir = migrationDirectory(false);
     if (!platforms.isEmpty()) {
       for (Pair pair : platforms) {
-        new IndexMigration(topDir, pair).generate(overwrite);
+        new IndexMigration(topDir, pair).generate();
       }
     } else {
-      new IndexMigration(topDir, databasePlatform).generate(overwrite);
+      new IndexMigration(topDir, databasePlatform).generate();
     }
   }
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
index 215c18e72..baedb77b9 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
@@ -43,10 +43,7 @@ class IndexMigration {
     return new File(topDir, name);
   }
 
-  void generate(boolean overwrite) throws IOException {
-    if (!overwrite && indexFile.exists()) {
-      return;
-    }
+  void generate() throws IOException {
     readSqlFiles(topDir);
     generateIndex();
   }
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java
index 5a04d8917..a22a42ec7 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/IndexMigrationTest.java
@@ -24,7 +24,7 @@ public class IndexMigrationTest {
     }
     DatabasePlatform pg = new PostgresPlatform();
     IndexMigration indexMigration = new IndexMigration(topDir, pg);
-    indexMigration.generate(true);
+    indexMigration.generate();
 
 
     File expected = new File(topDir, "idx_postgres.migrations");
@@ -48,7 +48,7 @@ public class IndexMigrationTest {
     }
     DatabasePlatform pg = new H2Platform();
     IndexMigration indexMigration = new IndexMigration(topDir, pg);
-    indexMigration.generate(true);
+    indexMigration.generate();
 
     File expected = new File(topDir, "idx_h2.migrations");
     assertThat(expected).exists();
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 0ce9ce6ca..3f0b71546 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>classpath-scanner</artifactId>
-      <version>4.2</version>
+      <version>6.0</version>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
index 2519ef8f1..8b28975ef 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
@@ -6,7 +6,6 @@ import io.ebeaninternal.xmlmapping.model.XmEbean;
 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;
 import java.net.URL;
@@ -59,7 +58,7 @@ public class XmlMappingReader {
     try {
       List<XmEbean> mappings = new ArrayList<>();
       for (Resource xmlMappingRes : resourceList) {
-        try (InputStream is = new FileInputStream(xmlMappingRes.getLocationOnDisk())) {
+        try (InputStream is = xmlMappingRes.inputStream()) {
           mappings.add(XmlMappingReader.read(is));
         }
       }

From 7ca72a39b1c2cce8a35b2e79871145e4c5970498 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 6 Aug 2021 11:52:38 +1200
Subject: [PATCH 342/447] Change query metric hash from MD5 of sql + name + loc
 to Checksum of sql

---
 .../java/io/ebean/meta/MetaQueryMetric.java   |  2 +-
 .../java/io/ebean/meta/MetaQueryPlan.java     |  2 +-
 .../main/java/io/ebean/meta/MetricData.java   |  6 ++--
 .../java/io/ebean/meta/QueryPlanInit.java     | 10 +++---
 .../io/ebeaninternal/api/SpiQueryPlan.java    |  2 +-
 .../server/core/DumpMetricsJson.java          | 19 ++++++------
 .../server/profile/DQueryPlanMeta.java        | 16 +++-------
 .../server/profile/DQueryPlanMetric.java      |  2 +-
 .../server/query/CQueryPlan.java              | 25 +++------------
 .../server/query/CQueryPlanStats.java         |  2 +-
 .../server/query/DQueryPlanOutput.java        |  7 ++---
 .../io/ebeaninternal/server/util/Md5.java     | 31 -------------------
 .../io/ebeaninternal/server/util/Md5Test.java | 18 -----------
 .../query/finder/TestCustomerFinder.java      |  2 +-
 14 files changed, 36 insertions(+), 108 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
 delete mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java

diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
index 514b700dc..edfe978e5 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
@@ -23,6 +23,6 @@ public interface MetaQueryMetric extends MetaTimedMetric {
   /**
    * Return the hash of the plan.
    */
-  String getHash();
+  long getHash();
 
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
index fb2b6d095..4f9667bd0 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
@@ -30,7 +30,7 @@ public interface MetaQueryPlan {
   /**
    * Return the hash of the plan.
    */
-  String getHash();
+  long getHash();
 
   /**
    * Return a description of the bind values.
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetricData.java b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
index b4606b1d7..9a24aa9f2 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetricData.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
@@ -6,7 +6,7 @@ package io.ebean.meta;
 public class MetricData {
 
   private String name;
-  private String hash;
+  private long hash;
   private String loc;
   private String sql;
 
@@ -30,11 +30,11 @@ public class MetricData {
     this.name = name;
   }
 
-  public String getHash() {
+  public long getHash() {
     return hash;
   }
 
-  public void setHash(String hash) {
+  public void setHash(long hash) {
     this.hash = hash;
   }
 
diff --git a/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java b/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
index 3c19caa39..9b785ec62 100644
--- a/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
+++ b/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
@@ -10,7 +10,7 @@ public class QueryPlanInit {
 
   private boolean all;
 
-  private Set<String> hashes = new HashSet<>();
+  private Set<Long> hashes = new HashSet<>();
 
   private long thresholdMicros;
 
@@ -47,21 +47,21 @@ public class QueryPlanInit {
   /**
    * Return true if the query plan should be initiated based on it's hash.
    */
-  public boolean includeHash(String hash) {
-    return all || hashes.contains(hash);
+  public boolean includeHash(long sqlHash) {
+    return all || hashes.contains(sqlHash);
   }
 
   /**
    * Return the specific hashes that we want to collect query plans on.
    */
-  public Set<String> getHashes() {
+  public Set<Long> getHashes() {
     return hashes;
   }
 
   /**
    * Set the specific hashes that we want to collect query plans on.
    */
-  public void setHashes(Set<String> hashes) {
+  public void setHashes(Set<Long> hashes) {
     this.hashes = hashes;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
index 96a1eade7..cd6c83114 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
@@ -20,7 +20,7 @@ public interface SpiQueryPlan {
   /**
    * The hash for the query plan.
    */
-  String getHash();
+  long getHash();
 
   /**
    * The SQL for the query plan.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
index ed13151c4..240d050f3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
@@ -197,7 +197,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     metricStart(metric);
     appendTiming(metric);
     if (withHash) {
-      appendExtra("hash", metric.getHash());
+      keyVal("hash", metric.getHash());
     }
     if (isIncludeDetail(metric)) {
       appendExtra("loc", metric.getLocation());
@@ -218,13 +218,14 @@ class DumpMetricsJson implements ServerMetricsAsJson {
   }
 
   private void appendTiming(MetaTimedMetric timedMetric) throws IOException {
-    key("count");
-    val(timedMetric.getCount());
-    key("total");
-    val(timedMetric.getTotal());
-    key("mean");
-    val(timedMetric.getMean());
-    key("max");
-    val(timedMetric.getMax());
+    keyVal("count", timedMetric.getCount());
+    keyVal("total", timedMetric.getTotal());
+    keyVal("mean", timedMetric.getMean());
+    keyVal("max", timedMetric.getMax());
+  }
+
+  private void keyVal(String key, long value) throws IOException {
+    key(key);
+    val(value);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
index 0690b5fdd..0f25f0d9c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
-import io.ebeaninternal.server.util.Md5;
+import io.ebeaninternal.server.util.Checksum;
 
 class DQueryPlanMeta {
 
@@ -10,7 +10,7 @@ class DQueryPlanMeta {
   private final ProfileLocation profileLocation;
   private final String name;
   private final String sql;
-  private final String hash;
+  private final long hash;
 
   DQueryPlanMeta(Class<?> type, String label, ProfileLocation profileLocation, String sql) {
     this.type = type;
@@ -22,22 +22,14 @@ class DQueryPlanMeta {
       name += "_" + label;
     }
     this.name = name;
-    this.hash = initHash();
-  }
-
-  private String initHash() {
-    StringBuilder sb = new StringBuilder(sql).append("|").append(name);
-    if (profileLocation != null) {
-      sb.append("|").append(profileLocation.location());
-    }
-    return Md5.hash(sb.toString());
+    this.hash = Checksum.checksum(sql);
   }
 
   public Class<?> getType() {
     return type;
   }
 
-  public String getHash() {
+  public long getHash() {
     return hash;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 21559a152..765679404 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -59,7 +59,7 @@ class DQueryPlanMetric implements QueryPlanMetric {
     }
 
     @Override
-    public String getHash() {
+    public long getHash() {
       return meta.getHash();
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 295cbe7c2..3c322190f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -13,12 +13,12 @@ import io.ebeaninternal.api.SpiQueryBindCapture;
 import io.ebeaninternal.api.SpiQueryPlan;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import io.ebeaninternal.server.util.Checksum;
 import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataBindCapture;
 import io.ebeaninternal.server.type.RsetDataReader;
-import io.ebeaninternal.server.util.Md5;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +68,7 @@ public class CQueryPlan implements SpiQueryPlan {
   private final boolean rawSql;
 
   private final String sql;
-  private final String hash;
+  private final long hash;
 
   private final String logWhereSql;
 
@@ -118,7 +118,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCapture(query);
-    this.hash = md5Hash();
+    this.hash = Checksum.checksum(sql);
   }
 
   /**
@@ -143,7 +143,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCaptureRaw(sql, query);
-    this.hash = md5Hash();
+    this.hash = Checksum.checksum(sql);
   }
 
   private String deriveName(String label, SpiQuery.Type type, String simpleName) {
@@ -193,7 +193,7 @@ public class CQueryPlan implements SpiQueryPlan {
   }
 
   @Override
-  public String getHash() {
+  public long getHash() {
     return hash;
   }
 
@@ -276,21 +276,6 @@ public class CQueryPlan implements SpiQueryPlan {
     return rawSql ? planKey.getPartialKey() + "_" + hash : planKey.getPartialKey();
   }
 
-  /**
-   * Return the MD5 hash of the sql.
-   */
-  private String md5Hash() {
-    StringBuilder sb = new StringBuilder(sql)
-      .append("|").append(name)
-      .append("|").append(location);
-    try {
-      return Md5.hash(sb.toString());
-    } catch (Exception e) {
-      logger.error("Failed to MD5 hash the query", e);
-      return "error";
-    }
-  }
-
   SqlTree getSqlTree() {
     return sqlTree;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 23de6de5c..3f7f61070 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -127,7 +127,7 @@ public final class CQueryPlanStats {
     }
 
     @Override
-    public String getHash() {
+    public long getHash() {
       return queryPlan.getHash();
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
index 8065a62dc..3d8c7aaac 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
@@ -16,12 +16,11 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
   private final String sql;
   private final String bind;
   private final String plan;
-
-  private String hash;
+  private final long hash;
   private long queryTimeMicros;
   private long captureCount;
 
-  DQueryPlanOutput(Class<?> beanType, String label, String hash, String sql, ProfileLocation profileLocation, String bind, String plan) {
+  DQueryPlanOutput(Class<?> beanType, String label, long hash, String sql, ProfileLocation profileLocation, String bind, String plan) {
     this.beanType = beanType;
     this.label = label;
     this.hash = hash;
@@ -32,7 +31,7 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
   }
 
   @Override
-  public String getHash() {
+  public long getHash() {
     return hash;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
deleted file mode 100644
index 7329d3f25..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.ebeaninternal.server.util;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-
-public final class Md5 {
-
-  /**
-   * Return the MD5 hash of the underlying sql.
-   */
-  public static String hash(String content) {
-    try {
-      MessageDigest md = MessageDigest.getInstance("MD5");
-      return digestToHex(md.digest(content.getBytes(StandardCharsets.UTF_8)));
-    } catch (Exception e) {
-      throw new RuntimeException("MD5 hashing failed", e);
-    }
-  }
-
-  /**
-   * Convert the digest into a hex value.
-   */
-  private static String digestToHex(byte[] digest) {
-    StringBuilder sb = new StringBuilder();
-    for (byte aDigest : digest) {
-      sb.append(Integer.toString((aDigest & 0xff) + 0x100, 16).substring(1));
-    }
-    return sb.toString();
-  }
-
-}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java
deleted file mode 100644
index d9db27d3d..000000000
--- a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.ebeaninternal.server.util;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class Md5Test {
-
-  @Test
-  public void hash() throws Exception {
-
-    String content = "some random content we wish to hash";
-    String hash1 = Md5.hash(content);
-    String hash2 = Md5.hash(content);
-    assertEquals(hash1, hash2);
-  }
-
-}
diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index eeefe42c2..8e8c5a288 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -244,7 +244,7 @@ public class TestCustomerFinder extends BaseTestCase {
     assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
     assertThat(metricsJson).contains("\"loc\":\"CustomerFinder.byNameStatus(CustomerFinder.java:44)\"");
     if (isH2() || isPostgres()) {
-      assertThat(metricsJson).contains("\"hash\":\"cc20eb930403cfd418db2d0475c6e26a\"");
+      assertThat(metricsJson).contains("\"hash\":3634991469");
       assertThat(metricsJson).contains("\"sql\":\"select t0.id, t0.status,");
     }
   }

From 202d78571012058ec55ace72a453edcc4d9f00d8 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 6 Aug 2021 12:06:43 +1200
Subject: [PATCH 343/447] Rename hash to sqlHash to better reflect what it is
 (CRC32 checksum of the sql)

---
 .../main/java/io/ebean/meta/MetaQueryMetric.java   |  4 ++--
 .../src/main/java/io/ebean/meta/MetricData.java    | 10 +++++-----
 .../java/io/ebeaninternal/api/SpiQueryPlan.java    |  4 ++--
 .../io/ebeaninternal/server/core/DumpMetrics.java  |  2 +-
 .../ebeaninternal/server/core/DumpMetricsData.java |  2 +-
 .../ebeaninternal/server/core/DumpMetricsJson.java |  2 +-
 .../server/deploy/BeanDescriptor.java              |  2 +-
 .../server/profile/DQueryPlanMeta.java             |  8 ++++----
 .../server/profile/DQueryPlanMetric.java           |  4 ++--
 .../io/ebeaninternal/server/query/CQueryPlan.java  | 14 +++++++-------
 .../server/query/CQueryPlanStats.java              |  4 ++--
 .../org/tests/query/finder/TestCustomerFinder.java |  6 +++---
 12 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
index edfe978e5..e3907c69c 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
@@ -21,8 +21,8 @@ public interface MetaQueryMetric extends MetaTimedMetric {
   String getSql();
 
   /**
-   * Return the hash of the plan.
+   * Return the hash of the sql.
    */
-  long getHash();
+  long getSqlHash();
 
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetricData.java b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
index 9a24aa9f2..d8f80a0a9 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetricData.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
@@ -6,7 +6,7 @@ package io.ebean.meta;
 public class MetricData {
 
   private String name;
-  private long hash;
+  private long sqlHash;
   private String loc;
   private String sql;
 
@@ -30,12 +30,12 @@ public class MetricData {
     this.name = name;
   }
 
-  public long getHash() {
-    return hash;
+  public long getSqlHash() {
+    return sqlHash;
   }
 
-  public void setHash(long hash) {
-    this.hash = hash;
+  public void setSqlHash(long sqlHash) {
+    this.sqlHash = sqlHash;
   }
 
   public String getLoc() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
index cd6c83114..878dcc716 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
@@ -18,9 +18,9 @@ public interface SpiQueryPlan {
   String getName();
 
   /**
-   * The hash for the query plan.
+   * The hash of the sql.
    */
-  long getHash();
+  long getSqlHash();
 
   /**
    * The SQL for the query plan.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 972ee2754..4c42c4b11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -120,7 +120,7 @@ class DumpMetrics {
     appendQueryName(metric, sb);
     appendCounters(metric, sb);
     if (dumpHash) {
-      sb.append("\n hash:").append(metric.getHash());
+      sb.append("\n sqlHash:").append(metric.getSqlHash());
     }
     appendProfileAndSql(metric, sb);
     out(sb.toString());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
index 9854cafea..7458d0468 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
@@ -67,7 +67,7 @@ class DumpMetricsData {
     final MetricData data = create(metric);
     appendCounters(data, metric);
     appendLocationAndSql(data, metric);
-    data.setHash(metric.getHash());
+    data.setSqlHash(metric.getSqlHash());
   }
 
   private void appendLocationAndSql(MetricData data, MetaQueryMetric metric) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
index 240d050f3..6f74dac97 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
@@ -197,7 +197,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     metricStart(metric);
     appendTiming(metric);
     if (withHash) {
-      keyVal("hash", metric.getHash());
+      keyVal("sqlHash", metric.getSqlHash());
     }
     if (isIncludeDetail(metric)) {
       appendExtra("loc", metric.getLocation());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 8f0fea0f2..e08b37d1d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1558,7 +1558,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
 
   void queryPlanInit(QueryPlanInit request, List<MetaQueryPlan> list) {
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
-      if (request.includeHash(queryPlan.getHash())) {
+      if (request.includeHash(queryPlan.getSqlHash())) {
         queryPlan.queryPlanInit(request.getThresholdMicros());
         list.add(queryPlan.createMeta(null, null));
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
index 0f25f0d9c..5359d96ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -10,7 +10,7 @@ class DQueryPlanMeta {
   private final ProfileLocation profileLocation;
   private final String name;
   private final String sql;
-  private final long hash;
+  private final long sqlHash;
 
   DQueryPlanMeta(Class<?> type, String label, ProfileLocation profileLocation, String sql) {
     this.type = type;
@@ -22,15 +22,15 @@ class DQueryPlanMeta {
       name += "_" + label;
     }
     this.name = name;
-    this.hash = Checksum.checksum(sql);
+    this.sqlHash = Checksum.checksum(sql);
   }
 
   public Class<?> getType() {
     return type;
   }
 
-  public long getHash() {
-    return hash;
+  public long getSqlHash() {
+    return sqlHash;
   }
 
   public String getName() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 765679404..fda2b62b8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -59,8 +59,8 @@ class DQueryPlanMetric implements QueryPlanMetric {
     }
 
     @Override
-    public long getHash() {
-      return meta.getHash();
+    public long getSqlHash() {
+      return meta.getSqlHash();
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 3c322190f..796290808 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -68,7 +68,7 @@ public class CQueryPlan implements SpiQueryPlan {
   private final boolean rawSql;
 
   private final String sql;
-  private final long hash;
+  private final long sqlHash;
 
   private final String logWhereSql;
 
@@ -118,7 +118,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCapture(query);
-    this.hash = Checksum.checksum(sql);
+    this.sqlHash = Checksum.checksum(sql);
   }
 
   /**
@@ -143,7 +143,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCaptureRaw(sql, query);
-    this.hash = Checksum.checksum(sql);
+    this.sqlHash = Checksum.checksum(sql);
   }
 
   private String deriveName(String label, SpiQuery.Type type, String simpleName) {
@@ -193,8 +193,8 @@ public class CQueryPlan implements SpiQueryPlan {
   }
 
   @Override
-  public long getHash() {
-    return hash;
+  public long getSqlHash() {
+    return sqlHash;
   }
 
   @Override
@@ -226,7 +226,7 @@ public class CQueryPlan implements SpiQueryPlan {
 
   @Override
   public DQueryPlanOutput createMeta(String bind, String planString) {
-    return new DQueryPlanOutput(getBeanType(), name, hash, sql, profileLocation, bind, planString);
+    return new DQueryPlanOutput(getBeanType(), name, sqlHash, sql, profileLocation, bind, planString);
   }
 
   public DataReader createDataReader(ResultSet rset) {
@@ -273,7 +273,7 @@ public class CQueryPlan implements SpiQueryPlan {
 
   private String calcAuditQueryKey() {
     // rawSql needs to include the MD5 hash of the sql
-    return rawSql ? planKey.getPartialKey() + "_" + hash : planKey.getPartialKey();
+    return rawSql ? planKey.getPartialKey() + "_" + sqlHash : planKey.getPartialKey();
   }
 
   SqlTree getSqlTree() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 3f7f61070..bbcfea2b9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -127,8 +127,8 @@ public final class CQueryPlanStats {
     }
 
     @Override
-    public long getHash() {
-      return queryPlan.getHash();
+    public long getSqlHash() {
+      return queryPlan.getSqlHash();
     }
 
     @Override
diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 8e8c5a288..b6a40903f 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -216,7 +216,7 @@ public class TestCustomerFinder extends BaseTestCase {
     assertThat(plans0).isNotEmpty();
 
     for (MetaQueryPlan plan : plans) {
-      logger.info("queryplan label:{}, queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
+      logger.info("queryPlan label:{}, queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
         plan.getLabel(), plan.getQueryTimeMicros(), plan.getProfileLocation(),
         plan.getSql(), plan.getBind(), plan.getPlan());
       System.out.println(plan);
@@ -244,7 +244,7 @@ public class TestCustomerFinder extends BaseTestCase {
     assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
     assertThat(metricsJson).contains("\"loc\":\"CustomerFinder.byNameStatus(CustomerFinder.java:44)\"");
     if (isH2() || isPostgres()) {
-      assertThat(metricsJson).contains("\"hash\":3634991469");
+      assertThat(metricsJson).contains("\"sqlHash\":3634991469");
       assertThat(metricsJson).contains("\"sql\":\"select t0.id, t0.status,");
     }
   }
@@ -267,7 +267,7 @@ public class TestCustomerFinder extends BaseTestCase {
     assertThat(metricsJson).contains("\"name\":\"txn.main\"");
     assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
     assertThat(metricsJson).doesNotContain("\"loc\":");
-    assertThat(metricsJson).doesNotContain("\"hash\":");
+    assertThat(metricsJson).doesNotContain("\"sqlHash\":");
     assertThat(metricsJson).doesNotContain("\"sql\":");
   }
 

From 801d419f51b4cc56c6804d99da7acba07419e279 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 6 Aug 2021 13:14:29 +1200
Subject: [PATCH 344/447] Refactor io.ebean.meta API, method rename with
 deprecation

---
 .../io/ebean/meta/AbstractMetricVisitor.java  |  8 +--
 .../io/ebean/meta/BasicMetricVisitor.java     |  6 +--
 .../java/io/ebean/meta/MetaCountMetric.java   |  9 +++-
 .../main/java/io/ebean/meta/MetaMetric.java   |  9 +++-
 .../java/io/ebean/meta/MetaQueryMetric.java   | 39 ++++++++++++--
 .../java/io/ebean/meta/MetaQueryPlan.java     | 18 +++----
 .../java/io/ebean/meta/MetaTimedMetric.java   | 51 +++++++++++++++++--
 .../java/io/ebean/meta/MetricVisitor.java     |  8 +--
 .../java/io/ebean/meta/QueryPlanInit.java     |  8 +--
 .../java/io/ebean/meta/QueryPlanRequest.java  | 12 ++---
 .../java/io/ebean/meta/ServerMetrics.java     | 29 +++++++++--
 .../io/ebean/meta/ServerMetricsAsJson.java    |  4 +-
 .../main/java/io/ebean/meta/SortMetric.java   | 14 ++---
 .../server/core/DefaultQueryPlanListener.java |  4 +-
 .../server/core/DefaultServer.java            | 12 ++---
 .../server/core/DumpMetrics.java              | 28 +++++-----
 .../server/core/DumpMetricsData.java          | 26 +++++-----
 .../server/core/DumpMetricsJson.java          | 26 +++++-----
 .../server/deploy/BeanDescriptor.java         |  4 +-
 .../server/profile/DCountMetric.java          |  6 +--
 .../server/profile/DQueryPlanMetric.java      | 32 ++++++------
 .../server/profile/DTimeMetricStats.java      | 12 ++---
 .../server/profile/DTimedMetric.java          |  2 +-
 .../server/profile/DTimedProfileLocation.java |  2 +-
 .../server/query/CQueryPlanRequest.java       |  6 +--
 .../server/query/CQueryPlanStats.java         | 30 +++++------
 .../server/query/DQueryPlanOutput.java        | 28 +++++-----
 .../src/test/java/io/ebean/BaseTestCase.java  |  4 +-
 .../src/test/java/io/ebean/DtoQuery2Test.java | 10 ++--
 .../java/io/ebean/DtoQueryFromOrmTest.java    | 12 ++---
 .../src/test/java/io/ebean/DtoQueryTest.java  | 16 +++---
 .../test/java/io/ebean/UpdateQueryTest.java   | 12 ++---
 .../server/deploy/BeanIudMetricsTest.java     | 34 ++++++-------
 .../server/profile/DTimedMetricMapTest.java   | 12 ++---
 .../server/profile/DTimedMetricTest.java      | 26 +++++-----
 .../server/profile/SortMetricTest.java        |  2 +-
 .../batchinsert/TestBatchInsertFlush.java     | 10 ++--
 .../org/tests/m2m/TestM2mDeleteObject.java    |  2 +-
 .../query/finder/TestCustomerFinder.java      | 16 +++---
 .../tests/query/sqlquery/SqlQueryTests.java   |  2 +-
 .../transaction/TestNestedMandatory.java      |  2 +-
 .../TestTransactionalReadOnly.java            | 10 ++--
 .../org/tests/update/TestSqlUpdateInTxn.java  |  4 +-
 .../src/test/java/io/ebean/BaseTestCase.java  |  6 +--
 .../main/java/io/ebean/redis/RedisCache.java  |  7 ++-
 45 files changed, 363 insertions(+), 257 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/meta/AbstractMetricVisitor.java b/ebean-api/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
index 323b572ec..51df586d9 100644
--- a/ebean-api/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
+++ b/ebean-api/src/main/java/io/ebean/meta/AbstractMetricVisitor.java
@@ -18,22 +18,22 @@ public abstract class AbstractMetricVisitor implements MetricVisitor {
   }
 
   @Override
-  public boolean isReset() {
+  public boolean reset() {
     return reset;
   }
 
   @Override
-  public boolean isCollectTransactionMetrics() {
+  public boolean collectTransactionMetrics() {
     return collectTransactionMetrics;
   }
 
   @Override
-  public boolean isCollectQueryMetrics() {
+  public boolean collectQueryMetrics() {
     return collectQueryMetrics;
   }
 
   @Override
-  public boolean isCollectL2Metrics() {
+  public boolean collectL2Metrics() {
     return collectL2Metrics;
   }
 
diff --git a/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java b/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java
index c821c63a7..0db953159 100644
--- a/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java
+++ b/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java
@@ -27,17 +27,17 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM
   }
 
   @Override
-  public List<MetaTimedMetric> getTimedMetrics() {
+  public List<MetaTimedMetric> timedMetrics() {
     return timed;
   }
 
   @Override
-  public List<MetaQueryMetric> getQueryMetrics() {
+  public List<MetaQueryMetric> queryMetrics() {
     return query;
   }
 
   @Override
-  public List<MetaCountMetric> getCountMetrics() {
+  public List<MetaCountMetric> countMetrics() {
     return count;
   }
 
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java
index 8b6af3594..cdaa2d7fa 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java
@@ -8,6 +8,13 @@ public interface MetaCountMetric extends MetaMetric {
   /**
    * Return the total count.
    */
-  long getCount();
+  long count();
 
+  /**
+   * Migrate to count()
+   */
+  @Deprecated
+  default long getCount() {
+    return count();
+  }
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java
index 0d716fe23..671dc05c1 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java
@@ -8,6 +8,13 @@ public interface MetaMetric {
   /**
    * Return the metric name.
    */
-  String getName();
+  String name();
 
+  /**
+   * Migrate to name().
+   */
+  @Deprecated
+  default String getName() {
+    return name();
+  }
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
index e3907c69c..f5fee986c 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
@@ -8,21 +8,52 @@ public interface MetaQueryMetric extends MetaTimedMetric {
   /**
    * The type of entity or DTO bean.
    */
-  Class<?> getType();
+  Class<?> type();
+
+  /**
+   * Migrate to type().
+   */
+  @Deprecated
+  default Class<?> getType() {
+    return type();
+  }
 
   /**
    * The label for the query (can be null).
    */
-  String getLabel();
+  String label();
+
+  /**
+   * Migrate to label().
+   */
+  @Deprecated
+  default String getLabel() {
+    return label();
+  }
 
   /**
    * The actual SQL of the query.
    */
-  String getSql();
+  String sql();
+
+  /**
+   * Migrate to sql().
+   */
+  @Deprecated
+  default String getSql() {
+    return sql();
+  }
 
   /**
    * Return the hash of the sql.
    */
-  long getSqlHash();
+  long sqlHash();
 
+  /**
+   * Migrate to sqlHash().
+   */
+  @Deprecated
+  default long getSqlHash() {
+    return sqlHash();
+  }
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
index 4f9667bd0..6cdce69a1 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
@@ -10,45 +10,45 @@ public interface MetaQueryPlan {
   /**
    * Return the bean type for the query.
    */
-  Class<?> getBeanType();
+  Class<?> beanType();
 
   /**
    * Return the label of the query.
    */
-  String getLabel();
+  String label();
 
   /**
    * Return the profile location for the query.
    */
-  ProfileLocation getProfileLocation();
+  ProfileLocation profileLocation();
 
   /**
    * Return the sql of the query.
    */
-  String getSql();
+  String sql();
 
   /**
    * Return the hash of the plan.
    */
-  long getHash();
+  long sqlHash();
 
   /**
    * Return a description of the bind values.
    */
-  String getBind();
+  String bind();
 
   /**
    * Return the raw plan.
    */
-  String getPlan();
+  String plan();
 
   /**
    * Return the query execution time associated with the bind values capture.
    */
-  long getQueryTimeMicros();
+  long queryTimeMicros();
 
   /**
    * Return the total count of times bind capture has occurred.
    */
-  long getCaptureCount();
+  long captureCount();
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
index c6ba13516..f95f3248d 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
@@ -9,27 +9,68 @@ public interface MetaTimedMetric extends MetaMetric {
   /**
    * Return the metric location if defined.
    */
-  String getLocation();
+  String location();
+
+  /**
+   * Migrate to location()
+   */
+  @Deprecated
+  default String getLocation() {
+    return location();
+  }
 
   /**
    * Return the total count.
    */
-  long getCount();
+  long count();
+
+  /**
+   * Migrate to count()
+   */
+  @Deprecated
+  default long getCount() {
+    return count();
+  }
 
   /**
    * Return the total execution time in micros.
    */
-  long getTotal();
+  long total();
+
+  /**
+   * Migrate to total()
+   */
+  @Deprecated
+  default long getTotal() {
+    return total();
+  }
 
   /**
    * Return the max execution time in micros.
    */
-  long getMax();
+  long max();
+
+  /**
+   * Migrate to max()
+   */
+  @Deprecated
+  default long getMax() {
+    return max();
+  }
 
   /**
    * Return the mean execution time in micros.
    */
-  long getMean();
+  long mean();
+
+
+  /**
+   * Migrate to mean()
+   */
+  @Deprecated
+  default long getMean() {
+    return mean();
+  }
 
   /**
    * Return true if this is the first metrics collection for this query.
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetricVisitor.java b/ebean-api/src/main/java/io/ebean/meta/MetricVisitor.java
index 18c7a72dc..fac9f050e 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetricVisitor.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetricVisitor.java
@@ -8,22 +8,22 @@ public interface MetricVisitor {
   /**
    * Return true if the metrics should be reset.
    */
-  boolean isReset();
+  boolean reset();
 
   /**
    * Return true if we should visit the transaction metrics.
    */
-  boolean isCollectTransactionMetrics();
+  boolean collectTransactionMetrics();
 
   /**
    * Return true if we should visit the ORM and SQL query metrics.
    */
-  boolean isCollectQueryMetrics();
+  boolean collectQueryMetrics();
 
   /**
    * Return true if we should visit the L2 cache metrics.
    */
-  boolean isCollectL2Metrics();
+  boolean collectL2Metrics();
 
   /**
    * Visit has started.
diff --git a/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java b/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
index 9b785ec62..7caeabd2f 100644
--- a/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
+++ b/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
@@ -32,7 +32,7 @@ public class QueryPlanInit {
    * Return the query execution time threshold which must be exceeded to initiate
    * query plan collection.
    */
-  public long getThresholdMicros() {
+  public long thresholdMicros() {
     return thresholdMicros;
   }
 
@@ -40,7 +40,7 @@ public class QueryPlanInit {
    * Set the query execution time threshold which must be exceeded to initiate
    * query plan collection.
    */
-  public void setThresholdMicros(long thresholdMicros) {
+  public void thresholdMicros(long thresholdMicros) {
     this.thresholdMicros = thresholdMicros;
   }
 
@@ -54,14 +54,14 @@ public class QueryPlanInit {
   /**
    * Return the specific hashes that we want to collect query plans on.
    */
-  public Set<Long> getHashes() {
+  public Set<Long> sqlHashes() {
     return hashes;
   }
 
   /**
    * Set the specific hashes that we want to collect query plans on.
    */
-  public void setHashes(Set<Long> hashes) {
+  public void sqlHashes(Set<Long> hashes) {
     this.hashes = hashes;
   }
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java b/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java
index c4a69b1aa..421e0c151 100644
--- a/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java
+++ b/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java
@@ -18,7 +18,7 @@ public class QueryPlanRequest {
    * have been around for a while (e.g. 5 mins) and so reasonably represent
    * bind values that match the slowest execution for this query plan.
    */
-  public long getSince() {
+  public long since() {
     return since;
   }
 
@@ -28,14 +28,14 @@ public class QueryPlanRequest {
    *
    * @param since The minimum age of the bind values capture.
    */
-  public void setSince(long since) {
+  public void since(long since) {
     this.since = since;
   }
 
   /**
    * Return the maximum number of plans to capture.
    */
-  public int getMaxCount() {
+  public int maxCount() {
     return maxCount;
   }
 
@@ -45,7 +45,7 @@ public class QueryPlanRequest {
    * Use this to limit how much query plan capturing is done as query
    * plan capture is actual database load.
    */
-  public void setMaxCount(int maxCount) {
+  public void maxCount(int maxCount) {
     this.maxCount = maxCount;
   }
 
@@ -54,7 +54,7 @@ public class QueryPlanRequest {
    * <p>
    * Query plan collection will stop once this time is exceeded.
    */
-  public long getMaxTimeMillis() {
+  public long maxTimeMillis() {
     return maxTimeMillis;
   }
 
@@ -65,7 +65,7 @@ public class QueryPlanRequest {
    * this to ensure the query plan capture does not use excessive amount
    * of time - put too much load on the database.
    */
-  public void setMaxTimeMillis(long maxTimeMillis) {
+  public void maxTimeMillis(long maxTimeMillis) {
     this.maxTimeMillis = maxTimeMillis;
   }
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java b/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java
index 8f0488d62..b8a50d85d 100644
--- a/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java
+++ b/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java
@@ -10,16 +10,39 @@ public interface ServerMetrics {
   /**
    * Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
    */
-  List<MetaTimedMetric> getTimedMetrics();
+  List<MetaTimedMetric> timedMetrics();
+
+  /**
+   * Migrate to timedMetrics().
+   */
+  @Deprecated
+  default List<MetaTimedMetric> getTimedMetrics() {
+    return timedMetrics();
+  }
 
   /**
    * Return the query metrics.
    */
-  List<MetaQueryMetric> getQueryMetrics();
+  List<MetaQueryMetric> queryMetrics();
+
+  /**
+   * Migrate to queryMetrics().
+   */
+  @Deprecated
+  default List<MetaQueryMetric> getQueryMetrics() {
+    return queryMetrics();
+  }
 
   /**
    * Return the Counter metrics.
    */
-  List<MetaCountMetric> getCountMetrics();
+  List<MetaCountMetric> countMetrics();
 
+  /**
+   * Migrate to countMetrics().
+   */
+  @Deprecated
+  default List<MetaCountMetric> getCountMetrics() {
+    return countMetrics();
+  }
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java b/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java
index f48ecb5b6..7e42302c8 100644
--- a/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java
+++ b/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java
@@ -8,12 +8,12 @@ import java.util.Comparator;
 public interface ServerMetricsAsJson {
 
   /**
-   * Set to false to exclude profile location and sql.
+   * Set to false in order to exclude profile location and sql.
    */
   ServerMetricsAsJson withExtraAttributes(boolean withLocation);
 
   /**
-   * Set to false to exclude SQL hash.
+   * Set to false in order to exclude SQL hash.
    */
   ServerMetricsAsJson withHash(boolean withHash);
 
diff --git a/ebean-api/src/main/java/io/ebean/meta/SortMetric.java b/ebean-api/src/main/java/io/ebean/meta/SortMetric.java
index 9df2c704b..30104f1ff 100644
--- a/ebean-api/src/main/java/io/ebean/meta/SortMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/SortMetric.java
@@ -32,7 +32,7 @@ public class SortMetric {
 
     @Override
     public int compare(MetaCountMetric o1, MetaCountMetric o2) {
-      return stringCompare(o1.getName(), o2.getName());
+      return stringCompare(o1.name(), o2.name());
     }
   }
 
@@ -43,8 +43,8 @@ public class SortMetric {
 
     @Override
     public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
-      int i = stringCompare(o1.getName(), o2.getName());
-      return i != 0 ? i : Long.compare(o1.getCount(), o2.getCount());
+      int i = stringCompare(o1.name(), o2.name());
+      return i != 0 ? i : Long.compare(o1.count(), o2.count());
     }
   }
 
@@ -55,7 +55,7 @@ public class SortMetric {
 
     @Override
     public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
-      return Long.compare(o2.getCount(), o1.getCount());
+      return Long.compare(o2.count(), o1.count());
     }
   }
 
@@ -66,7 +66,7 @@ public class SortMetric {
 
     @Override
     public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
-      return Long.compare(o2.getTotal(), o1.getTotal());
+      return Long.compare(o2.total(), o1.total());
     }
   }
 
@@ -77,7 +77,7 @@ public class SortMetric {
 
     @Override
     public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
-      return Long.compare(o2.getMean(), o1.getMean());
+      return Long.compare(o2.mean(), o1.mean());
     }
   }
 
@@ -88,7 +88,7 @@ public class SortMetric {
 
     @Override
     public int compare(MetaTimedMetric o1, MetaTimedMetric o2) {
-      return Long.compare(o2.getMax(), o1.getMax());
+      return Long.compare(o2.max(), o1.max());
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
index 051d331ba..20d7ec223 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
@@ -18,8 +18,8 @@ class DefaultQueryPlanListener implements QueryPlanListener {
     String dbName = capture.getDatabase().getName();
     for (MetaQueryPlan plan : capture.getPlans()) {
       log.info("queryPlan  db:{} label:{} queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
-        dbName, plan.getLabel(), plan.getQueryTimeMicros(), plan.getProfileLocation(),
-        plan.getSql(), plan.getBind(), plan.getPlan());
+        dbName, plan.label(), plan.queryTimeMicros(), plan.profileLocation(),
+        plan.sql(), plan.bind(), plan.plan());
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index d21f9967f..2040e3f78 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -416,8 +416,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private void collectQueryPlans() {
     QueryPlanRequest request = new QueryPlanRequest();
-    request.setMaxCount(config.getQueryPlanCaptureMaxCount());
-    request.setMaxTimeMillis(config.getQueryPlanCaptureMaxTimeMillis());
+    request.maxCount(config.getQueryPlanCaptureMaxCount());
+    request.maxTimeMillis(config.getQueryPlanCaptureMaxTimeMillis());
 
     // obtains query explain plans ...
     List<MetaQueryPlan> plans = metaInfoManager.queryPlanCollectNow(request);
@@ -2328,13 +2328,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public void visitMetrics(MetricVisitor visitor) {
     visitor.visitStart();
-    if (visitor.isCollectTransactionMetrics()) {
+    if (visitor.collectTransactionMetrics()) {
       transactionManager.visitMetrics(visitor);
     }
-    if (visitor.isCollectL2Metrics()) {
+    if (visitor.collectL2Metrics()) {
       serverCacheManager.visitMetrics(visitor);
     }
-    if (visitor.isCollectQueryMetrics()) {
+    if (visitor.collectQueryMetrics()) {
       beanDescriptorManager.visitMetrics(visitor);
       dtoBeanManager.visitMetrics(visitor);
       relationalQueryEngine.visitMetrics(visitor);
@@ -2351,7 +2351,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   List<MetaQueryPlan> queryPlanInit(QueryPlanInit initRequest) {
     if (initRequest.isAll()) {
-      queryPlanManager.setDefaultThreshold(initRequest.getThresholdMicros());
+      queryPlanManager.setDefaultThreshold(initRequest.thresholdMicros());
     }
     return beanDescriptorManager.queryPlanInit(initRequest);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 4c42c4b11..f31fa849c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -78,11 +78,11 @@ class DumpMetrics {
     out("-- Dumping metrics for " + server.getName() + " -- ");
     ServerMetrics serverMetrics = server.getMetaInfoManager().collectMetrics();
 
-    for (MetaTimedMetric metric : serverMetrics.getTimedMetrics()) {
+    for (MetaTimedMetric metric : serverMetrics.timedMetrics()) {
       log(metric);
     }
 
-    List<MetaCountMetric> countMetrics = serverMetrics.getCountMetrics();
+    List<MetaCountMetric> countMetrics = serverMetrics.countMetrics();
     if (!countMetrics.isEmpty()) {
       out("\n-- Counters --");
       countMetrics.sort(SortMetric.COUNT_NAME);
@@ -91,7 +91,7 @@ class DumpMetrics {
       }
     }
 
-    List<MetaQueryMetric> queryMetrics = serverMetrics.getQueryMetrics();
+    List<MetaQueryMetric> queryMetrics = serverMetrics.queryMetrics();
     if (!queryMetrics.isEmpty()) {
       out("\n-- Queries --");
       queryMetrics.sort(sortBy);
@@ -104,8 +104,8 @@ class DumpMetrics {
   private void logCount(MetaCountMetric metric) {
 
     StringBuilder sb = new StringBuilder();
-    sb.append(padNameTimed(metric.getName())).append(" ");
-    sb.append(" count:").append(pad(metric.getCount()));
+    sb.append(padNameTimed(metric.name())).append(" ");
+    sb.append(" count:").append(pad(metric.count()));
     out(sb.toString());
   }
 
@@ -120,38 +120,38 @@ class DumpMetrics {
     appendQueryName(metric, sb);
     appendCounters(metric, sb);
     if (dumpHash) {
-      sb.append("\n sqlHash:").append(metric.getSqlHash());
+      sb.append("\n sqlHash:").append(metric.sqlHash());
     }
     appendProfileAndSql(metric, sb);
     out(sb.toString());
   }
 
   private void appendQueryName(MetaQueryMetric metric, StringBuilder sb) {
-    sb.append("query:").append(padName(metric.getName())).append(" ");
+    sb.append("query:").append(padName(metric.name())).append(" ");
   }
 
   private void appendProfileAndSql(MetaQueryMetric metric, StringBuilder sb) {
-    String location = metric.getLocation();
+    String location = metric.location();
     if (dumpLoc && location != null) {
       sb.append("\n  loc:").append(location);
     }
     if (dumpSql) {
-      sb.append(" \n\n  sql:").append(metric.getSql()).append("\n\n");
+      sb.append(" \n\n  sql:").append(metric.sql()).append("\n\n");
     }
   }
 
   private void log(MetaTimedMetric metric) {
     StringBuilder sb = new StringBuilder();
-    sb.append(padNameTimed(metric.getName())).append(" ");
+    sb.append(padNameTimed(metric.name())).append(" ");
     appendCounters(metric, sb);
     out(sb.toString());
   }
 
   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()))
-      .append(" max:").append(pad(timedMetric.getMax()));
+    sb.append(" count:").append(pad(timedMetric.count()))
+      .append(" total:").append(pad(timedMetric.total()))
+      .append(" mean:").append(pad(timedMetric.mean()))
+      .append(" max:").append(pad(timedMetric.max()));
   }
 
   private String padName(String name) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
index 7458d0468..4ac8859b6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
@@ -31,9 +31,9 @@ class DumpMetricsData {
 
   private void collect(ServerMetrics serverMetrics) {
 
-    final List<MetaTimedMetric> timedMetrics = serverMetrics.getTimedMetrics();
-    final List<MetaCountMetric> countMetrics = serverMetrics.getCountMetrics();
-    final List<MetaQueryMetric> queryMetrics = serverMetrics.getQueryMetrics();
+    final List<MetaTimedMetric> timedMetrics = serverMetrics.timedMetrics();
+    final List<MetaCountMetric> countMetrics = serverMetrics.countMetrics();
+    final List<MetaQueryMetric> queryMetrics = serverMetrics.queryMetrics();
 
     for (MetaTimedMetric metric : timedMetrics) {
       add(metric);
@@ -47,7 +47,7 @@ class DumpMetricsData {
   }
 
   private MetricData create(MetaMetric metric) {
-    MetricData data = new MetricData(metric.getName());
+    MetricData data = new MetricData(metric.name());
     list.add(data);
     return data;
   }
@@ -55,30 +55,30 @@ class DumpMetricsData {
   private void add(MetaTimedMetric metric) {
     final MetricData data = create(metric);
     appendCounters(data, metric);
-    data.setLoc(metric.getLocation());
+    data.setLoc(metric.location());
   }
 
   private void addCount(MetaCountMetric metric) {
     final MetricData data = create(metric);
-    data.setCount(metric.getCount());
+    data.setCount(metric.count());
   }
 
   private void addQuery(MetaQueryMetric metric) {
     final MetricData data = create(metric);
     appendCounters(data, metric);
     appendLocationAndSql(data, metric);
-    data.setSqlHash(metric.getSqlHash());
+    data.setSqlHash(metric.sqlHash());
   }
 
   private void appendLocationAndSql(MetricData data, MetaQueryMetric metric) {
-    data.setLoc(metric.getLocation());
-    data.setSql(metric.getSql());
+    data.setLoc(metric.location());
+    data.setSql(metric.sql());
   }
 
   private void appendCounters(MetricData data, MetaTimedMetric timedMetric) {
-    data.setCount(timedMetric.getCount());
-    data.setTotal(timedMetric.getTotal());
-    data.setMean(timedMetric.getMean());
-    data.setMax(timedMetric.getMax());
+    data.setCount(timedMetric.count());
+    data.setTotal(timedMetric.total());
+    data.setMean(timedMetric.mean());
+    data.setMax(timedMetric.max());
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
index 6f74dac97..b0644ec9f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
@@ -84,11 +84,11 @@ class DumpMetricsJson implements ServerMetricsAsJson {
   private void collect(ServerMetrics serverMetrics) {
     try {
       start();
-      for (MetaTimedMetric metric : serverMetrics.getTimedMetrics()) {
+      for (MetaTimedMetric metric : serverMetrics.timedMetrics()) {
         logTimed(metric);
       }
 
-      List<MetaCountMetric> countMetrics = serverMetrics.getCountMetrics();
+      List<MetaCountMetric> countMetrics = serverMetrics.countMetrics();
       if (!countMetrics.isEmpty()) {
         if (sortBy != null) {
           countMetrics.sort(SortMetric.COUNT_NAME);
@@ -98,7 +98,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
         }
       }
 
-      List<MetaQueryMetric> queryMetrics = serverMetrics.getQueryMetrics();
+      List<MetaQueryMetric> queryMetrics = serverMetrics.queryMetrics();
       if (!queryMetrics.isEmpty()) {
         if (sortBy != null) {
           queryMetrics.sort(sortBy);
@@ -170,7 +170,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     }
     objStart();
     key("name");
-    val(metric.getName());
+    val(metric.name());
   }
 
   private void metricEnd() throws IOException {
@@ -180,7 +180,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
   private void logCount(MetaCountMetric metric) throws IOException {
     metricStart(metric);
     key("count");
-    val(metric.getCount());
+    val(metric.count());
     metricEnd();
   }
 
@@ -188,7 +188,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     metricStart(metric);
     appendTiming(metric);
     if (isIncludeDetail(metric)) {
-      appendExtra("loc", metric.getLocation());
+      appendExtra("loc", metric.location());
     }
     metricEnd();
   }
@@ -197,11 +197,11 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     metricStart(metric);
     appendTiming(metric);
     if (withHash) {
-      keyVal("sqlHash", metric.getSqlHash());
+      keyVal("sqlHash", metric.sqlHash());
     }
     if (isIncludeDetail(metric)) {
-      appendExtra("loc", metric.getLocation());
-      appendExtra("sql", metric.getSql());
+      appendExtra("loc", metric.location());
+      appendExtra("sql", metric.sql());
     }
     metricEnd();
   }
@@ -218,10 +218,10 @@ class DumpMetricsJson implements ServerMetricsAsJson {
   }
 
   private void appendTiming(MetaTimedMetric timedMetric) throws IOException {
-    keyVal("count", timedMetric.getCount());
-    keyVal("total", timedMetric.getTotal());
-    keyVal("mean", timedMetric.getMean());
-    keyVal("max", timedMetric.getMax());
+    keyVal("count", timedMetric.count());
+    keyVal("total", timedMetric.total());
+    keyVal("mean", timedMetric.mean());
+    keyVal("max", timedMetric.max());
   }
 
   private void keyVal(String key, long value) throws IOException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index e08b37d1d..6a9acd839 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1559,7 +1559,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   void queryPlanInit(QueryPlanInit request, List<MetaQueryPlan> list) {
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
       if (request.includeHash(queryPlan.getSqlHash())) {
-        queryPlan.queryPlanInit(request.getThresholdMicros());
+        queryPlan.queryPlanInit(request.thresholdMicros());
         list.add(queryPlan.createMeta(null, null));
       }
     }
@@ -1572,7 +1572,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     iudMetrics.visit(visitor);
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
       if (!queryPlan.isEmptyStats()) {
-        visitor.visitQuery(queryPlan.getSnapshot(visitor.isReset()));
+        visitor.visitQuery(queryPlan.getSnapshot(visitor.reset()));
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
index 2cf7a25a7..d93e0dbdb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
@@ -49,7 +49,7 @@ class DCountMetric implements CountMetric {
   @Override
   public void visit(MetricVisitor visitor) {
 
-    long val = visitor.isReset() ? count.sumThenReset() : count.sum();
+    long val = visitor.reset() ? count.sumThenReset() : count.sum();
     if (val > 0) {
       visitor.visitCount(new DCountMetricStats(name, val));
     }
@@ -66,12 +66,12 @@ class DCountMetric implements CountMetric {
     }
 
     @Override
-    public String getName() {
+    public String name() {
       return name;
     }
 
     @Override
-    public long getCount() {
+    public long count() {
       return count;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index fda2b62b8..fda1d4d9b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -19,7 +19,7 @@ class DQueryPlanMetric implements QueryPlanMetric {
 
   @Override
   public void visit(MetricVisitor visitor) {
-    TimedMetricStats stats = metric.collect(visitor.isReset());
+    TimedMetricStats stats = metric.collect(visitor.reset());
     if (stats != null) {
       visitor.visitQuery(new Stats(meta, stats, collected));
       collected = true;
@@ -45,11 +45,11 @@ class DQueryPlanMetric implements QueryPlanMetric {
 
     @Override
     public String toString() {
-      return meta + " " + stats + " sql:" + getSql();
+      return meta + " " + stats + " sql:" + sql();
     }
 
     @Override
-    public Class<?> getType() {
+    public Class<?> type() {
       return meta.getType();
     }
 
@@ -59,48 +59,48 @@ class DQueryPlanMetric implements QueryPlanMetric {
     }
 
     @Override
-    public long getSqlHash() {
+    public long sqlHash() {
       return meta.getSqlHash();
     }
 
     @Override
-    public String getLabel() {
+    public String label() {
       return meta.getLabel();
     }
 
     @Override
-    public String getSql() {
+    public String sql() {
       return meta.getSql();
     }
 
     @Override
-    public String getName() {
+    public String name() {
       return meta.getName();
     }
 
     @Override
-    public String getLocation() {
+    public String location() {
       return meta.getLocation();
     }
 
     @Override
-    public long getCount() {
-      return stats.getCount();
+    public long count() {
+      return stats.count();
     }
 
     @Override
-    public long getTotal() {
-      return stats.getTotal();
+    public long total() {
+      return stats.total();
     }
 
     @Override
-    public long getMax() {
-      return stats.getMax();
+    public long max() {
+      return stats.max();
     }
 
     @Override
-    public long getMean() {
-      return stats.getMean();
+    public long mean() {
+      return stats.mean();
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index 54146abe9..2207fef3d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -60,12 +60,12 @@ class DTimeMetricStats implements TimedMetricStats {
   }
 
   @Override
-  public String getName() {
+  public String name() {
     return name;
   }
 
   @Override
-  public String getLocation() {
+  public String location() {
     return location;
   }
 
@@ -73,7 +73,7 @@ class DTimeMetricStats implements TimedMetricStats {
    * Return the count of values collected.
    */
   @Override
-  public long getCount() {
+  public long count() {
     return count;
   }
 
@@ -81,7 +81,7 @@ class DTimeMetricStats implements TimedMetricStats {
    * Return the total of all the values.
    */
   @Override
-  public long getTotal() {
+  public long total() {
     return total;
   }
 
@@ -89,7 +89,7 @@ class DTimeMetricStats implements TimedMetricStats {
    * Return the Max value collected.
    */
   @Override
-  public long getMax() {
+  public long max() {
     return max;
   }
 
@@ -97,7 +97,7 @@ class DTimeMetricStats implements TimedMetricStats {
    * Return the mean value rounded up.
    */
   @Override
-  public long getMean() {
+  public long mean() {
     return (count < 1) ? 0L : Math.round((double)(total / count));
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index 63eb275f6..cc344c3e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -71,7 +71,7 @@ class DTimedMetric implements TimedMetric {
 
   @Override
   public void visit(MetricVisitor visitor) {
-    DTimeMetricStats metric = collect(visitor.isReset());
+    DTimeMetricStats metric = collect(visitor.reset());
     if (metric != null) {
       visitor.visitTimed(metric);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
index 7ef4e9084..27537737f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
@@ -48,7 +48,7 @@ class DTimedProfileLocation extends DProfileLocation implements TimedProfileLoca
 
   @Override
   public void visit(MetricVisitor visitor) {
-    TimedMetricStats collect = timedMetric.collect(visitor.isReset());
+    TimedMetricStats collect = timedMetric.collect(visitor.reset());
     if (collect != null) {
       if (overrideMetricName) {
         collect.setName(fullName);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
index 86e15f389..315e7a07d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
@@ -24,10 +24,10 @@ class CQueryPlanRequest {
   CQueryPlanRequest(Connection connection, QueryPlanRequest req, Iterator<CQueryBindCapture> iterator) {
     this.connection = connection;
     this.iterator = iterator;
-    this.maxCount = req.getMaxCount();
-    long reqSince = req.getSince();
+    this.maxCount = req.maxCount();
+    long reqSince = req.since();
     this.since = (reqSince == 0) ? Long.MAX_VALUE: reqSince;
-    long maxTimeMillis = req.getMaxTimeMillis();
+    long maxTimeMillis = req.maxTimeMillis();
     this.maxTime = maxTimeMillis > 0 ? System.currentTimeMillis() + maxTimeMillis : 0;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index bbcfea2b9..36e070653 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -83,56 +83,56 @@ public final class CQueryPlanStats {
 
     @Override
     public String toString() {
-      return "label:" + getLabel() + " location:" + getLocation() + " metrics:" + metrics + " sql:" + getSql();
+      return "label:" + label() + " location:" + location() + " metrics:" + metrics + " sql:" + sql();
     }
 
     @Override
-    public Class<?> getType() {
+    public Class<?> type() {
       return queryPlan.getBeanType();
     }
 
     @Override
-    public String getLabel() {
+    public String label() {
       return queryPlan.getLabel();
     }
 
     @Override
-    public String getName() {
+    public String name() {
       return queryPlan.getName();
     }
 
     @Override
-    public String getLocation() {
+    public String location() {
       return queryPlan.getLocation();
     }
 
     @Override
-    public long getCount() {
-      return metrics.getCount();
+    public long count() {
+      return metrics.count();
     }
 
     @Override
-    public long getTotal() {
-      return metrics.getTotal();
+    public long total() {
+      return metrics.total();
     }
 
     @Override
-    public long getMax() {
-      return metrics.getMax();
+    public long max() {
+      return metrics.max();
     }
 
     @Override
-    public long getMean() {
-      return metrics.getMean();
+    public long mean() {
+      return metrics.mean();
     }
 
     @Override
-    public long getSqlHash() {
+    public long sqlHash() {
       return queryPlan.getSqlHash();
     }
 
     @Override
-    public String getSql() {
+    public String sql() {
       return queryPlan.getSql();
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
index 3d8c7aaac..3d879362b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
@@ -16,14 +16,14 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
   private final String sql;
   private final String bind;
   private final String plan;
-  private final long hash;
+  private final long sqlHash;
   private long queryTimeMicros;
   private long captureCount;
 
-  DQueryPlanOutput(Class<?> beanType, String label, long hash, String sql, ProfileLocation profileLocation, String bind, String plan) {
+  DQueryPlanOutput(Class<?> beanType, String label, long sqlHash, String sql, ProfileLocation profileLocation, String bind, String plan) {
     this.beanType = beanType;
     this.label = label;
-    this.hash = hash;
+    this.sqlHash = sqlHash;
     this.sql = sql;
     this.profileLocation = profileLocation;
     this.bind = bind;
@@ -31,15 +31,15 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
   }
 
   @Override
-  public long getHash() {
-    return hash;
+  public long sqlHash() {
+    return sqlHash;
   }
 
   /**
    * Return the associated bean.
    */
   @Override
-  public Class<?> getBeanType() {
+  public Class<?> beanType() {
     return beanType;
   }
 
@@ -47,12 +47,12 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
    * Return the query label if set.
    */
   @Override
-  public String getLabel() {
+  public String label() {
     return label;
   }
 
   @Override
-  public ProfileLocation getProfileLocation() {
+  public ProfileLocation profileLocation() {
     return profileLocation;
   }
 
@@ -60,7 +60,7 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
    * Return the sql of query.
    */
   @Override
-  public String getSql() {
+  public String sql() {
     return sql;
   }
 
@@ -68,7 +68,7 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
    * Return a description of the bind values used.
    */
   @Override
-  public String getBind() {
+  public String bind() {
     return bind;
   }
 
@@ -76,7 +76,7 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
    * Return the query plan.
    */
   @Override
-  public String getPlan() {
+  public String plan() {
     return plan;
   }
 
@@ -85,7 +85,7 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
    * to build the query plan.
    */
   @Override
-  public long getQueryTimeMicros() {
+  public long queryTimeMicros() {
     return queryTimeMicros;
   }
 
@@ -93,13 +93,13 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
    * Return the total count of times bind capture has occurred.
    */
   @Override
-  public long getCaptureCount() {
+  public long captureCount() {
     return captureCount;
   }
 
   @Override
   public String toString() {
-    return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + " planHash:" + hash + " 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;
   }
 
   /**
diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java
index 0205d5294..988e73b59 100644
--- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java
@@ -90,14 +90,14 @@ public abstract class BaseTestCase {
   }
 
   protected List<MetaTimedMetric> visitTimedMetrics() {
-    return collectMetrics().getTimedMetrics();
+    return collectMetrics().timedMetrics();
   }
 
   protected List<MetaTimedMetric> sqlMetrics() {
     List<MetaTimedMetric> timedMetrics = visitTimedMetrics();
 
     return timedMetrics.stream()
-      .filter((it) -> it.getName().startsWith("sql.") || it.getName().startsWith("orm."))
+      .filter((it) -> it.name().startsWith("sql.") || it.name().startsWith("orm."))
       .collect(Collectors.toList());
   }
 
diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java
index ba30e9a5c..625cc9ae9 100644
--- a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java
+++ b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java
@@ -191,13 +191,13 @@ public class DtoQuery2Test extends BaseTestCase {
     BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true);
     server().getMetaInfoManager().visitMetrics(basic);
 
-    List<MetaQueryMetric> stats = basic.getQueryMetrics();
+    List<MetaQueryMetric> stats = basic.queryMetrics();
     assertThat(stats).hasSize(1);
 
     MetaQueryMetric queryMetric = stats.get(0);
-    assertThat(queryMetric.getLabel()).isEqualTo("basic");
-    assertThat(queryMetric.getCount()).isEqualTo(3);
-    assertThat(queryMetric.getName()).isEqualTo("dto.DCust_basic");
+    assertThat(queryMetric.label()).isEqualTo("basic");
+    assertThat(queryMetric.count()).isEqualTo(3);
+    assertThat(queryMetric.name()).isEqualTo("dto.DCust_basic");
 
 
     server().findDto(DCust.class, "select c4.id, c4.name from o_customer c4 where lower(c4.name) = :name")
@@ -207,7 +207,7 @@ public class DtoQuery2Test extends BaseTestCase {
 
     BasicMetricVisitor metric2 = server().getMetaInfoManager().visitBasic();
 
-    stats = metric2.getQueryMetrics();
+    stats = metric2.queryMetrics();
     assertThat(stats).hasSize(2);
 
     log.info("stats " + stats);
diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java
index ee26e9409..28b0bd490 100644
--- a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+++ b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java
@@ -27,12 +27,12 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
   @AfterClass
   public static void reportStats() {
     ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics();
-    for (MetaQueryMetric metric : metrics.getQueryMetrics()) {
+    for (MetaQueryMetric metric : metrics.queryMetrics()) {
       System.out.println(metric);
     }
 
     System.out.println("-- transaction metrics --");
-    for (MetaTimedMetric metric : metrics.getTimedMetrics()) {
+    for (MetaTimedMetric metric : metrics.timedMetrics()) {
       System.out.println(metric);
     }
   }
@@ -59,15 +59,15 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     ServerMetrics metrics = collectMetrics();
 
-    List<MetaQueryMetric> stats = metrics.getQueryMetrics();
+    List<MetaQueryMetric> stats = metrics.queryMetrics();
     for (MetaQueryMetric stat : stats) {
-      long meanMicros = stat.getMean();
+      long meanMicros = stat.mean();
       assertThat(meanMicros).isLessThan(900_000);
-      assertThat(stat.getLocation()).isSameAs(loc0.location());
+      assertThat(stat.location()).isSameAs(loc0.location());
     }
 
     assertThat(stats).hasSize(1);
-    assertThat(stats.get(0).getCount()).isEqualTo(4);
+    assertThat(stats.get(0).count()).isEqualTo(4);
   }
 
   @ForPlatform(Platform.H2)
diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java
index eea1c6da3..0331a8215 100644
--- a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java
+++ b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java
@@ -42,14 +42,14 @@ public class DtoQueryTest extends BaseTestCase {
 
     ServerMetrics metrics = collectMetrics();
 
-    List<MetaQueryMetric> stats = metrics.getQueryMetrics();
+    List<MetaQueryMetric> stats = metrics.queryMetrics();
     for (MetaQueryMetric stat : stats) {
-      long meanMicros = stat.getMean();
+      long meanMicros = stat.mean();
       assertThat(meanMicros).isLessThan(900_000);
     }
 
     assertThat(stats).hasSize(1);
-    assertThat(stats.get(0).getCount()).isEqualTo(1);
+    assertThat(stats.get(0).count()).isEqualTo(1);
   }
 
   @Test
@@ -283,13 +283,13 @@ public class DtoQueryTest extends BaseTestCase {
     BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true);
     server().getMetaInfoManager().visitMetrics(basic);
 
-    List<MetaQueryMetric> stats = basic.getQueryMetrics();
+    List<MetaQueryMetric> stats = basic.queryMetrics();
     assertThat(stats).hasSize(1);
 
     MetaQueryMetric queryMetric = stats.get(0);
-    assertThat(queryMetric.getLabel()).isEqualTo("basic");
-    assertThat(queryMetric.getCount()).isEqualTo(3);
-    assertThat(queryMetric.getName()).isEqualTo("dto.DCust_basic");
+    assertThat(queryMetric.label()).isEqualTo("basic");
+    assertThat(queryMetric.count()).isEqualTo(3);
+    assertThat(queryMetric.name()).isEqualTo("dto.DCust_basic");
 
 
     server().findDto(DCust.class, "select c4.id, c4.name from o_customer c4 where lower(c4.name) = :name")
@@ -299,7 +299,7 @@ public class DtoQueryTest extends BaseTestCase {
 
     ServerMetrics metric2 = server().getMetaInfoManager().collectMetrics();
 
-    stats = metric2.getQueryMetrics();
+    stats = metric2.queryMetrics();
     assertThat(stats).hasSize(2);
 
     log.info("stats " + stats);
diff --git a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java
index ca2caa4c8..5b9c42991 100644
--- a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java
+++ b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java
@@ -39,10 +39,10 @@ public class UpdateQueryTest extends BaseTestCase {
     assertSql(query).contains("update o_customer set status=?, updtime=? where status = ? and id > ?");
 
     ServerMetrics metrics = collectMetrics();
-    List<MetaQueryMetric> ormQueryMetrics = metrics.getQueryMetrics();
+    List<MetaQueryMetric> ormQueryMetrics = metrics.queryMetrics();
     assertThat(ormQueryMetrics).hasSize(1);
-    assertThat(ormQueryMetrics.get(0).getType()).isEqualTo(Customer.class);
-    assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateActive");
+    assertThat(ormQueryMetrics.get(0).type()).isEqualTo(Customer.class);
+    assertThat(ormQueryMetrics.get(0).label()).isEqualTo("updateActive");
   }
 
   @Test
@@ -69,10 +69,10 @@ public class UpdateQueryTest extends BaseTestCase {
     assertSql(sql.get(0)).contains("update o_customer set status = status");
 
     ServerMetrics metrics = collectMetrics();
-    List<MetaQueryMetric> ormQueryMetrics = metrics.getQueryMetrics();
+    List<MetaQueryMetric> ormQueryMetrics = metrics.queryMetrics();
     assertThat(ormQueryMetrics).hasSize(1);
-    assertThat(ormQueryMetrics.get(0).getType()).isEqualTo(Customer.class);
-    assertThat(ormQueryMetrics.get(0).getLabel()).isEqualTo("updateAll");
+    assertThat(ormQueryMetrics.get(0).type()).isEqualTo(Customer.class);
+    assertThat(ormQueryMetrics.get(0).label()).isEqualTo("updateAll");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java
index d53f0e973..9f26e978c 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java
@@ -23,11 +23,11 @@ public class BeanIudMetricsTest {
     BasicMetricVisitor basic = new BasicMetricVisitor();
     iudMetrics.visit(basic);
 
-    List<MetaTimedMetric> timed = basic.getTimedMetrics();
+    List<MetaTimedMetric> timed = basic.timedMetrics();
     assertThat(timed).hasSize(1);
 
-    assertThat(timed.get(0).getCount()).isEqualTo(4);
-    assertThat(timed.get(0).getName()).isEqualTo("iud.one.insertBatch");
+    assertThat(timed.get(0).count()).isEqualTo(4);
+    assertThat(timed.get(0).name()).isEqualTo("iud.one.insertBatch");
 
     iudMetrics.addBatch(PersistRequest.Type.UPDATE, startNanos, 1);
     iudMetrics.addBatch(PersistRequest.Type.DELETE_SOFT, startNanos, 2);
@@ -37,15 +37,15 @@ public class BeanIudMetricsTest {
 
     basic = new BasicMetricVisitor();
     iudMetrics.visit(basic);
-    timed = basic.getTimedMetrics();
+    timed = basic.timedMetrics();
     assertThat(timed).hasSize(3);
 
-    assertThat(timed.get(0).getCount()).isEqualTo(16);
-    assertThat(timed.get(0).getName()).isEqualTo("iud.one.insertBatch");
-    assertThat(timed.get(1).getCount()).isEqualTo(3);
-    assertThat(timed.get(1).getName()).isEqualTo("iud.one.updateBatch");
-    assertThat(timed.get(2).getCount()).isEqualTo(12);
-    assertThat(timed.get(2).getName()).isEqualTo("iud.one.deleteBatch");
+    assertThat(timed.get(0).count()).isEqualTo(16);
+    assertThat(timed.get(0).name()).isEqualTo("iud.one.insertBatch");
+    assertThat(timed.get(1).count()).isEqualTo(3);
+    assertThat(timed.get(1).name()).isEqualTo("iud.one.updateBatch");
+    assertThat(timed.get(2).count()).isEqualTo(12);
+    assertThat(timed.get(2).name()).isEqualTo("iud.one.deleteBatch");
   }
 
   @Test
@@ -63,15 +63,15 @@ public class BeanIudMetricsTest {
     BasicMetricVisitor basic = new BasicMetricVisitor();
     iudMetrics.visit(basic);
 
-    List<MetaTimedMetric> timed = basic.getTimedMetrics();
+    List<MetaTimedMetric> timed = basic.timedMetrics();
     assertThat(timed).hasSize(3);
 
-    assertThat(timed.get(0).getCount()).isEqualTo(1);
-    assertThat(timed.get(0).getName()).isEqualTo("iud.one.insert");
-    assertThat(timed.get(1).getCount()).isEqualTo(2);
-    assertThat(timed.get(1).getName()).isEqualTo("iud.one.update");
-    assertThat(timed.get(2).getCount()).isEqualTo(2);
-    assertThat(timed.get(2).getName()).isEqualTo("iud.one.delete");
+    assertThat(timed.get(0).count()).isEqualTo(1);
+    assertThat(timed.get(0).name()).isEqualTo("iud.one.insert");
+    assertThat(timed.get(1).count()).isEqualTo(2);
+    assertThat(timed.get(1).name()).isEqualTo("iud.one.update");
+    assertThat(timed.get(2).count()).isEqualTo(2);
+    assertThat(timed.get(2).name()).isEqualTo("iud.one.delete");
   }
 
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
index 43f0e0426..cb6d4d662 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java
@@ -21,17 +21,17 @@ public class DTimedMetricMapTest {
     BasicMetricVisitor visitor = new BasicMetricVisitor();
     metricMap.visit(visitor);
 
-    MetaTimedMetric timedMetric = visitor.getTimedMetrics().get(0);
-    assertThat(timedMetric.getCount()).isEqualTo(1);
-    assertThat(timedMetric.getTotal()).isGreaterThan(10);
+    MetaTimedMetric timedMetric = visitor.timedMetrics().get(0);
+    assertThat(timedMetric.count()).isEqualTo(1);
+    assertThat(timedMetric.total()).isGreaterThan(10);
 
     metricMap.addSinceNanos("some", nanos);
 
     visitor = new BasicMetricVisitor();
     metricMap.visit(visitor);
 
-    timedMetric = visitor.getTimedMetrics().get(0);
-    assertThat(timedMetric.getCount()).isEqualTo(1);
-    assertThat(timedMetric.getTotal()).isGreaterThan(10);
+    timedMetric = visitor.timedMetrics().get(0);
+    assertThat(timedMetric.count()).isEqualTo(1);
+    assertThat(timedMetric.total()).isGreaterThan(10);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
index 28e651b88..6dbbb45d3 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
@@ -17,16 +17,16 @@ public class DTimedMetricTest {
     metric.addSinceNanos(start);
 
     DTimeMetricStats stats = metric.collect(true);
-    assertThat(stats.getCount()).isEqualTo(1);
-    assertThat(stats.getTotal()).isGreaterThan(10);
-    assertThat(stats.getMax()).isEqualTo(stats.getTotal());
+    assertThat(stats.count()).isEqualTo(1);
+    assertThat(stats.total()).isGreaterThan(10);
+    assertThat(stats.max()).isEqualTo(stats.total());
 
     metric.addSinceNanos(start);
 
     stats = metric.collect(true);
-    assertThat(stats.getCount()).isEqualTo(1);
-    assertThat(stats.getTotal()).isGreaterThan(10);
-    assertThat(stats.getMax()).isEqualTo(stats.getTotal());
+    assertThat(stats.count()).isEqualTo(1);
+    assertThat(stats.total()).isGreaterThan(10);
+    assertThat(stats.max()).isEqualTo(stats.total());
   }
 
   @Test
@@ -40,16 +40,16 @@ public class DTimedMetricTest {
     metric.addBatchSince(start, 5);
 
     DTimeMetricStats stats = metric.collect(true);
-    assertThat(stats.getCount()).isEqualTo(5);
-    assertThat(stats.getTotal()).isGreaterThan(10000);
-    assertThat(stats.getMax()).isEqualTo(stats.getTotal() / 5);
-    assertThat(stats.getMax()).isGreaterThan(10000 / 5);
+    assertThat(stats.count()).isEqualTo(5);
+    assertThat(stats.total()).isGreaterThan(10000);
+    assertThat(stats.max()).isEqualTo(stats.total() / 5);
+    assertThat(stats.max()).isGreaterThan(10000 / 5);
 
     metric.addBatchSince(start, 2);
 
     stats = metric.collect(true);
-    assertThat(stats.getCount()).isEqualTo(2);
-    assertThat(stats.getTotal()).isGreaterThan(10000);
-    assertThat(stats.getMax()).isEqualTo(stats.getTotal() / 2);
+    assertThat(stats.count()).isEqualTo(2);
+    assertThat(stats.total()).isGreaterThan(10000);
+    assertThat(stats.max()).isEqualTo(stats.total() / 2);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java
index c67d14b30..29658566c 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java
@@ -26,7 +26,7 @@ public class SortMetricTest {
     list.add(create("a"));
     list.sort(sortMetric);
 
-    String names = list.stream().map(DTimeMetricStats::getName).collect(Collectors.joining());
+    String names = list.stream().map(DTimeMetricStats::name).collect(Collectors.joining());
 
     assertEquals("nullabcd", names);
   }
diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
index 6e956510a..2f9cdf7f1 100644
--- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
@@ -80,15 +80,15 @@ public class TestBatchInsertFlush extends BaseTestCase {
     }
 
     ServerMetrics metrics = collectMetrics();
-    List<MetaTimedMetric> txnStats = metrics.getTimedMetrics();
+    List<MetaTimedMetric> txnStats = metrics.timedMetrics();
     for (MetaTimedMetric txnMetric : txnStats) {
       System.out.println(txnMetric);
     }
     assertThat(txnStats).hasSize(4);
-    assertThat(txnStats.get(0).getName()).isEqualTo("txn.main");
-    assertThat(txnStats.get(1).getName()).isEqualTo("txn.named.TestBatchInsertFlush.no_cascade");
-    assertThat(txnStats.get(2).getName()).isEqualTo("iud.TSDetail.insertBatch");
-    assertThat(txnStats.get(3).getName()).isEqualTo("iud.TSMaster.insertBatch");
+    assertThat(txnStats.get(0).name()).isEqualTo("txn.main");
+    assertThat(txnStats.get(1).name()).isEqualTo("txn.named.TestBatchInsertFlush.no_cascade");
+    assertThat(txnStats.get(2).name()).isEqualTo("iud.TSDetail.insertBatch");
+    assertThat(txnStats.get(3).name()).isEqualTo("iud.TSMaster.insertBatch");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java
index 3ba05ee68..3ccad9fb8 100644
--- a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java
+++ b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java
@@ -28,7 +28,7 @@ public class TestM2mDeleteObject extends BaseTestCase {
 
     List<MetaTimedMetric> sqlMetrics = sqlMetrics();
     assertThat(sqlMetrics).hasSize(1);
-    assertThat(sqlMetrics.get(0).getName()).isEqualTo("orm.update.deleteAllPermissions");
+    assertThat(sqlMetrics.get(0).name()).isEqualTo("orm.update.deleteAllPermissions");
 
     Tenant t = new Tenant("tenant");
 
diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index b6a40903f..108b4a398 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -176,7 +176,7 @@ public class TestCustomerFinder extends BaseTestCase {
     // change default collect query plan threshold to 200 micros
     QueryPlanInit init0 = new QueryPlanInit();
     init0.setAll(true);
-    init0.setThresholdMicros(2);
+    init0.thresholdMicros(2);
     final List<MetaQueryPlan> plans = server().getMetaInfoManager().queryPlanInit(init0);
     assertThat(plans.size()).isGreaterThan(1);
 
@@ -186,7 +186,7 @@ public class TestCustomerFinder extends BaseTestCase {
     // change query plan threshold to 100 micros
     QueryPlanInit init = new QueryPlanInit();
     init.setAll(true);
-    init.setThresholdMicros(1);
+    init.thresholdMicros(1);
     final List<MetaQueryPlan> appliedToPlans = server().getMetaInfoManager().queryPlanInit(init);
     assertThat(appliedToPlans.size()).isGreaterThan(4);
 
@@ -195,30 +195,30 @@ public class TestCustomerFinder extends BaseTestCase {
 
     ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics();
 
-    List<MetaQueryMetric> planStats = metrics.getQueryMetrics();
+    List<MetaQueryMetric> planStats = metrics.queryMetrics();
     assertThat(planStats.size()).isGreaterThan(4);
 
     for (MetaQueryMetric planStat : planStats) {
       System.out.println(planStat);
     }
 
-    for (MetaTimedMetric txnTimed : metrics.getTimedMetrics()) {
+    for (MetaTimedMetric txnTimed : metrics.timedMetrics()) {
       System.out.println(txnTimed);
     }
 
     // obtains db query plans ...
     QueryPlanRequest request = new QueryPlanRequest();
     // collect max 1000 plans (use something more like 10)
-    request.setMaxCount(1_000);
+    request.maxCount(1_000);
     // don't collect any more plans if used 10 secs
-    request.setMaxTimeMillis(10_000);
+    request.maxTimeMillis(10_000);
     List<MetaQueryPlan> plans0 = server().getMetaInfoManager().queryPlanCollectNow(request);
     assertThat(plans0).isNotEmpty();
 
     for (MetaQueryPlan plan : plans) {
       logger.info("queryPlan label:{}, queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
-        plan.getLabel(), plan.getQueryTimeMicros(), plan.getProfileLocation(),
-        plan.getSql(), plan.getBind(), plan.getPlan());
+        plan.label(), plan.queryTimeMicros(), plan.profileLocation(),
+        plan.sql(), plan.bind(), plan.plan());
       System.out.println(plan);
     }
 
diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 996f08bbe..f16828ec5 100644
--- a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -407,7 +407,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     List<MetaTimedMetric> sqlMetrics = sqlMetrics();
     assertThat(sqlMetrics).hasSize(1);
-    assertThat(sqlMetrics.get(0).getName()).isEqualTo("sql.query.findEach-Max10Rows");
+    assertThat(sqlMetrics.get(0).name()).isEqualTo("sql.query.findEach-Max10Rows");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java
index 91eb4e14f..de3184595 100644
--- a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java
+++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java
@@ -33,7 +33,7 @@ public class TestNestedMandatory extends BaseTestCase {
     }
 
     assertThat(txnMetrics).hasSize(2);
-    assertThat(txnMetrics.get(1).getName()).isEqualTo("txn.named.outer");
+    assertThat(txnMetrics.get(1).name()).isEqualTo("txn.named.outer");
   }
 
   class Outer {
diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java
index 99f776f14..28e0be699 100644
--- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java
+++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java
@@ -20,9 +20,9 @@ public class TestTransactionalReadOnly extends BaseTestCase {
     resetAllMetrics();
     executeTransactionalUsingReadOnlyDataSource();
 
-    final List<MetaTimedMetric> timedMetrics = collectMetrics().getTimedMetrics();
+    final List<MetaTimedMetric> timedMetrics = collectMetrics().timedMetrics();
     final Optional<MetaTimedMetric> txnReadOnly = metric(timedMetrics, "txn.readonly");
-    assertThat(txnReadOnly.get().getCount()).isEqualTo(1);
+    assertThat(txnReadOnly.get().count()).isEqualTo(1);
     assertThat(metric(timedMetrics, "txn")).isEmpty();
   }
 
@@ -32,15 +32,15 @@ public class TestTransactionalReadOnly extends BaseTestCase {
     resetAllMetrics();
     executeTransactionalUsingMainDataSource();
 
-    final List<MetaTimedMetric> timedMetrics = collectMetrics().getTimedMetrics();
+    final List<MetaTimedMetric> timedMetrics = collectMetrics().timedMetrics();
     final Optional<MetaTimedMetric> txnMain = metric(timedMetrics, "txn.main");
-    assertThat(txnMain.get().getCount()).isEqualTo(1);
+    assertThat(txnMain.get().count()).isEqualTo(1);
     assertThat(metric(timedMetrics, "txn.readonly")).isEmpty();
   }
 
   private Optional<MetaTimedMetric> metric(List<MetaTimedMetric> timedMetrics, String name) {
     return timedMetrics.stream()
-        .filter(metaTimedMetric -> metaTimedMetric.getName().equals(name))
+        .filter(metaTimedMetric -> metaTimedMetric.name().equals(name))
         .findFirst();
   }
 
diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
index 50ca87970..c539beda8 100644
--- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
+++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
@@ -126,8 +126,8 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
 
     List<MetaTimedMetric> sqlMetrics = sqlMetrics();
     assertThat(sqlMetrics).hasSize(1);
-    assertThat(sqlMetrics.get(0).getName()).isEqualTo("sql.update.auditLargeUpdate");
-    assertThat(sqlMetrics.get(0).getCount()).isEqualTo(1);
+    assertThat(sqlMetrics.get(0).name()).isEqualTo("sql.update.auditLargeUpdate");
+    assertThat(sqlMetrics.get(0).count()).isEqualTo(1);
   }
 
   @Test
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
index 3abf51366..4c0410ff3 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
@@ -8,9 +8,7 @@ import io.ebean.meta.MetaTimedMetric;
 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.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
@@ -88,14 +86,14 @@ public abstract class BaseTestCase {
   }
 
   protected List<MetaTimedMetric> visitTimedMetrics() {
-    return collectMetrics().getTimedMetrics();
+    return collectMetrics().timedMetrics();
   }
 
   protected List<MetaTimedMetric> sqlMetrics() {
     List<MetaTimedMetric> timedMetrics = visitTimedMetrics();
 
     return timedMetrics.stream()
-      .filter((it) -> it.getName().startsWith("sql.") || it.getName().startsWith("orm."))
+      .filter((it) -> it.name().startsWith("sql.") || it.name().startsWith("orm."))
       .collect(Collectors.toList());
   }
 
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
index 39e670a7f..a69fb6766 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -255,14 +255,13 @@ class RedisCache implements ServerCache {
 
   @Override
   public ServerCacheStatistics getStatistics(boolean reset) {
-
     ServerCacheStatistics cacheStats = new ServerCacheStatistics();
     cacheStats.setCacheName(cacheKey);
     cacheStats.setHitCount(hitCount.get(reset));
     cacheStats.setMissCount(missCount.get(reset));
-    cacheStats.setPutCount(metricPut.collect(reset).getCount());
-    cacheStats.setRemoveCount(metricRemove.collect(reset).getCount());
-    cacheStats.setClearCount(metricClear.collect(reset).getCount());
+    cacheStats.setPutCount(metricPut.collect(reset).count());
+    cacheStats.setRemoveCount(metricRemove.collect(reset).count());
+    cacheStats.setClearCount(metricClear.collect(reset).count());
     return cacheStats;
   }
 }

From fea7de42d5507f5c207dd05889a07f39f4018148 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 6 Aug 2021 14:48:42 +1200
Subject: [PATCH 345/447] #2290 - Add MetaTimedMetric locationHash() which is a
 crc32 checksum of package + type + method (excludes line number)

---
 .../main/java/io/ebean/ProfileLocation.java   |  8 +++++
 .../java/io/ebean/meta/MetaTimedMetric.java   |  8 +++++
 .../main/java/io/ebean/meta/MetricData.java   |  9 ++++++
 .../io/ebean/metric/TimedMetricStats.java     |  5 ++++
 .../server/core/DumpMetrics.java              |  1 +
 .../server/core/DumpMetricsData.java          |  2 ++
 .../server/core/DumpMetricsJson.java          |  2 ++
 .../server/profile/BasicProfileLocation.java  |  7 +++++
 .../server/profile/DProfileLocation.java      | 11 ++++---
 .../server/profile/DQueryPlanMeta.java        |  4 +++
 .../server/profile/DQueryPlanMetric.java      |  5 ++++
 .../server/profile/DTimeMetricStats.java      | 22 +++++++++-----
 .../server/profile/UtilLocation.java          | 15 +++++++++-
 .../server/query/CQueryPlan.java              | 30 ++++++-------------
 .../server/query/CQueryPlanStats.java         |  5 ++++
 .../server/profile/UtilLocationTest.java      |  8 ++++-
 .../model/basic/finder/CustomerFinder.java    |  2 --
 .../tests/profile/ProfileLocationTest.java    | 20 +++++++++----
 .../query/finder/TestCustomerFinder.java      |  3 +-
 19 files changed, 124 insertions(+), 43 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/ProfileLocation.java b/ebean-api/src/main/java/io/ebean/ProfileLocation.java
index 33584a0b3..605de580a 100644
--- a/ebean-api/src/main/java/io/ebean/ProfileLocation.java
+++ b/ebean-api/src/main/java/io/ebean/ProfileLocation.java
@@ -45,6 +45,14 @@ public interface ProfileLocation {
    */
   String label();
 
+  /**
+   * Return a hash of the location that intentionally excludes the line number.
+   * <p>
+   * The hash is expected to be stable regardless of line number in the source file
+   * so that is identifies the class and method location over a long time.
+   */
+  long hash();
+
   /**
    * Return the full location.
    */
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
index f95f3248d..dbd0f0a0e 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
@@ -6,6 +6,14 @@ package io.ebean.meta;
  */
 public interface MetaTimedMetric extends MetaMetric {
 
+  /**
+   * Return the metric location hash if defined.
+   * <p>
+   * This hash excludes line number with the intention of being stable over time
+   * as code changes move the source line (but the method is the same).
+   */
+  long locationHash();
+
   /**
    * Return the metric location if defined.
    */
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetricData.java b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
index d8f80a0a9..7f2eb38b6 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetricData.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
@@ -14,6 +14,7 @@ public class MetricData {
   private Long mean;
   private Long max;
   private Long total;
+  private long locHash;
 
   public MetricData(String name) {
     this.name = name;
@@ -38,6 +39,14 @@ public class MetricData {
     this.sqlHash = sqlHash;
   }
 
+  public void setLocHash(long locHash) {
+    this.locHash = locHash;
+  }
+
+  public long getLocHash() {
+    return locHash;
+  }
+
   public String getLoc() {
     return loc;
   }
diff --git a/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java b/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java
index 3012e9e9f..8c88d839e 100644
--- a/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java
+++ b/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java
@@ -12,6 +12,11 @@ public interface TimedMetricStats extends MetaTimedMetric {
    */
   void setLocation(String location);
 
+  /**
+   * Additionally set the location hash.
+   */
+  void setLocationHash(long locationHash);
+
   /**
    * Override the name based on profile location.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index f31fa849c..968e96a98 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -134,6 +134,7 @@ class DumpMetrics {
     String location = metric.location();
     if (dumpLoc && location != null) {
       sb.append("\n  loc:").append(location);
+      sb.append("\n  locHash:").append(metric.locationHash());
     }
     if (dumpSql) {
       sb.append(" \n\n  sql:").append(metric.sql()).append("\n\n");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
index 4ac8859b6..07980228f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
@@ -56,6 +56,7 @@ class DumpMetricsData {
     final MetricData data = create(metric);
     appendCounters(data, metric);
     data.setLoc(metric.location());
+    data.setLocHash(metric.locationHash());
   }
 
   private void addCount(MetaCountMetric metric) {
@@ -71,6 +72,7 @@ class DumpMetricsData {
   }
 
   private void appendLocationAndSql(MetricData data, MetaQueryMetric metric) {
+    data.setLocHash(metric.locationHash());
     data.setLoc(metric.location());
     data.setSql(metric.sql());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
index b0644ec9f..c116ebd26 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
@@ -188,6 +188,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     metricStart(metric);
     appendTiming(metric);
     if (isIncludeDetail(metric)) {
+      keyVal("locHash", metric.locationHash());
       appendExtra("loc", metric.location());
     }
     metricEnd();
@@ -198,6 +199,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     appendTiming(metric);
     if (withHash) {
       keyVal("sqlHash", metric.sqlHash());
+      keyVal("locHash", metric.locationHash());
     }
     if (isIncludeDetail(metric)) {
       appendExtra("loc", metric.location());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
index 507938a96..8e8a5ffc0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
@@ -10,9 +10,11 @@ final class BasicProfileLocation implements ProfileLocation {
   private final String fullLocation;
   private final String location;
   private final String label;
+  private final long hash;
 
   BasicProfileLocation(String fullLocation) {
     this.fullLocation = fullLocation;
+    this.hash = UtilLocation.hash(fullLocation);
     this.location = shortDesc(fullLocation);
     this.label = UtilLocation.label(location);
   }
@@ -42,6 +44,11 @@ final class BasicProfileLocation implements ProfileLocation {
     return location;
   }
 
+  @Override
+  public long hash() {
+    return hash;
+  }
+
   @Override
   public String fullLocation() {
     return fullLocation;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
index c5ff7d3ac..9c6340ad4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
@@ -8,17 +8,14 @@ import io.ebean.ProfileLocation;
 class DProfileLocation implements ProfileLocation {
 
   private static final String IO_EBEAN = "io.ebean";
-
   private static final String UNKNOWN = "unknown";
 
   private String fullLocation;
-
   private String location;
-
   private String label;
+  private long hash;
 
   private final int lineNumber;
-
   private int traceCount;
 
   DProfileLocation() {
@@ -53,6 +50,7 @@ class DProfileLocation implements ProfileLocation {
     label = UtilLocation.label(shortDesc);
     location = shortDesc;
     fullLocation = loc;
+    hash = UtilLocation.hash(loc);
     initWith(label);
     return true;
   }
@@ -71,6 +69,11 @@ class DProfileLocation implements ProfileLocation {
     return location;
   }
 
+  @Override
+  public long hash() {
+    return hash;
+  }
+
   @Override
   public String fullLocation() {
     return fullLocation;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
index 5359d96ed..0354bbd0a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -49,6 +49,10 @@ class DQueryPlanMeta {
     return (profileLocation == null) ? null : profileLocation.location();
   }
 
+  public long getLocationHash() {
+    return (profileLocation == null) ? 0 : profileLocation.hash();
+  }
+
   public String getSql() {
     return sql;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index fda1d4d9b..41a0658f4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -83,6 +83,11 @@ class DQueryPlanMetric implements QueryPlanMetric {
       return meta.getLocation();
     }
 
+    @Override
+    public long locationHash() {
+      return meta.getLocationHash();
+    }
+
     @Override
     public long count() {
       return stats.count();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index 2207fef3d..82731dfd3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -7,18 +7,15 @@ import io.ebean.metric.TimedMetricStats;
  */
 class DTimeMetricStats implements TimedMetricStats {
 
-  private String name;
-
   private final boolean collected;
-
-  private String location;
-
   private final long count;
-
   private final long total;
-
   private final long max;
 
+  private String name;
+  private String location;
+  private long locationHash;
+
   DTimeMetricStats(String name, boolean collected, long count, long total, long max) {
     this.name = name;
     this.collected = collected;
@@ -40,6 +37,7 @@ class DTimeMetricStats implements TimedMetricStats {
       .append(" max:").append(max);
     if (location != null) {
       sb.append(" loc:").append(location);
+      sb.append(" locHash:").append(locationHash);
     }
     return sb.toString();
   }
@@ -49,6 +47,11 @@ class DTimeMetricStats implements TimedMetricStats {
     this.location = location;
   }
 
+  @Override
+  public void setLocationHash(long locationHash) {
+    this.locationHash = locationHash;
+  }
+
   @Override
   public boolean initialCollection() {
     return !collected;
@@ -69,6 +72,11 @@ class DTimeMetricStats implements TimedMetricStats {
     return location;
   }
 
+  @Override
+  public long locationHash() {
+    return locationHash;
+  }
+
   /**
    * Return the count of values collected.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
index 7b70dfcb7..00b388bbd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
@@ -1,7 +1,21 @@
 package io.ebeaninternal.server.profile;
 
+import io.ebeaninternal.server.util.Checksum;
+
 final class UtilLocation {
 
+  /**
+   * Return a hash of the full description excluding the source line number.
+   */
+  static long hash(String full) {
+    final int pos = full.lastIndexOf('(');
+    if (pos > -1) {
+      return Checksum.checksum(full.substring(0, pos));
+    } else {
+      return Checksum.checksum(full);
+    }
+  }
+
   static String label(String shortDescription) {
     int pos = shortDescription.indexOf("(");
     if (pos == -1) {
@@ -21,5 +35,4 @@ final class UtilLocation {
     }
     return desc;
   }
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 796290808..770ac522d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -54,46 +54,32 @@ public class CQueryPlan implements SpiQueryPlan {
   static final String RESULT_SET_BASED_RAW_SQL = "--ResultSetBasedRawSql";
 
   private final SpiEbeanServer server;
-
   private final ProfileLocation profileLocation;
-
   private final String location;
-
+  private final long locationHash;
   private final String label;
-
   private final String name;
-
   private final CQueryPlanKey planKey;
-
   private final boolean rawSql;
-
   private final String sql;
   private final long sqlHash;
-
   private final String logWhereSql;
-
   private final SqlTree sqlTree;
 
   /**
    * Encrypted properties required additional binding.
    */
   private final STreeProperty[] encryptedProps;
-
   private final CQueryPlanStats stats;
-
   private final Class<?> beanType;
-
   final DataTimeZone dataTimeZone;
-
   private final int asOfTableCount;
 
   /**
    * Key used to identify the query plan in audit logging.
    */
   private volatile String auditQueryHash;
-
   private final Set<String> dependentTables;
-
   private final SpiQueryBindCapture bindCapture;
 
   /**
@@ -106,9 +92,10 @@ public class CQueryPlan implements SpiQueryPlan {
     this.planKey = request.getQueryPlanKey();
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
+    this.location = (profileLocation == null) ? null : profileLocation.location();
+    this.locationHash = (profileLocation == null) ? 0 : profileLocation.hash();
     this.label = query.getPlanLabel();
     this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName());
-    this.location = location();
     this.asOfTableCount = query.getAsOfTableCount();
     this.sql = sqlRes.getSql();
     this.sqlTree = sqlTree;
@@ -130,9 +117,10 @@ public class CQueryPlan implements SpiQueryPlan {
     this.beanType = request.getBeanDescriptor().getBeanType();
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
+    this.location = (profileLocation == null) ? null : profileLocation.location();
+    this.locationHash = (profileLocation == null) ? 0 : profileLocation.hash();
     this.label = query.getPlanLabel();
     this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName());
-    this.location = location();
     this.planKey = buildPlanKey(sql, logWhereSql);
     this.asOfTableCount = 0;
     this.sql = sql;
@@ -169,10 +157,6 @@ public class CQueryPlan implements SpiQueryPlan {
     return sql.equals(RESULT_SET_BASED_RAW_SQL) || query.getType().isUpdate() ? SpiQueryBindCapture.NOOP : server.createQueryBindCapture(this);
   }
 
-  private String location() {
-    return (profileLocation == null) ? null : profileLocation.location();
-  }
-
   private CQueryPlanKey buildPlanKey(String sql, String logWhereSql) {
     return new RawSqlQueryPlanKey(sql, false, logWhereSql);
   }
@@ -219,6 +203,10 @@ public class CQueryPlan implements SpiQueryPlan {
     return location;
   }
 
+  public long getLocationHash() {
+    return locationHash;
+  }
+
   @Override
   public void queryPlanInit(long thresholdMicros) {
     bindCapture.queryPlanInit(thresholdMicros);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 36e070653..ab7dc0b63 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -106,6 +106,11 @@ public final class CQueryPlanStats {
       return queryPlan.getLocation();
     }
 
+    @Override
+    public long locationHash() {
+      return queryPlan.getLocationHash();
+    }
+
     @Override
     public long count() {
       return metrics.count();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
index 1bdbcd2f7..5fcbe90a4 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
@@ -8,8 +8,14 @@ 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");
   }
+
+  @Test
+  public void hash() {
+    assertThat(UtilLocation.hash("org.foo.MyFoo.doIt(MyFoo.java:12)")).isEqualTo(396279222L);
+    assertThat(UtilLocation.hash("org.foo.MyFoo.doIt(MyFoo.java:13)")).isEqualTo(396279222L);
+    assertThat(UtilLocation.hash("org.foo.MyFoo.doIt(MyFoo.java:945)")).isEqualTo(396279222L);
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java b/ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java
index c76728fca..79db60023 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java
@@ -37,7 +37,6 @@ public class CustomerFinder extends Finder<Integer, Customer> {
   }
 
   public List<Customer> byNameStatus(String nameStartsWith, Customer.Status status) {
-
     return query("where status = :status and name istartsWith :name order by name")
       .setParameter("status", status)
       .setParameter("name", nameStartsWith)
@@ -45,7 +44,6 @@ public class CustomerFinder extends Finder<Integer, Customer> {
   }
 
   public List<String> namesStartingWith(String name) {
-
     return nativeSql("select name from o_customer where name like ? order by name")
       .setParameter(name + "%")
       .findSingleAttributeList();
diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java
index d93b5c75f..d452b7463 100644
--- a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java
+++ b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java
@@ -7,20 +7,28 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class ProfileLocationTest {
 
-  private static ProfileLocation loc = ProfileLocation.create(12, "foo");
-
-  private static ProfileLocation loc2 = ProfileLocation.create();
+  private static final ProfileLocation loc = ProfileLocation.create(12, "foo");
+  private static final ProfileLocation locB = ProfileLocation.create();
+  private static final ProfileLocation loc2 = ProfileLocation.create();
 
   private boolean doIt() {
+    locB.obtain(); // simulate a location moving by line number only
     return loc.obtain();
   }
 
   @Test
   public void test_obtain() {
     assertThat(doIt()).isTrue();
-    assertThat(loc.fullLocation()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
-    assertThat(loc.location()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
+    assertThat(loc.fullLocation()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:16)");
+    assertThat(loc.location()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:16)");
     assertThat(loc.label()).isEqualTo("ProfileLocationTest.doIt");
+    assertThat(loc.hash()).isEqualTo(1867926812L);
+
+    // same hash even when the line number has changed
+    assertThat(locB.fullLocation()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
+    assertThat(locB.location()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
+    assertThat(locB.label()).isEqualTo("ProfileLocationTest.doIt");
+    assertThat(locB.hash()).isEqualTo(1867926812L);
   }
 
   @Test
@@ -35,7 +43,7 @@ public class ProfileLocationTest {
     other.hashCode();
 
     assertThat(loc2.label()).isEqualTo("ProfileLocationTest$Other.init");
-    assertThat(loc2.location()).isEqualTo("ProfileLocationTest$Other.<init>(ProfileLocationTest.java:44)");
+    assertThat(loc2.location()).isEqualTo("ProfileLocationTest$Other.<init>(ProfileLocationTest.java:52)");
   }
 
   static class Other {
diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 108b4a398..6dfd99422 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -242,7 +242,8 @@ public class TestCustomerFinder extends BaseTestCase {
 
     assertThat(metricsJson).contains("\"name\":\"txn.main\"");
     assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
-    assertThat(metricsJson).contains("\"loc\":\"CustomerFinder.byNameStatus(CustomerFinder.java:44)\"");
+    assertThat(metricsJson).contains("\"locHash\":3254522637");
+    assertThat(metricsJson).contains("\"loc\":\"CustomerFinder.byNameStatus(CustomerFinder.java:43)\"");
     if (isH2() || isPostgres()) {
       assertThat(metricsJson).contains("\"sqlHash\":3634991469");
       assertThat(metricsJson).contains("\"sql\":\"select t0.id, t0.status,");

From ee615836bafe925fc6e29cc23a9dc68132633c4b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 6 Aug 2021 14:56:09 +1200
Subject: [PATCH 346/447] [maven-release-plugin] prepare release
 ebean-parent-12.11.0

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml | 11 +++++------
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 9afbb6446..645581876 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 0b0355981..e4a105be8 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 35ed6d6a0..220dc3e72 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.11.0-SNAPSHOT</version>
+        <version>12.11.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 35a29a677..7911ebaff 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 3426582d3..43d628258 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 4035af5f2..5db1fd673 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index a9b9968b9..29cccfacc 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 3f0b71546..0997c343a 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index a6bfe2ed0..0c69fd30b 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index b3ffadfc0..cfd9f569e 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index d0d5f8ee2..a3e5bbf91 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 43b5ee6f3..97ae36c87 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 819328290..e283dc067 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 8f3cafa8a..80cdb4f26 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -30,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -44,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -65,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0-SNAPSHOT</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index b86928387..d104f7afe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.11.0-SNAPSHOT</version>
+  <version>12.11.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 956e39cb5..6d0b1af1b 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0-SNAPSHOT</version>
+    <version>12.11.0</version>
   </parent>
 
   <name>querybean generator</name>

From c4484c758ec2729d0796fc50573ada0920eb16f9 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 6 Aug 2021 14:56:15 +1200
Subject: [PATCH 347/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 645581876..72fbfe3ae 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index e4a105be8..c47f7fe08 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 220dc3e72..fff064c90 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.11.0</version>
+        <version>12.11.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 7911ebaff..d8eab3e25 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 43d628258..11aac552a 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -87,19 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 5db1fd673..f83a8b02e 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 29cccfacc..e506a6841 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 0997c343a..d0226a553 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 0c69fd30b..98b44522d 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index cfd9f569e..059976afa 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index a3e5bbf91..943ab6985 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 97ae36c87..4b9b05272 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index e283dc067..db01d91a1 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 80cdb4f26..1b3f9d848 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0</version>
+      <version>12.11.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index d104f7afe..dc3426809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.11.0</version>
+  <version>12.11.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.0</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 6d0b1af1b..a240e3b8b 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.0</version>
+    <version>12.11.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From c610f95b2d2da07ae15d8993b5fbdbd6dbfc25e4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 9 Aug 2021 14:05:10 +1200
Subject: [PATCH 348/447] #2293 - Metric hash back to MD5 of sql + name + loc
 (minus location file and line source) ~= Revert of #2288

---
 .../main/java/io/ebean/ProfileLocation.java   |  8 ---
 .../java/io/ebean/meta/MetaQueryMetric.java   | 11 +---
 .../java/io/ebean/meta/MetaQueryPlan.java     |  2 +-
 .../java/io/ebean/meta/MetaTimedMetric.java   |  8 ---
 .../main/java/io/ebean/meta/MetricData.java   | 19 ++-----
 .../java/io/ebean/meta/QueryPlanInit.java     | 10 ++--
 .../io/ebean/metric/TimedMetricStats.java     |  5 --
 .../io/ebeaninternal/api/SpiQueryPlan.java    |  2 +-
 .../server/core/DumpMetrics.java              |  3 +-
 .../server/core/DumpMetricsData.java          |  4 +-
 .../server/core/DumpMetricsJson.java          | 22 ++++----
 .../server/deploy/BeanDescriptor.java         |  2 +-
 .../server/profile/BasicProfileLocation.java  | 20 +------
 .../server/profile/DProfileLocation.java      | 31 ++---------
 .../server/profile/DQueryPlanMeta.java        | 15 +++---
 .../server/profile/DQueryPlanMetric.java      |  9 +---
 .../server/profile/DTimeMetricStats.java      | 12 -----
 .../server/profile/UtilLocation.java          | 29 +++++-----
 .../server/query/CQueryPlan.java              | 23 +++-----
 .../server/query/CQueryPlanStats.java         |  9 +---
 .../server/query/DQueryPlanOutput.java        | 12 ++---
 .../io/ebeaninternal/server/util/Md5.java     | 36 +++++++++++++
 .../profile/BasicProfileLocationTest.java     |  6 +--
 .../server/profile/UtilLocationTest.java      |  9 ++--
 .../io/ebeaninternal/server/util/Md5Test.java | 53 +++++++++++++++++++
 .../tests/profile/ProfileLocationTest.java    |  8 ++-
 .../query/finder/TestCustomerFinder.java      |  5 +-
 27 files changed, 172 insertions(+), 201 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java

diff --git a/ebean-api/src/main/java/io/ebean/ProfileLocation.java b/ebean-api/src/main/java/io/ebean/ProfileLocation.java
index 605de580a..33584a0b3 100644
--- a/ebean-api/src/main/java/io/ebean/ProfileLocation.java
+++ b/ebean-api/src/main/java/io/ebean/ProfileLocation.java
@@ -45,14 +45,6 @@ public interface ProfileLocation {
    */
   String label();
 
-  /**
-   * Return a hash of the location that intentionally excludes the line number.
-   * <p>
-   * The hash is expected to be stable regardless of line number in the source file
-   * so that is identifies the class and method location over a long time.
-   */
-  long hash();
-
   /**
    * Return the full location.
    */
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
index f5fee986c..1c9b5fe12 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
@@ -45,15 +45,8 @@ public interface MetaQueryMetric extends MetaTimedMetric {
   }
 
   /**
-   * Return the hash of the sql.
+   * Return the hash of the plan.
    */
-  long sqlHash();
+  String hash();
 
-  /**
-   * Migrate to sqlHash().
-   */
-  @Deprecated
-  default long getSqlHash() {
-    return sqlHash();
-  }
 }
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
index 6cdce69a1..c1ae44a82 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java
@@ -30,7 +30,7 @@ public interface MetaQueryPlan {
   /**
    * Return the hash of the plan.
    */
-  long sqlHash();
+  String hash();
 
   /**
    * Return a description of the bind values.
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
index dbd0f0a0e..f95f3248d 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java
@@ -6,14 +6,6 @@ package io.ebean.meta;
  */
 public interface MetaTimedMetric extends MetaMetric {
 
-  /**
-   * Return the metric location hash if defined.
-   * <p>
-   * This hash excludes line number with the intention of being stable over time
-   * as code changes move the source line (but the method is the same).
-   */
-  long locationHash();
-
   /**
    * Return the metric location if defined.
    */
diff --git a/ebean-api/src/main/java/io/ebean/meta/MetricData.java b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
index 7f2eb38b6..b4606b1d7 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetricData.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetricData.java
@@ -6,7 +6,7 @@ package io.ebean.meta;
 public class MetricData {
 
   private String name;
-  private long sqlHash;
+  private String hash;
   private String loc;
   private String sql;
 
@@ -14,7 +14,6 @@ public class MetricData {
   private Long mean;
   private Long max;
   private Long total;
-  private long locHash;
 
   public MetricData(String name) {
     this.name = name;
@@ -31,20 +30,12 @@ public class MetricData {
     this.name = name;
   }
 
-  public long getSqlHash() {
-    return sqlHash;
+  public String getHash() {
+    return hash;
   }
 
-  public void setSqlHash(long sqlHash) {
-    this.sqlHash = sqlHash;
-  }
-
-  public void setLocHash(long locHash) {
-    this.locHash = locHash;
-  }
-
-  public long getLocHash() {
-    return locHash;
+  public void setHash(String hash) {
+    this.hash = hash;
   }
 
   public String getLoc() {
diff --git a/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java b/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
index 7caeabd2f..5cce68994 100644
--- a/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
+++ b/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java
@@ -10,7 +10,7 @@ public class QueryPlanInit {
 
   private boolean all;
 
-  private Set<Long> hashes = new HashSet<>();
+  private Set<String> hashes = new HashSet<>();
 
   private long thresholdMicros;
 
@@ -47,21 +47,21 @@ public class QueryPlanInit {
   /**
    * Return true if the query plan should be initiated based on it's hash.
    */
-  public boolean includeHash(long sqlHash) {
-    return all || hashes.contains(sqlHash);
+  public boolean includeHash(String hash) {
+    return all || hashes.contains(hash);
   }
 
   /**
    * Return the specific hashes that we want to collect query plans on.
    */
-  public Set<Long> sqlHashes() {
+  public Set<String> hashes() {
     return hashes;
   }
 
   /**
    * Set the specific hashes that we want to collect query plans on.
    */
-  public void sqlHashes(Set<Long> hashes) {
+  public void hashes(Set<String> hashes) {
     this.hashes = hashes;
   }
 }
diff --git a/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java b/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java
index 8c88d839e..3012e9e9f 100644
--- a/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java
+++ b/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java
@@ -12,11 +12,6 @@ public interface TimedMetricStats extends MetaTimedMetric {
    */
   void setLocation(String location);
 
-  /**
-   * Additionally set the location hash.
-   */
-  void setLocationHash(long locationHash);
-
   /**
    * Override the name based on profile location.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
index 878dcc716..0b4c3ea0a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
@@ -20,7 +20,7 @@ public interface SpiQueryPlan {
   /**
    * The hash of the sql.
    */
-  long getSqlHash();
+  String getHash();
 
   /**
    * The SQL for the query plan.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 968e96a98..5274b4ced 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -120,7 +120,7 @@ class DumpMetrics {
     appendQueryName(metric, sb);
     appendCounters(metric, sb);
     if (dumpHash) {
-      sb.append("\n sqlHash:").append(metric.sqlHash());
+      sb.append("\n hash:").append(metric.hash());
     }
     appendProfileAndSql(metric, sb);
     out(sb.toString());
@@ -134,7 +134,6 @@ class DumpMetrics {
     String location = metric.location();
     if (dumpLoc && location != null) {
       sb.append("\n  loc:").append(location);
-      sb.append("\n  locHash:").append(metric.locationHash());
     }
     if (dumpSql) {
       sb.append(" \n\n  sql:").append(metric.sql()).append("\n\n");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
index 07980228f..4bc1e5035 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
@@ -56,7 +56,6 @@ class DumpMetricsData {
     final MetricData data = create(metric);
     appendCounters(data, metric);
     data.setLoc(metric.location());
-    data.setLocHash(metric.locationHash());
   }
 
   private void addCount(MetaCountMetric metric) {
@@ -68,11 +67,10 @@ class DumpMetricsData {
     final MetricData data = create(metric);
     appendCounters(data, metric);
     appendLocationAndSql(data, metric);
-    data.setSqlHash(metric.sqlHash());
+    data.setHash(metric.hash());
   }
 
   private void appendLocationAndSql(MetricData data, MetaQueryMetric metric) {
-    data.setLocHash(metric.locationHash());
     data.setLoc(metric.location());
     data.setSql(metric.sql());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
index c116ebd26..90200f79b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
@@ -188,8 +188,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     metricStart(metric);
     appendTiming(metric);
     if (isIncludeDetail(metric)) {
-      keyVal("locHash", metric.locationHash());
-      appendExtra("loc", metric.location());
+      append("loc", metric.location());
     }
     metricEnd();
   }
@@ -198,12 +197,11 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     metricStart(metric);
     appendTiming(metric);
     if (withHash) {
-      keyVal("sqlHash", metric.sqlHash());
-      keyVal("locHash", metric.locationHash());
+      append("hash", metric.hash());
     }
     if (isIncludeDetail(metric)) {
-      appendExtra("loc", metric.location());
-      appendExtra("sql", metric.sql());
+      append("loc", metric.location());
+      append("sql", metric.sql());
     }
     metricEnd();
   }
@@ -212,7 +210,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
     return includeExtraAttributes == 2 || includeExtraAttributes == 1 && metric.initialCollection();
   }
 
-  private void appendExtra(String key, String val) throws IOException {
+  private void append(String key, String val) throws IOException {
     if (val != null) {
       key(key);
       val(val);
@@ -220,13 +218,13 @@ class DumpMetricsJson implements ServerMetricsAsJson {
   }
 
   private void appendTiming(MetaTimedMetric timedMetric) throws IOException {
-    keyVal("count", timedMetric.count());
-    keyVal("total", timedMetric.total());
-    keyVal("mean", timedMetric.mean());
-    keyVal("max", timedMetric.max());
+    append("count", timedMetric.count());
+    append("total", timedMetric.total());
+    append("mean", timedMetric.mean());
+    append("max", timedMetric.max());
   }
 
-  private void keyVal(String key, long value) throws IOException {
+  private void append(String key, long value) throws IOException {
     key(key);
     val(value);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 6a9acd839..8e8b02b6f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1558,7 +1558,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
 
   void queryPlanInit(QueryPlanInit request, List<MetaQueryPlan> list) {
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
-      if (request.includeHash(queryPlan.getSqlHash())) {
+      if (request.includeHash(queryPlan.getHash())) {
         queryPlan.queryPlanInit(request.thresholdMicros());
         list.add(queryPlan.createMeta(null, null));
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
index 8e8a5ffc0..d7d5b0fd2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java
@@ -10,12 +10,10 @@ final class BasicProfileLocation implements ProfileLocation {
   private final String fullLocation;
   private final String location;
   private final String label;
-  private final long hash;
 
   BasicProfileLocation(String fullLocation) {
     this.fullLocation = fullLocation;
-    this.hash = UtilLocation.hash(fullLocation);
-    this.location = shortDesc(fullLocation);
+    this.location = UtilLocation.loc(fullLocation);
     this.label = UtilLocation.label(location);
   }
 
@@ -44,11 +42,6 @@ final class BasicProfileLocation implements ProfileLocation {
     return location;
   }
 
-  @Override
-  public long hash() {
-    return hash;
-  }
-
   @Override
   public String fullLocation() {
     return fullLocation;
@@ -64,15 +57,4 @@ final class BasicProfileLocation implements ProfileLocation {
     // do nothing
   }
 
-  private String shortDesc(String location) {
-    int lastPer = location.lastIndexOf('.');
-    if (lastPer > -1) {
-      lastPer = location.lastIndexOf('.', lastPer - 1);
-      if (lastPer > -1) {
-        return location.substring(lastPer + 1);
-      }
-    }
-    return location;
-  }
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
index 9c6340ad4..63fa0e11a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
@@ -13,7 +13,6 @@ class DProfileLocation implements ProfileLocation {
   private String fullLocation;
   private String location;
   private String label;
-  private long hash;
 
   private final int lineNumber;
   private int traceCount;
@@ -46,11 +45,10 @@ class DProfileLocation implements ProfileLocation {
       return false;
     }
     final String loc = create();
-    final String shortDesc = shortDesc(loc);
-    label = UtilLocation.label(shortDesc);
-    location = shortDesc;
-    fullLocation = loc;
-    hash = UtilLocation.hash(loc);
+    final String location = UtilLocation.loc(loc);
+    this.label = UtilLocation.label(location);
+    this.location = location;
+    this.fullLocation = loc;
     initWith(label);
     return true;
   }
@@ -69,11 +67,6 @@ class DProfileLocation implements ProfileLocation {
     return location;
   }
 
-  @Override
-  public long hash() {
-    return hash;
-  }
-
   @Override
   public String fullLocation() {
     return fullLocation;
@@ -116,20 +109,4 @@ class DProfileLocation implements ProfileLocation {
       return traceLine.substring(0, traceLine.length() - 1) + ":" + lineNumber + ")";
     }
   }
-
-  private String shortDesc(String location) {
-    int pos = location.lastIndexOf('(');
-    if (pos == -1) {
-      pos = location.length();
-    }
-
-    pos = location.lastIndexOf('.', pos);
-    if (pos > -1) {
-      pos = location.lastIndexOf('.', pos - 1);
-      if (pos > -1) {
-        return location.substring(pos + 1);
-      }
-    }
-    return location;
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
index 0354bbd0a..67f724051 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
-import io.ebeaninternal.server.util.Checksum;
+import io.ebeaninternal.server.util.Md5;
 
 class DQueryPlanMeta {
 
@@ -10,7 +10,7 @@ class DQueryPlanMeta {
   private final ProfileLocation profileLocation;
   private final String name;
   private final String sql;
-  private final long sqlHash;
+  private final String hash;
 
   DQueryPlanMeta(Class<?> type, String label, ProfileLocation profileLocation, String sql) {
     this.type = type;
@@ -22,15 +22,16 @@ class DQueryPlanMeta {
       name += "_" + label;
     }
     this.name = name;
-    this.sqlHash = Checksum.checksum(sql);
+    String loc = profileLocation == null ? null : profileLocation.location();
+    this.hash = Md5.hash(sql, name, loc);
   }
 
   public Class<?> getType() {
     return type;
   }
 
-  public long getSqlHash() {
-    return sqlHash;
+  public String getHash() {
+    return hash;
   }
 
   public String getName() {
@@ -49,10 +50,6 @@ class DQueryPlanMeta {
     return (profileLocation == null) ? null : profileLocation.location();
   }
 
-  public long getLocationHash() {
-    return (profileLocation == null) ? 0 : profileLocation.hash();
-  }
-
   public String getSql() {
     return sql;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 41a0658f4..e24da73c7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -59,8 +59,8 @@ class DQueryPlanMetric implements QueryPlanMetric {
     }
 
     @Override
-    public long sqlHash() {
-      return meta.getSqlHash();
+    public String hash() {
+      return meta.getHash();
     }
 
     @Override
@@ -83,11 +83,6 @@ class DQueryPlanMetric implements QueryPlanMetric {
       return meta.getLocation();
     }
 
-    @Override
-    public long locationHash() {
-      return meta.getLocationHash();
-    }
-
     @Override
     public long count() {
       return stats.count();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index 82731dfd3..a4243e31a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -14,7 +14,6 @@ class DTimeMetricStats implements TimedMetricStats {
 
   private String name;
   private String location;
-  private long locationHash;
 
   DTimeMetricStats(String name, boolean collected, long count, long total, long max) {
     this.name = name;
@@ -37,7 +36,6 @@ class DTimeMetricStats implements TimedMetricStats {
       .append(" max:").append(max);
     if (location != null) {
       sb.append(" loc:").append(location);
-      sb.append(" locHash:").append(locationHash);
     }
     return sb.toString();
   }
@@ -47,11 +45,6 @@ class DTimeMetricStats implements TimedMetricStats {
     this.location = location;
   }
 
-  @Override
-  public void setLocationHash(long locationHash) {
-    this.locationHash = locationHash;
-  }
-
   @Override
   public boolean initialCollection() {
     return !collected;
@@ -72,11 +65,6 @@ class DTimeMetricStats implements TimedMetricStats {
     return location;
   }
 
-  @Override
-  public long locationHash() {
-    return locationHash;
-  }
-
   /**
    * Return the count of values collected.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
index 00b388bbd..65ab1ce4d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/UtilLocation.java
@@ -1,28 +1,29 @@
 package io.ebeaninternal.server.profile;
 
-import io.ebeaninternal.server.util.Checksum;
-
 final class UtilLocation {
 
-  /**
-   * Return a hash of the full description excluding the source line number.
-   */
-  static long hash(String full) {
+  static String loc(String full) {
     final int pos = full.lastIndexOf('(');
     if (pos > -1) {
-      return Checksum.checksum(full.substring(0, pos));
+      return full.substring(0, pos);
     } else {
-      return Checksum.checksum(full);
+      return full;
     }
   }
 
-  static String label(String shortDescription) {
-    int pos = shortDescription.indexOf("(");
-    if (pos == -1) {
-      return shortDescription;
-    } else {
-      return trimInit(shortDescription.substring(0, pos));
+  static String label(String location) {
+    return trimInit(shortDesc(location));
+  }
+
+  private static String shortDesc(String location) {
+    int pos = location.lastIndexOf('.');
+    if (pos > -1) {
+      pos = location.lastIndexOf('.', pos - 1);
+      if (pos > -1) {
+        return location.substring(pos + 1);
+      }
     }
+    return location;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 770ac522d..de365f253 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -13,7 +13,7 @@ import io.ebeaninternal.api.SpiQueryBindCapture;
 import io.ebeaninternal.api.SpiQueryPlan;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
-import io.ebeaninternal.server.util.Checksum;
+import io.ebeaninternal.server.util.Md5;
 import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
@@ -56,13 +56,12 @@ public class CQueryPlan implements SpiQueryPlan {
   private final SpiEbeanServer server;
   private final ProfileLocation profileLocation;
   private final String location;
-  private final long locationHash;
   private final String label;
   private final String name;
   private final CQueryPlanKey planKey;
   private final boolean rawSql;
   private final String sql;
-  private final long sqlHash;
+  private final String hash;
   private final String logWhereSql;
   private final SqlTree sqlTree;
 
@@ -93,7 +92,6 @@ public class CQueryPlan implements SpiQueryPlan {
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
     this.location = (profileLocation == null) ? null : profileLocation.location();
-    this.locationHash = (profileLocation == null) ? 0 : profileLocation.hash();
     this.label = query.getPlanLabel();
     this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName());
     this.asOfTableCount = query.getAsOfTableCount();
@@ -105,7 +103,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCapture(query);
-    this.sqlHash = Checksum.checksum(sql);
+    this.hash = Md5.hash(sql, name, location);
   }
 
   /**
@@ -118,7 +116,6 @@ public class CQueryPlan implements SpiQueryPlan {
     SpiQuery<?> query = request.getQuery();
     this.profileLocation = query.getProfileLocation();
     this.location = (profileLocation == null) ? null : profileLocation.location();
-    this.locationHash = (profileLocation == null) ? 0 : profileLocation.hash();
     this.label = query.getPlanLabel();
     this.name = deriveName(label, query.getType(), request.getBeanDescriptor().getSimpleName());
     this.planKey = buildPlanKey(sql, logWhereSql);
@@ -131,7 +128,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCaptureRaw(sql, query);
-    this.sqlHash = Checksum.checksum(sql);
+    this.hash = Md5.hash(sql, name, location);
   }
 
   private String deriveName(String label, SpiQuery.Type type, String simpleName) {
@@ -177,8 +174,8 @@ public class CQueryPlan implements SpiQueryPlan {
   }
 
   @Override
-  public long getSqlHash() {
-    return sqlHash;
+  public String getHash() {
+    return hash;
   }
 
   @Override
@@ -203,10 +200,6 @@ public class CQueryPlan implements SpiQueryPlan {
     return location;
   }
 
-  public long getLocationHash() {
-    return locationHash;
-  }
-
   @Override
   public void queryPlanInit(long thresholdMicros) {
     bindCapture.queryPlanInit(thresholdMicros);
@@ -214,7 +207,7 @@ public class CQueryPlan implements SpiQueryPlan {
 
   @Override
   public DQueryPlanOutput createMeta(String bind, String planString) {
-    return new DQueryPlanOutput(getBeanType(), name, sqlHash, sql, profileLocation, bind, planString);
+    return new DQueryPlanOutput(getBeanType(), name, hash, sql, profileLocation, bind, planString);
   }
 
   public DataReader createDataReader(ResultSet rset) {
@@ -261,7 +254,7 @@ public class CQueryPlan implements SpiQueryPlan {
 
   private String calcAuditQueryKey() {
     // rawSql needs to include the MD5 hash of the sql
-    return rawSql ? planKey.getPartialKey() + "_" + sqlHash : planKey.getPartialKey();
+    return rawSql ? planKey.getPartialKey() + "_" + hash : planKey.getPartialKey();
   }
 
   SqlTree getSqlTree() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index ab7dc0b63..ffc749eb9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -106,11 +106,6 @@ public final class CQueryPlanStats {
       return queryPlan.getLocation();
     }
 
-    @Override
-    public long locationHash() {
-      return queryPlan.getLocationHash();
-    }
-
     @Override
     public long count() {
       return metrics.count();
@@ -132,8 +127,8 @@ public final class CQueryPlanStats {
     }
 
     @Override
-    public long sqlHash() {
-      return queryPlan.getSqlHash();
+    public String hash() {
+      return queryPlan.getHash();
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
index 3d879362b..1c1a41d07 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
@@ -16,14 +16,14 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
   private final String sql;
   private final String bind;
   private final String plan;
-  private final long sqlHash;
+  private final String hash;
   private long queryTimeMicros;
   private long captureCount;
 
-  DQueryPlanOutput(Class<?> beanType, String label, long sqlHash, String sql, ProfileLocation profileLocation, String bind, String plan) {
+  DQueryPlanOutput(Class<?> beanType, String label, String hash, String sql, ProfileLocation profileLocation, String bind, String plan) {
     this.beanType = beanType;
     this.label = label;
-    this.sqlHash = sqlHash;
+    this.hash = hash;
     this.sql = sql;
     this.profileLocation = profileLocation;
     this.bind = bind;
@@ -31,8 +31,8 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
   }
 
   @Override
-  public long sqlHash() {
-    return sqlHash;
+  public String hash() {
+    return hash;
   }
 
   /**
@@ -99,7 +99,7 @@ class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
 
   @Override
   public String toString() {
-    return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + " planHash:" + sqlHash + " label:" + label + " queryTimeMicros:" + queryTimeMicros + " captureCount:" + captureCount + "\n SQL:" + sql + "\nBIND:" + bind + "\nPLAN:" + plan;
+    return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + " planHash:" + hash + " label:" + label + " queryTimeMicros:" + queryTimeMicros + " captureCount:" + captureCount + "\n SQL:" + sql + "\nBIND:" + bind + "\nPLAN:" + plan;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
new file mode 100644
index 000000000..45df901f0
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/Md5.java
@@ -0,0 +1,36 @@
+package io.ebeaninternal.server.util;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+
+public final class Md5 {
+
+  /**
+   * Return the MD5 hash of the underlying sql.
+   */
+  public static String hash(String... values) {
+    try {
+      MessageDigest md = MessageDigest.getInstance("MD5");
+      for (String val : values) {
+        if (val != null) {
+          md.update(val.getBytes(StandardCharsets.UTF_8));
+        }
+      }
+      return digestToHex(md.digest());
+    } catch (Exception e) {
+      throw new RuntimeException("MD5 hashing failed", e);
+    }
+  }
+
+  /**
+   * Convert the digest into a hex value.
+   */
+  private static String digestToHex(byte[] digest) {
+    StringBuilder sb = new StringBuilder(32);
+    for (byte aDigest : digest) {
+      sb.append(Integer.toString((aDigest & 0xff) + 0x100, 16).substring(1));
+    }
+    return sb.toString();
+  }
+
+}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
index 6dfdad9f6..84a53442a 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
@@ -14,7 +14,7 @@ public class BasicProfileLocationTest {
 
     assertThat(loc.obtain()).isTrue();
     assertThat(loc.fullLocation()).endsWith(":12)");
-    assertThat(loc.location()).isEqualTo("NativeMethodAccessorImpl.invoke0(Native Method:12)");
+    assertThat(loc.location()).isEqualTo("java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0");
     assertThat(loc.label()).isEqualTo("NativeMethodAccessorImpl.invoke0");
   }
 
@@ -24,7 +24,7 @@ public class BasicProfileLocationTest {
     BasicProfileLocation loc = new BasicProfileLocation("com.foo.Bar.all");
     assertThat(loc.obtain()).isFalse();
     assertThat(loc.fullLocation()).isEqualTo("com.foo.Bar.all");
-    assertThat(loc.location()).isEqualTo("Bar.all");
+    assertThat(loc.location()).isEqualTo("com.foo.Bar.all");
     assertThat(loc.label()).isEqualTo("Bar.all");
   }
 
@@ -34,7 +34,7 @@ public class BasicProfileLocationTest {
     BasicProfileLocation loc = new BasicProfileLocation("foo.Bar.all");
     assertThat(loc.obtain()).isFalse();
     assertThat(loc.fullLocation()).isEqualTo("foo.Bar.all");
-    assertThat(loc.location()).isEqualTo("Bar.all");
+    assertThat(loc.location()).isEqualTo("foo.Bar.all");
     assertThat(loc.label()).isEqualTo("Bar.all");
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
index 5fcbe90a4..0b26078ff 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java
@@ -9,13 +9,12 @@ 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");
+    assertThat(UtilLocation.label("ProfileLocationTest$Other.<init>")).isEqualTo("ProfileLocationTest$Other.init");
   }
 
   @Test
-  public void hash() {
-    assertThat(UtilLocation.hash("org.foo.MyFoo.doIt(MyFoo.java:12)")).isEqualTo(396279222L);
-    assertThat(UtilLocation.hash("org.foo.MyFoo.doIt(MyFoo.java:13)")).isEqualTo(396279222L);
-    assertThat(UtilLocation.hash("org.foo.MyFoo.doIt(MyFoo.java:945)")).isEqualTo(396279222L);
+  public void loc() {
+    assertThat(UtilLocation.loc("org.foo.MyFoo.doIt(MyFoo.java:12)")).isEqualTo("org.foo.MyFoo.doIt");
+    assertThat(UtilLocation.label("org.foo.MyFoo.doIt")).isEqualTo("MyFoo.doIt");
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java
new file mode 100644
index 000000000..9f0106cae
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java
@@ -0,0 +1,53 @@
+package io.ebeaninternal.server.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class Md5Test {
+
+  @Test
+  public void hash() throws Exception {
+    String content = "some random content we wish to hash";
+    String hash1 = Md5.hash(content);
+    String hash2 = Md5.hash(content);
+    assertEquals(hash1, hash2);
+    assertEquals(hash1, "62c20bf679ff56cb746452ab5c88e3ed");
+  }
+
+  @Test
+  public void hashDifferent() throws Exception {
+    String hash1 = Md5.hash("one");
+    String hash2 = Md5.hash("two");
+    String hash3 = Md5.hash("onetwo");
+
+    assertNotEquals(hash1, hash2);
+    assertNotEquals(hash2, hash3);
+    assertEquals(hash1, "f97c5d29941bfb1b2fdab0874906ab82");
+  }
+
+  @Test
+  public void hashMulti() {
+    String hash1 = Md5.hash("one", "two");
+    String hash2 = Md5.hash("onetwo");
+
+    assertEquals(hash1, hash2);
+    assertEquals(hash1, "5b9164ad6f496d9dee12ec7634ce253f");
+  }
+
+  @Test
+  public void hashMulti_when_null() {
+    String hash1 = Md5.hash("one", null);
+    String hash2 = Md5.hash("one");
+
+    assertEquals(hash1, hash2);
+    assertEquals(hash1, "f97c5d29941bfb1b2fdab0874906ab82");
+  }
+
+  @Test
+  public void when_null() {
+    String hash1 = Md5.hash(null, null);
+    assertEquals(hash1, "d41d8cd98f00b204e9800998ecf8427e");
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java
index d452b7463..c7b0edfe9 100644
--- a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java
+++ b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java
@@ -20,15 +20,13 @@ public class ProfileLocationTest {
   public void test_obtain() {
     assertThat(doIt()).isTrue();
     assertThat(loc.fullLocation()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:16)");
-    assertThat(loc.location()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:16)");
+    assertThat(loc.location()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt");
     assertThat(loc.label()).isEqualTo("ProfileLocationTest.doIt");
-    assertThat(loc.hash()).isEqualTo(1867926812L);
 
     // same hash even when the line number has changed
     assertThat(locB.fullLocation()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
-    assertThat(locB.location()).isEqualTo("ProfileLocationTest.doIt(ProfileLocationTest.java:15)");
+    assertThat(locB.location()).isEqualTo("org.tests.profile.ProfileLocationTest.doIt");
     assertThat(locB.label()).isEqualTo("ProfileLocationTest.doIt");
-    assertThat(locB.hash()).isEqualTo(1867926812L);
   }
 
   @Test
@@ -43,7 +41,7 @@ public class ProfileLocationTest {
     other.hashCode();
 
     assertThat(loc2.label()).isEqualTo("ProfileLocationTest$Other.init");
-    assertThat(loc2.location()).isEqualTo("ProfileLocationTest$Other.<init>(ProfileLocationTest.java:52)");
+    assertThat(loc2.location()).isEqualTo("org.tests.profile.ProfileLocationTest$Other.<init>");
   }
 
   static class Other {
diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 6dfd99422..d36e36b51 100644
--- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -242,10 +242,9 @@ public class TestCustomerFinder extends BaseTestCase {
 
     assertThat(metricsJson).contains("\"name\":\"txn.main\"");
     assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
-    assertThat(metricsJson).contains("\"locHash\":3254522637");
-    assertThat(metricsJson).contains("\"loc\":\"CustomerFinder.byNameStatus(CustomerFinder.java:43)\"");
+    assertThat(metricsJson).contains("\"loc\":\"org.tests.model.basic.finder.CustomerFinder.byNameStatus\"");
     if (isH2() || isPostgres()) {
-      assertThat(metricsJson).contains("\"sqlHash\":3634991469");
+      assertThat(metricsJson).contains("\"hash\":\"de3affa5b4bff07e19c1c012590dcde6\"");
       assertThat(metricsJson).contains("\"sql\":\"select t0.id, t0.status,");
     }
   }

From 43213ead058f8a648f6ce1a7d2edf54c28a54d47 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 9 Aug 2021 15:10:59 +1200
Subject: [PATCH 349/447] #2291 - ENH: Explicit option for fast-failing or not
 fast-failing (skipDataSourceCheck config option)

---
 .../java/io/ebean/config/DatabaseConfig.java    | 17 +++++++++++++++++
 .../server/core/DefaultContainer.java           |  3 +++
 .../io/ebean/config/DatabaseConfigTest.java     |  5 +++++
 3 files changed, 25 insertions(+)

diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index d1f0346b5..873304c3a 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -319,6 +319,8 @@ public class DatabaseConfig {
    */
   private ExternalTransactionManager externalTransactionManager;
 
+  private boolean skipDataSourceCheck;
+
   /**
    * The data source (if programmatically provided).
    */
@@ -1651,6 +1653,20 @@ public class DatabaseConfig {
     this.autoTuneConfig = autoTuneConfig;
   }
 
+  /**
+   * Return true if the startup DataSource check should be skipped.
+   */
+  public boolean skipDataSourceCheck() {
+    return skipDataSourceCheck;
+  }
+
+  /**
+   * Set to true to skip the startup DataSource check.
+   */
+  public void setSkipDataSourceCheck(boolean skipDataSourceCheck) {
+    this.skipDataSourceCheck = skipDataSourceCheck;
+  }
+
   /**
    * Return the DataSource.
    */
@@ -2932,6 +2948,7 @@ public class DatabaseConfig {
     jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);
     jsonMutationDetection = p.getEnum(MutationDetection.class, "jsonMutationDetection", jsonMutationDetection);
 
+    skipDataSourceCheck = p.getBoolean("skipDataSourceCheck", skipDataSourceCheck);
     runMigration = p.getBoolean("migration.run", runMigration);
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
     ddlRun = p.getBoolean("ddl.run", ddlRun);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index cdefcc294..2c8bbfecc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -255,6 +255,9 @@ public class DefaultContainer implements SpiContainer {
       }
       throw new RuntimeException("DataSource not set?");
     }
+    if (config.skipDataSourceCheck()) {
+      return true;
+    }
     try (Connection connection = config.getDataSource().getConnection()) {
       if (connection.getAutoCommit()) {
         logger.warn("DataSource [{}] has autoCommit defaulting to true!", config.getName());
diff --git a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java
index dd132a8e3..368bc9a8f 100644
--- a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java
@@ -76,6 +76,7 @@ public class DatabaseConfigTest {
     props.setProperty("loadModuleInfo", "true");
     props.setProperty("forUpdateNoKey", "true");
     props.setProperty("defaultServer", "false");
+    props.setProperty("skipDataSourceCheck", "true");
 
     props.setProperty("queryPlan.enable", "true");
     props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -92,6 +93,7 @@ public class DatabaseConfigTest {
     assertTrue(config.isDbOffline());
     assertTrue(config.isAutoReadOnlyDataSource());
     assertTrue(config.isAutoLoadModuleInfo());
+    assertTrue(config.skipDataSourceCheck());
 
     assertTrue(config.isIdGeneratorAutomatic());
     assertFalse(config.getPlatformConfig().isCaseSensitiveCollation());
@@ -155,6 +157,7 @@ public class DatabaseConfigTest {
     assertTrue(config.isIdGeneratorAutomatic());
     assertTrue(config.isDefaultServer());
     assertFalse(config.isAutoPersistUpdates());
+    assertFalse(config.skipDataSourceCheck());
 
     config.setIdGeneratorAutomatic(false);
     assertFalse(config.isIdGeneratorAutomatic());
@@ -175,6 +178,8 @@ public class DatabaseConfigTest {
     assertFalse(config.isAutoLoadModuleInfo());
     config.setAutoPersistUpdates(true);
     assertTrue(config.isAutoPersistUpdates());
+    config.setSkipDataSourceCheck(true);
+    assertTrue(config.skipDataSourceCheck());
   }
 
   @Test

From 8c101fd0a460df5ed5252601483b8f89ac4f783e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 9 Aug 2021 16:48:59 +1200
Subject: [PATCH 350/447] #2268 - Feature request/question: Query execution
 time for debugging

---
 .../server/core/AbstractSqlQueryRequest.java  | 14 +---
 .../server/core/DtoQueryRequest.java          |  3 -
 .../server/core/RelationalQueryRequest.java   |  3 -
 .../io/ebeaninternal/server/query/CQuery.java |  6 +-
 .../server/query/CQueryEngine.java            | 66 ++-----------------
 .../query/CQueryFetchSingleAttribute.java     | 38 ++---------
 .../server/query/CQueryRowCount.java          | 38 ++---------
 .../server/query/CQueryUpdate.java            | 32 ++-------
 8 files changed, 29 insertions(+), 171 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 67844c631..a88f1bbe9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -23,25 +23,16 @@ import javax.persistence.PersistenceException;
 public abstract class AbstractSqlQueryRequest implements CancelableQuery {
 
   protected final SpiSqlBinding query;
-
   protected final SpiEbeanServer server;
-
   protected SpiTransaction transaction;
-
   private boolean createdTransaction;
-
   protected String sql;
-
   protected ResultSet resultSet;
-
   protected String bindLog = "";
-
   protected PreparedStatement pstmt;
-
   protected long startNano;
-
   private final ReentrantLock lock = new ReentrantLock();
-  
+
   /**
    * Create the BeanFindRequest.
    */
@@ -161,7 +152,8 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {
         this.bindLog = binder.bind(bindParams, pstmt, conn);
       }
       if (isLogSql()) {
-        transaction.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ")"));
+        long micros = (System.nanoTime() - startNano) / 1000L;
+        transaction.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ") --micros(", micros + ")"));
       }
     } finally {
       lock.unlock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index 2b1a55f6e..c023f2d0d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -28,11 +28,8 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
   private static final String ENC_PREFIX_UPPER = EncryptAlias.PREFIX.toUpperCase();
 
   private final SpiDtoQuery<T> query;
-
   private final DtoQueryEngine queryEngine;
-
   private DtoQueryPlan plan;
-
   private DataReader dataReader;
 
   DtoQueryRequest(SpiEbeanServer server, DtoQueryEngine engine, SpiDtoQuery<T> query) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index a5130ef22..ef3874008 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -18,11 +18,8 @@ import java.util.function.Predicate;
 public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
 
   private final RelationalQueryEngine queryEngine;
-
   private String[] propertyNames;
-
   private int estimateCapacity;
-
   private int rows;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index e7674a31c..7fc636af0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -541,9 +541,13 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
     updateStatistics();
   }
 
+  long micros() {
+    return (System.nanoTime() - startNano) / 1000L;
+  }
+
   private void updateStatistics() {
     try {
-      executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
+      executionTimeMicros = micros();
       if (autoTuneProfiling) {
         profilingListener.collectQueryInfo(objectGraphNode, loadedBeanCount, executionTimeMicros);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index a1a211c0a..03074b43f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -79,15 +79,10 @@ public class CQueryEngine {
   private <T> int executeUpdate(OrmQueryRequest<T> request, CQueryUpdate query) {
     try {
       int rows = query.execute();
-
       if (request.isLogSql()) {
-        String logSql = query.getGeneratedSql();
-        logSql = Str.add(logSql, "; --bind(", query.getBindLog(), ") rows:", String.valueOf(rows));
-        request.logSql(logSql);
+        request.logSql(Str.add(query.getGeneratedSql(), "; --bind(", query.getBindLog(), ") --micros(", query.micros() + ") --rows(", rows + ")"));
       }
-
       return rows;
-
     } catch (SQLException e) {
       throw translate(request, query.getBindLog(), query.getGeneratedSql(), e);
     }
@@ -97,7 +92,6 @@ public class CQueryEngine {
    * Build and execute the findSingleAttributeList query.
    */
   public <A> List<A> findSingleAttributeList(OrmQueryRequest<?> request) {
-
     CQueryFetchSingleAttribute rcQuery = queryBuilder.buildFetchAttributeQuery(request);
     request.setCancelableQuery(rcQuery);
     return findAttributeList(request, rcQuery);
@@ -108,14 +102,13 @@ public class CQueryEngine {
     try {
       List<A> list = (List<A>) rcQuery.findList();
       if (request.isLogSql()) {
-        logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog());
+        logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros());
       }
       if (request.isLogSummary()) {
         request.getTransaction().logSummary(rcQuery.getSummary());
       }
       if (request.isQueryCachePut()) {
         request.addDependentTables(rcQuery.getDependentTables());
-
         list = Collections.unmodifiableList(list);
         request.putToQueryCache(list);
         if (Boolean.FALSE.equals(request.getQuery().isReadOnly())) {
@@ -123,7 +116,6 @@ public class CQueryEngine {
         }
       }
       return list;
-
     } catch (SQLException e) {
       throw translate(request, rcQuery.getBindLog(), rcQuery.getGeneratedSql(), e);
     }
@@ -139,10 +131,8 @@ public class CQueryEngine {
       String msg = "ERROR executing query, bindLog[" + bindLog + "] error[" + StringHelper.removeNewLines(e.getMessage()) + "]";
       t.logSummary(msg);
     }
-
     // ensure 'rollback' is logged if queryOnly transaction
     t.getConnection();
-
     // build a decent error message for the exception
     String m = "Query threw SQLException:" + e.getMessage() + " Bind values:[" + bindLog + "] Query was:" + sql;
     return dbPlatform.translate(m, e);
@@ -152,46 +142,37 @@ public class CQueryEngine {
    * Build and execute the find Id's query.
    */
   public <A> List<A> findIds(OrmQueryRequest<?> request) {
-
     CQueryFetchSingleAttribute rcQuery = queryBuilder.buildFetchIdsQuery(request);
     request.setCancelableQuery(rcQuery);
     return findAttributeList(request, rcQuery);
   }
 
-  private <T> void logGeneratedSql(OrmQueryRequest<T> request, String sql, String bindLog) {
-    request.logSql(Str.add(sql, "; --bind(", bindLog, ")"));
+  private <T> void logGeneratedSql(OrmQueryRequest<T> request, String sql, String bindLog, long micros) {
+    request.logSql(Str.add(sql, "; --bind(", bindLog, ") --micros(", micros + ")"));
   }
 
   /**
    * Build and execute the row count query.
    */
   public <T> int findCount(OrmQueryRequest<T> request) {
-
     CQueryRowCount rcQuery = queryBuilder.buildRowCountQuery(request);
     request.setCancelableQuery(rcQuery);
     try {
-
       int count = rcQuery.findCount();
-
       if (request.isLogSql()) {
-        logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog());
+        logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros());
       }
-
       if (request.isLogSummary()) {
         request.getTransaction().logSummary(rcQuery.getSummary());
       }
-
       if (request.getQuery().isFutureFetch()) {
         request.getTransaction().end();
       }
-
       if (request.isQueryCachePut()) {
         request.addDependentTables(rcQuery.getDependentTables());
         request.putToQueryCache(count);
       }
-
       return count;
-
     } catch (SQLException e) {
       throw translate(request, rcQuery.getBindLog(), rcQuery.getGeneratedSql(), e);
     }
@@ -254,9 +235,7 @@ public class CQueryEngine {
    * Execute the find versions query returning version beans.
    */
   public <T> List<Version<T>> findVersions(OrmQueryRequest<T> request) {
-
     SpiQuery<T> query = request.getQuery();
-
     String sysPeriodLower = getSysPeriodLower(query);
     if (query.isVersionsBetween() && !historySupport.isStandardsBased()) {
       query.where().lt(sysPeriodLower, query.getVersionEnd());
@@ -272,26 +251,21 @@ public class CQueryEngine {
       if (request.isLogSql()) {
         logSql(cquery);
       }
-
       List<Version<T>> versions = cquery.readVersions();
       // just order in memory rather than use NULLS LAST as that
       // is not universally supported, not expect huge list here
       versions.sort(OrderVersionDesc.INSTANCE);
       deriveVersionDiffs(versions, request);
-
       if (request.isLogSummary()) {
         logFindManySummary(cquery);
       }
-
       if (request.isAuditReads()) {
         cquery.auditFindMany();
       }
-
       return versions;
 
     } catch (SQLException e) {
       throw cquery.createPersistenceException(e);
-
     } finally {
       if (cquery != null) {
         cquery.close();
@@ -300,9 +274,7 @@ public class CQueryEngine {
   }
 
   private <T> void deriveVersionDiffs(List<Version<T>> versions, OrmQueryRequest<T> request) {
-
     BeanDescriptor<T> descriptor = request.getBeanDescriptor();
-
     if (!versions.isEmpty()) {
       Version<T> current = versions.get(0);
       if (versions.size() > 1) {
@@ -367,10 +339,8 @@ public class CQueryEngine {
    * Find a list/map/set of beans.
    */
   <T> BeanCollection<T> findMany(OrmQueryRequest<T> request) {
-
     CQuery<T> cquery = queryBuilder.buildQuery(request);
     request.setCancelableQuery(cquery);
-
     try {
       if (defaultFetchSizeFindList > 0) {
         request.setDefaultFetchBuffer(defaultFetchSizeFindList);
@@ -380,30 +350,24 @@ public class CQueryEngine {
         logger.trace("Future fetch already cancelled");
         return null;
       }
-
       if (request.isLogSql()) {
         logSql(cquery);
       }
-
       BeanCollection<T> beanCollection = cquery.readCollection();
       if (request.isLogSummary()) {
         logFindManySummary(cquery);
       }
-
       if (request.isAuditReads()) {
         cquery.auditFindMany();
       }
-
       request.executeSecondaryQueries(false);
       if (request.isQueryCachePut()) {
         request.addDependentTables(cquery.getDependentTables());
       }
-
       return beanCollection;
 
     } catch (SQLException e) {
       throw cquery.createPersistenceException(e);
-
     } finally {
       if (cquery != null) {
         cquery.close();
@@ -416,38 +380,27 @@ public class CQueryEngine {
    */
   @SuppressWarnings("unchecked")
   public <T> T find(OrmQueryRequest<T> request) {
-
     EntityBean bean = null;
-
     CQuery<T> cquery = queryBuilder.buildQuery(request);
     request.setCancelableQuery(cquery);
-
     try {
       cquery.prepareBindExecuteQuery();
-
       if (request.isLogSql()) {
         logSql(cquery);
       }
-
       if (cquery.readBean()) {
         bean = cquery.next();
       }
-
       if (request.isLogSummary()) {
         logFindBeanSummary(cquery);
       }
-
       if (request.isAuditReads()) {
         cquery.auditFind(bean);
       }
-
       request.executeSecondaryQueries(false);
-
       return (T) bean;
-
     } catch (SQLException e) {
       throw cquery.createPersistenceException(e);
-
     } finally {
       cquery.close();
     }
@@ -457,17 +410,13 @@ public class CQueryEngine {
    * Log the generated SQL to the transaction log.
    */
   private void logSql(CQuery<?> query) {
-
-    String sql = query.getGeneratedSql();
-    sql = Str.add(sql, "; --bind(", query.getBindLog(), ")");
-    query.getTransaction().logSql(sql);
+    query.getTransaction().logSql(Str.add(query.getGeneratedSql(), "; --bind(", query.getBindLog(), ") --micros(", query.micros() + ")"));
   }
 
   /**
    * Log the FindById summary to the transaction log.
    */
   private void logFindBeanSummary(CQuery<?> q) {
-
     SpiQuery<?> query = q.getQueryRequest().getQuery();
     String loadMode = query.getLoadMode();
     String loadDesc = query.getLoadDescription();
@@ -504,7 +453,6 @@ public class CQueryEngine {
     msg.append("exeMicros[").append(q.getQueryExecutionTimeMicros());
     msg.append("] rows[").append(q.getLoadedRowDetail());
     msg.append("] bind[").append(q.getBindLog()).append("]");
-
     q.getTransaction().logSummary(msg.toString());
   }
 
@@ -512,7 +460,6 @@ public class CQueryEngine {
    * Log the FindMany to the transaction log.
    */
   private void logFindManySummary(CQuery<?> q) {
-
     SpiQuery<?> query = q.getQueryRequest().getQuery();
     String loadMode = query.getLoadMode();
     String loadDesc = query.getLoadDescription();
@@ -551,7 +498,6 @@ public class CQueryEngine {
     msg.append("] rows[").append(q.getLoadedRowDetail());
     msg.append("] predicates[").append(q.getLogWhereSql());
     msg.append("] bind[").append(q.getBindLog()).append("]");
-
     q.getTransaction().logSummary(msg.toString());
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index b68813bd4..a89cd28fa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -29,45 +29,19 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Cancelab
   private static final Logger logger = LoggerFactory.getLogger(CQueryFetchSingleAttribute.class);
 
   private final CQueryPlan queryPlan;
-
-  /**
-   * The overall find request wrapper object.
-   */
   private final OrmQueryRequest<?> request;
-
   private final BeanDescriptor<?> desc;
-
   private final SpiQuery<?> query;
-
-  /**
-   * Where clause predicates.
-   */
   private final CQueryPredicates predicates;
-
-  /**
-   * The final sql that is generated.
-   */
   private final String sql;
-
   private RsetDataReader dataReader;
-
-  /**
-   * The statement used to create the resultSet.
-   */
   private PreparedStatement pstmt;
-
   private String bindLog;
-
   private long executionTimeMicros;
-
   private int rowCount;
-
   private final ScalarDataReader<?> reader;
-
   private final boolean containsCounts;
-
   private long profileOffset;
-  
   private final ReentrantLock lock = new ReentrantLock();
 
   /**
@@ -95,19 +69,20 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Cancelab
       .append("] type[").append(desc.getName())
       .append("] predicates[").append(predicates.getLogWhereSql())
       .append("] bind[").append(bindLog).append("]");
-
     return sb.toString();
   }
 
+  long micros() {
+    return executionTimeMicros;
+  }
+
   /**
    * Execute the query returning the row count.
    */
   List<Object> findList() throws SQLException {
-
     long startNano = System.nanoTime();
     try {
       prepareExecute();
-
       List<Object> result = new ArrayList<>();
       while (dataReader.next()) {
         Object value = reader.read(dataReader);
@@ -117,16 +92,13 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Cancelab
         result.add(value);
         rowCount++;
       }
-
       executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
       request.slowQueryCheck(executionTimeMicros, rowCount);
       if (queryPlan.executionTime(executionTimeMicros)) {
         queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
       }
       getTransaction().profileEvent(this);
-
       return result;
-
     } finally {
       close();
     }
@@ -158,14 +130,12 @@ class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Cancelab
       profileOffset = t.profileOffset();
       Connection conn = t.getInternalConnection();
       pstmt = conn.prepareStatement(sql);
-  
       if (query.getBufferFetchSizeHint() > 0) {
         pstmt.setFetchSize(query.getBufferFetchSizeHint());
       }
       if (query.getTimeout() > 0) {
         pstmt.setQueryTimeout(query.getTimeout());
       }
-  
       bindLog = predicates.bind(pstmt, conn);
     } finally {
       lock.unlock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index 248fa9058..0c1df9483 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -22,44 +22,17 @@ import java.util.concurrent.locks.ReentrantLock;
 class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuery {
 
   private final CQueryPlan queryPlan;
-
-  /**
-   * The overall find request wrapper object.
-   */
   private final OrmQueryRequest<?> request;
-
   private final BeanDescriptor<?> desc;
-
   private final SpiQuery<?> query;
-
-  /**
-   * Where clause predicates.
-   */
   private final CQueryPredicates predicates;
-
-  /**
-   * The final sql that is generated.
-   */
   private final String sql;
-
-  /**
-   * The resultSet that is read and converted to objects.
-   */
   private ResultSet rset;
-
-  /**
-   * The statement used to create the resultSet.
-   */
   private PreparedStatement pstmt;
-
   private String bindLog;
-
   private long executionTimeMicros;
-
   private int rowCount;
-
   private long profileOffset;
-  
   private final ReentrantLock lock = new ReentrantLock();
 
   /**
@@ -104,11 +77,14 @@ class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuery {
     return sql;
   }
 
+  long micros() {
+    return executionTimeMicros;
+  }
+
   /**
    * Execute the query returning the row count.
    */
   public int findCount() throws SQLException {
-
     long startNano = System.nanoTime();
     try {
       SpiTransaction t = getTransaction();
@@ -118,24 +94,19 @@ class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuery {
       try {
         query.checkCancelled();
         pstmt = conn.prepareStatement(sql);
-
         if (query.getTimeout() > 0) {
           pstmt.setQueryTimeout(query.getTimeout());
         }
-
         bindLog = predicates.bind(pstmt, conn);
       } finally {
         lock.unlock();
       }
       rset = pstmt.executeQuery();
       query.checkCancelled();
-      
       if (!rset.next()) {
         throw new PersistenceException("Expecting 1 row but got none?");
       }
-
       rowCount = rset.getInt(1);
-
       executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
       request.slowQueryCheck(executionTimeMicros, rowCount);
       if (queryPlan.executionTime(executionTimeMicros)) {
@@ -143,7 +114,6 @@ class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuery {
       }
       t.profileEvent(this);
       return rowCount;
-
     } finally {
       close();
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index eec5d2e6f..302b1bcf0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -19,36 +19,18 @@ import java.util.concurrent.locks.ReentrantLock;
 class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery {
 
   private final CQueryPlan queryPlan;
-
   private final OrmQueryRequest<?> request;
-
   private final BeanDescriptor<?> desc;
-
   private final SpiQuery<?> query;
-
-  /**
-   * Where clause predicates.
-   */
   private final CQueryPredicates predicates;
-
-  /**
-   * The final sql that is generated.
-   */
   private final String sql;
-
-  /**
-   * The statement used to create the resultSet.
-   */
   private PreparedStatement pstmt;
-
   private String bindLog;
-
   private int rowCount;
-
   private long profileOffset;
-
+  private long executionTimeMicros;
   private final ReentrantLock lock = new ReentrantLock();
-  
+
   /**
    * Create the Sql select based on the request.
    */
@@ -80,7 +62,6 @@ class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery {
    * Execute the update or delete statement returning the row count.
    */
   public int execute() throws SQLException {
-
     long startNano = System.nanoTime();
     try {
       SpiTransaction t = getTransaction();
@@ -90,19 +71,16 @@ class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery {
       try {
         query.checkCancelled();
         pstmt = conn.prepareStatement(sql);
-
         if (query.getTimeout() > 0) {
           pstmt.setQueryTimeout(query.getTimeout());
         }
-
         bindLog = predicates.bind(pstmt, conn);
       } finally {
         lock.unlock();
       }
       rowCount = pstmt.executeUpdate();
       query.checkCancelled();
-      
-      long executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
+      executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
       request.slowQueryCheck(executionTimeMicros, rowCount);
       if (queryPlan.executionTime(executionTimeMicros)) {
         queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
@@ -115,6 +93,10 @@ class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery {
     }
   }
 
+  long micros() {
+    return executionTimeMicros;
+  }
+
   private SpiTransaction getTransaction() {
     return request.getTransaction();
   }

From 7ed2de917828ea69a6ab5136cc86a80c383f2e5b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 9 Aug 2021 16:57:43 +1200
Subject: [PATCH 351/447] Update github issue template

---
 .github/ISSUE_TEMPLATE.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8575f4580..357f8aefb 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,3 @@
-
-GITHUB ISSUES ARE STRICTLY CONTROLLED FOR THIS PROJECT.
-
-Refer to http://ebean-orm.github.io/support for the policies controlling the use of github issues.
-Please post issues to the Ebean group https://groups.google.com/forum/#!forum/ebean first.
-
 ## Expected behavior
 
 ## Actual behavior

From 181dc73d39f5285fb7d02ffbc923d01ff794c4d9 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Mon, 9 Aug 2021 09:19:53 +0200
Subject: [PATCH 352/447] Use MD5 for QueryBindHash

---
 .../java/io/ebeaninternal/api/BindHash.java   |  37 +++++
 .../java/io/ebeaninternal/api/BindParams.java |  11 +-
 .../java/io/ebeaninternal/api/HashQuery.java  |   8 +-
 .../io/ebeaninternal/api/SpiExpression.java   |   2 +-
 .../java/io/ebeaninternal/api/SpiQuery.java   |   2 +-
 .../expression/AbstractTextExpression.java    |   7 +-
 .../expression/AllEqualsExpression.java       |   8 +-
 .../expression/ArrayContainsExpression.java   |  10 +-
 .../expression/ArrayIsEmptyExpression.java    |   5 +-
 .../server/expression/BetweenExpression.java  |   7 +-
 .../expression/BetweenPropertyExpression.java |   5 +-
 .../server/expression/BitwiseExpression.java  |   5 +-
 .../CaseInsensitiveEqualExpression.java       |   5 +-
 .../expression/DefaultExampleExpression.java  |   8 +-
 .../expression/DefaultExpressionList.java     |   8 +-
 .../expression/ExistsQueryExpression.java     |   5 +-
 .../server/expression/IdExpression.java       |   5 +-
 .../server/expression/IdInExpression.java     |   8 +-
 .../server/expression/InExpression.java       |   8 +-
 .../server/expression/InPairsExpression.java  |   8 +-
 .../server/expression/InQueryExpression.java  |   5 +-
 .../server/expression/InRangeExpression.java  |   7 +-
 .../server/expression/IsEmptyExpression.java  |   5 +-
 .../server/expression/JsonPathExpression.java |   7 +-
 .../server/expression/JunctionExpression.java |   6 +-
 .../server/expression/LikeExpression.java     |   5 +-
 .../server/expression/LogicExpression.java    |   7 +-
 .../expression/NativeILikeExpression.java     |   5 +-
 .../NestedPathWrapperExpression.java          |   5 +-
 .../server/expression/NoopExpression.java     |   4 +-
 .../server/expression/NotExpression.java      |   5 +-
 .../server/expression/NullExpression.java     |   5 +-
 .../server/expression/RawExpression.java      |   8 +-
 .../server/expression/SimpleExpression.java   |   5 +-
 .../server/querydefn/DefaultOrmQuery.java     |  26 ++--
 .../server/querydefn/HashCodeBindHash.java    |  56 +++++++
 .../server/querydefn/MdBindHash.java          | 138 ++++++++++++++++++
 .../server/expression/RawExpressionTest.java  |  12 +-
 .../server/querydefn/DefaultOrmQueryTest.java |  14 +-
 .../java/org/tests/cache/TestQueryCache.java  |  86 +++++++----
 40 files changed, 436 insertions(+), 137 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
new file mode 100644
index 000000000..d70c5f09d
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
@@ -0,0 +1,37 @@
+package io.ebeaninternal.api;
+
+/**
+ * BindHash implementation.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public interface BindHash {
+
+  /**
+   * Update with boolean value.
+   */
+  BindHash update(boolean boolValue);
+
+  /**
+   * Update with int value.
+   */
+  BindHash update(int intValue);
+
+  /**
+   * Update with long value.
+   */
+  BindHash update(long longValue);
+
+  /**
+   * Update with object value.
+   */
+  BindHash update(Object value);
+
+  /**
+   * finishes the hash. May be used to compute internal state. After finish, no
+   * update method must be called
+   */
+  void finish();
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index afb1e44b8..2817c4ba1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -54,12 +54,11 @@ public class BindParams implements Serializable {
     positionedParameters.clear();
   }
 
-  public int queryBindHash() {
-    int hc = namedParameters.hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(positionedParameters.size());
     for (Param positionedParameter : positionedParameters) {
-      hc = hc * 92821 + positionedParameter.hashCode();
+       positionedParameter.queryBindHash(hash);
     }
-    return hc;
   }
 
   /**
@@ -422,6 +421,10 @@ public class BindParams implements Serializable {
       return hc;
     }
 
+    void queryBindHash(BindHash hash) {
+      hash.update(isInParam).update(isOutParam).update(type).update(inValue);
+    }
+
     @Override
     public boolean equals(Object o) {
       return o != null && (o == this || (o instanceof Param) && hashCode() == o.hashCode());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
index c14cb88d7..87241aedc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
@@ -7,12 +7,12 @@ public class HashQuery {
 
   private final CQueryPlanKey planHash;
 
-  private final int bindHash;
+  private final BindHash bindHash;
 
   /**
    * Create the HashQuery.
    */
-  public HashQuery(CQueryPlanKey planHash, int bindHash) {
+  public HashQuery(CQueryPlanKey planHash, BindHash bindHash) {
     this.planHash = planHash;
     this.bindHash = bindHash;
   }
@@ -25,7 +25,7 @@ public class HashQuery {
   @Override
   public int hashCode() {
     int hc = 92821 * planHash.hashCode();
-    hc = 92821 * hc + bindHash;
+    hc = 92821 * hc + bindHash.hashCode();
     return hc;
   }
 
@@ -39,6 +39,6 @@ public class HashQuery {
     }
 
     HashQuery e = (HashQuery) obj;
-    return e.bindHash == bindHash && e.planHash.equals(planHash);
+    return e.bindHash.equals(bindHash) && e.planHash.equals(planHash);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
index 007e9f29f..32c3a3518 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -56,7 +56,7 @@ public interface SpiExpression extends Expression {
   /**
    * Return the hash value for the values that will be bound.
    */
-  int queryBindHash();
+  void queryBindHash(BindHash hash);
 
   /**
    * Return true if the expression is the same with respect to bind values.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 12942e7d6..d8bae7503 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -635,7 +635,7 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    * query).
    * </p>
    */
-  int queryBindHash();
+  void queryBindHash(BindHash hash);
 
   /**
    * Identifies queries that are exactly the same including bind variables.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
index d30649149..d377e48dd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -37,9 +38,9 @@ public abstract class AbstractTextExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return 0;
-  }
+  public void queryBindHash(BindHash hash) {
+    // do nothing, only execute against document store
+  };
 
   @Override
   public boolean isSameByBind(SpiExpression other) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
index 5a931ec5a..df9e6095b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -122,14 +123,13 @@ class AllEqualsExpression extends NonPrepareExpression {
   }
 
   @Override
-  public int queryBindHash() {
+  public void queryBindHash(BindHash hash) {
 
-    int hc = 92821;
+    hash.update(propMap.size());
     for (Object value : propMap.values()) {
-      hc = hc * 92821 + (value == null ? 0 : value.hashCode());
+      hash.update(value);
     }
 
-    return hc;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
index 8c12bec60..ac6d27d0e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -49,12 +50,11 @@ public class ArrayContainsExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = values[0].hashCode();
-    for (int i = 1; i < values.length; i++) {
-      hc = hc * 92821 + values[i].hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(values.length);
+    for (int i = 0; i < values.length; i++) {
+      hash.update(values[i]);
     }
-    return hc;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
index 815223dfe..0249acabb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -33,8 +34,8 @@ public class ArrayIsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return empty ? 0 : 92821;
+  public void queryBindHash(BindHash hash) {
+    hash.update(empty);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
index bfdfa1d52..37a3aab8f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -49,10 +50,8 @@ class BetweenExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = low().hashCode();
-    hc = hc * 92821 + high().hashCode();
-    return hc;
+  public void queryBindHash(BindHash hash) {
+    hash.update(low()).update(high());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
index a50ec888f..440dd5f1f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.util.SplitName;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -95,8 +96,8 @@ class BetweenPropertyExpression extends NonPrepareExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return val().hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(val());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
index 073ee51df..db1fa686d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -39,8 +40,8 @@ class BitwiseExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return Long.hashCode(flags);
+  public void queryBindHash(BindHash hash) {
+    hash.update(flags).update(match);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index 52e39fbfa..485d1b04f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -69,8 +70,8 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return val().hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(val());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index aade99f5a..9149923e0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -5,6 +5,7 @@ import io.ebean.LikeType;
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.util.SplitName;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -241,12 +242,11 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
    * Return a hash for the actual bind values used.
    */
   @Override
-  public int queryBindHash() {
-    int hc = DefaultExampleExpression.class.getName().hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(list.size());
     for (SpiExpression aList : list) {
-      hc = hc * 92821 + aList.queryBindHash();
+      aList.queryBindHash(hash);
     }
-    return hc;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index ab80ae9e5..b5f9c6ec1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -26,6 +26,7 @@ import io.ebean.search.MultiMatch;
 import io.ebean.search.TextCommonTerms;
 import io.ebean.search.TextQueryString;
 import io.ebean.search.TextSimple;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -678,12 +679,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    * Calculate a hash based on the expressions.
    */
   @Override
-  public int queryBindHash() {
-    int hash = DefaultExpressionList.class.getName().hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(list.size());
     for (SpiExpression aList : list) {
-      hash = hash * 92821 + aList.queryBindHash();
+      aList.queryBindHash(hash);
     }
-    return hash;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 32ae2bccc..b3fcf8ce0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -91,8 +92,8 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
   }
 
   @Override
-  public int queryBindHash() {
-    return subQuery.queryBindHash();
+  public void queryBindHash(BindHash hash) {
+    subQuery.queryBindHash(hash);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
index b5280b868..904fbe9be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -77,8 +78,8 @@ class IdExpression extends NonPrepareExpression implements SpiExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return value.hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(value);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
index 4c08b24d2..390d0bebb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -133,8 +134,11 @@ public class IdInExpression extends NonPrepareExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return idCollection.hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(idCollection.size());
+    for (Object elem : idCollection) {
+      hash.update(elem);
+    }
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index 7009a8b44..a5719f71a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -176,12 +177,11 @@ class InExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = 92821;
+  public void queryBindHash(BindHash hash) {
+    hash.update(bindValues.size());
     for (Object bindValue : bindValues) {
-      hc = 92821 * hc + bindValue.hashCode();
+      hash.update(bindValue);
     }
-    return hc;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index 96cc7c182..a7079ae55 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.expression;
 import io.ebean.Pairs;
 import io.ebean.Pairs.Entry;
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -124,12 +125,11 @@ class InPairsExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = 92821;
+  public void queryBindHash(BindHash hash) {
+    hash.update(entries.size());
     for (Pairs.Entry entry : entries) {
-      hc = 92821 * hc + entry.hashCode();
+      hash.update(entry.getA()).update(entry.getB());
     }
-    return hc;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 83507af4b..619f7b715 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -72,8 +73,8 @@ class InQueryExpression extends AbstractExpression implements UnsupportedDocStor
   }
 
   @Override
-  public int queryBindHash() {
-    return subQuery.queryBindHash();
+  public void queryBindHash(BindHash hash) {
+    subQuery.queryBindHash(hash);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
index e1d170b43..abe0b7338 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -47,10 +48,8 @@ class InRangeExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = low().hashCode();
-    hc = hc * 92821 + high().hashCode();
-    return hc;
+  public void queryBindHash(BindHash hash) {
+    hash.update(low()).update(high());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
index d3a3a1da6..bb65962b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -103,8 +104,8 @@ class IsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return 1;
+  public void queryBindHash(BindHash hash) {
+    // no bind values
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
index f60b125cb..18e0aa924 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -83,10 +84,8 @@ class JsonPathExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = (value == null) ? 0 : value.hashCode();
-    hc = (upperValue == null) ? hc : hc * 92821 + upperValue.hashCode();
-    return hc;
+  public void queryBindHash(BindHash hash) {
+    hash.update(value).update(upperValue);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 0aae30886..51eba8f39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -25,6 +25,7 @@ import io.ebean.search.MultiMatch;
 import io.ebean.search.TextCommonTerms;
 import io.ebean.search.TextQueryString;
 import io.ebean.search.TextSimple;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -225,13 +226,12 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   }
 
   @Override
-  public int queryBindHash() {
+  public void queryBindHash(BindHash hash) {
     int hc = JunctionExpression.class.getName().hashCode();
     List<SpiExpression> list = exprList.internalList();
     for (SpiExpression aList : list) {
-      hc = hc * 92821 + aList.queryBindHash();
+      aList.queryBindHash(hash);
     }
-    return hc;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
index 6886203c4..587e6064c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.LikeType;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -70,8 +71,8 @@ class LikeExpression extends AbstractValueExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return strValue().hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(strValue());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index 482aac6e8..cbd487b3e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.expression;
 import io.ebean.Expression;
 import io.ebean.Junction;
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -168,10 +169,8 @@ abstract class LogicExpression implements SpiExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = expOne.queryBindHash();
-    hc = hc * 92821 + expTwo.queryBindHash();
-    return hc;
+  public void queryBindHash(BindHash hash) {
+    hash.update(expOne).update(expTwo);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
index c3376f656..8c51d2f5d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.LikeType;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -54,8 +55,8 @@ class NativeILikeExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return val.hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(val);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
index 77f46828b..f3ed1badd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -79,8 +80,8 @@ class NestedPathWrapperExpression implements SpiExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return delegate.queryBindHash();
+  public void queryBindHash(BindHash hash) {
+    delegate.queryBindHash(hash);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
index 28c9e3c78..92180cea1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -74,9 +75,8 @@ class NoopExpression implements SpiExpression {
   }
 
   @Override
-  public int queryBindHash() {
+  public void queryBindHash(BindHash hash) {
     // no bind values
-    return 0;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
index 60ade47b0..e9df6d856 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.Expression;
 import io.ebean.event.BeanQueryRequest;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -99,8 +100,8 @@ final class NotExpression implements SpiExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return exp.queryBindHash();
+  public void queryBindHash(BindHash hash) {
+    exp.queryBindHash(hash);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index 90894dbde..daded43cb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.util.SplitName;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -94,7 +95,7 @@ class NullExpression extends AbstractExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return (notNull ? 1 : 0);
+  public void queryBindHash(BindHash hash) {
+    hash.update(notNull);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
index 295ddc75b..721d69b25 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -73,12 +74,11 @@ class RawExpression extends NonPrepareExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    int hc = sql.hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(values.length);
     for (Object value : values) {
-      hc = hc * 92821 + value.hashCode();
+      hash.update(value);
     }
-    return hc;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
index 0f8de90ec..e50d9856c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
@@ -5,6 +5,7 @@ import io.ebean.plugin.ExpressionPath;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
@@ -121,8 +122,8 @@ public class SimpleExpression extends AbstractValueExpression {
   }
 
   @Override
-  public int queryBindHash() {
-    return value().hashCode();
+  public void queryBindHash(BindHash hash) {
+    hash.update(value());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 96a923637..6f3334ede 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -32,6 +32,8 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.plugin.BeanType;
+import io.ebean.plugin.LoadErrorHandler;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.CacheIdLookup;
@@ -283,6 +285,8 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   private boolean orderById;
 
+  private final String bindHashAlgorithm;
+
   private ProfileLocation profileLocation;
 
   public DefaultOrmQuery(BeanDescriptor<T> desc, SpiEbeanServer server, ExpressionFactory expressionFactory) {
@@ -291,6 +295,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     this.beanType = desc.getBeanType();
     this.server = server;
     this.orderById = server.getServerConfig().isDefaultOrderById();
+    this.bindHashAlgorithm = "MD5"; // TODO: server.getServerConfig().isUseMd5BindHash();
     this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading();
     this.expressionFactory = expressionFactory;
     this.detail = new OrmQueryDetail();
@@ -1276,15 +1281,12 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * </p>
    */
   @Override
-  public int queryBindHash() {
-    int hc = (id == null ? 0 : id.hashCode());
-    hc = hc * 92821 + (whereExpressions == null ? 0 : whereExpressions.queryBindHash());
-    hc = hc * 92821 + (havingExpressions == null ? 0 : havingExpressions.queryBindHash());
-    hc = hc * 92821 + (bindParams == null ? 0 : bindParams.queryBindHash());
-    hc = hc * 92821 + (asOf == null ? 0 : asOf.hashCode());
-    hc = hc * 92821 + (versionsStart == null ? 0 : versionsStart.hashCode());
-    hc = hc * 92821 + (versionsEnd == null ? 0 : versionsEnd.hashCode());
-    return hc;
+  public void queryBindHash(BindHash hash) {
+    hash.update(id);
+    if (whereExpressions != null) whereExpressions.queryBindHash(hash);
+    if (havingExpressions != null) havingExpressions.queryBindHash(hash);
+    if (bindParams != null) bindParams.queryBindHash(hash);
+    hash.update(asOf).update(versionsStart).update(versionsEnd);
   }
 
   /**
@@ -1298,8 +1300,10 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   public HashQuery queryHash() {
     // calculateQueryPlanHash is called just after potential AutoTune tuning
     // so queryPlanHash is calculated well before this method is called
-    int hc = queryBindHash();
-    return new HashQuery(queryPlanKey, hc);
+    BindHash hash = bindHashAlgorithm == null ? new HashCodeBindHash() : new MdBindHash(bindHashAlgorithm);
+    queryBindHash(hash);
+    hash.finish();
+    return new HashQuery(queryPlanKey, hash);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
new file mode 100644
index 000000000..cc6cd5f13
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
@@ -0,0 +1,56 @@
+package io.ebeaninternal.server.querydefn;
+
+import java.util.Objects;
+
+import io.ebeaninternal.api.BindHash;
+
+/**
+ * HashCode builder that uses Object.hashCode for computing bind-hashes.
+ * This is a fast and lightweight implementation, but may produce collisions.
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public class HashCodeBindHash implements BindHash {
+
+  int hashCode;
+
+  @Override
+  public BindHash update(int intValue) {
+    hashCode = hashCode * 92821 + intValue;
+    return this;
+  }
+
+  @Override
+  public BindHash update(long longValue) {
+    hashCode = hashCode * 92821 + Long.hashCode(longValue);
+    return this;
+  }
+
+  @Override
+  public BindHash update(boolean boolValue) {
+    hashCode = hashCode * 92821 + Boolean.hashCode(boolValue);
+    return this;
+  }
+
+  @Override
+  public BindHash update(Object value) {
+    hashCode = hashCode * 92821 + Objects.hashCode(value);
+    return this;
+  }
+
+  @Override
+  public void finish() {
+    // nothing to do
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof HashCodeBindHash && ((HashCodeBindHash) obj).hashCode == hashCode;
+  }
+
+  @Override
+  public int hashCode() {
+    return hashCode;
+  }
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java
new file mode 100644
index 000000000..4791a9c07
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed Materials - Property of FOCONIS AG
+ * (C) Copyright FOCONIS AG.
+ */
+
+package io.ebeaninternal.server.querydefn;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.UUID;
+
+import io.ebeaninternal.api.BindHash;
+
+/**
+ * Bind hash that uses a MessageDigest to compute a collision resistent hash.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class MdBindHash implements BindHash {
+  private MessageDigest md;
+  private byte[] buffer;
+  private int hashCode;
+
+  public MdBindHash(String algorithm) {
+    try {
+      md = MessageDigest.getInstance(algorithm);
+    } catch (NoSuchAlgorithmException nsae) {
+      throw new InternalError(algorithm + " not supported", nsae);
+    }
+  }
+
+  @Override
+  public BindHash update(int v) {
+    md.update((byte) (v >>> 24));
+    md.update((byte) (v >>> 16));
+    md.update((byte) (v >>> 8));
+    md.update((byte) (v >>> 0));
+    return this;
+  }
+
+  @Override
+  public BindHash update(long v) {
+    md.update((byte) (v >>> 56));
+    md.update((byte) (v >>> 48));
+    md.update((byte) (v >>> 40));
+    md.update((byte) (v >>> 32));
+    md.update((byte) (v >>> 24));
+    md.update((byte) (v >>> 16));
+    md.update((byte) (v >>> 8));
+    md.update((byte) (v >>> 0));
+    return this;
+  }
+
+  @Override
+  public BindHash update(boolean boolValue) {
+    md.update(boolValue ? (byte) 1 : (byte) 0);
+    return this;
+  }
+
+  @Override
+  public BindHash update(Object value) {
+    if (value == null) {
+      md.update((byte) 0);
+
+      // do some special handling for known object types
+    } else if (value instanceof String) {
+      md.update(((String) value).getBytes());
+
+    } else if (value instanceof Long) {
+      update(((Long) value).longValue());
+
+    } else if (value instanceof Double) {
+      double d = ((Double) value).doubleValue();
+      update(Double.doubleToLongBits(d));
+
+    } else if (value instanceof UUID) {
+      UUID uuid = (UUID) value;
+      update(uuid.getLeastSignificantBits());
+      update(uuid.getMostSignificantBits());
+
+    } else if (value instanceof Date) {
+      update(((Date) value).getTime());
+
+    } else if (value instanceof Instant) {
+      update(((Instant) value).getEpochSecond());
+      update(((Instant) value).getNano());
+
+    } else if (value instanceof LocalDate) {
+      update(((LocalDate) value).toEpochDay());
+
+    } else if (value instanceof LocalTime) {
+      update(((LocalTime) value).toSecondOfDay());
+      update(((LocalTime) value).toNanoOfDay());
+
+    } else if (value instanceof LocalDateTime) {
+      update(((LocalDateTime) value).toLocalDate().toEpochDay());
+      update(((LocalDateTime) value).toLocalTime().toSecondOfDay());
+      update(((LocalDateTime) value).toLocalTime().toNanoOfDay());
+
+    } else {
+      // Fall back to hashCode for all other types
+      updateOther(value);
+    }
+    return this;
+  }
+
+  /**
+   * Update all other object. May be overridden to handle joda dates.
+   */
+  protected void updateOther(Object value) {
+    // Fall back to hashCode for all other types
+    update(value.hashCode());
+  }
+
+  @Override
+  public void finish() {
+    buffer = md.digest();
+    hashCode = Arrays.hashCode(buffer);
+    md = null; // clear memory
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof MdBindHash && Arrays.equals(buffer, ((MdBindHash) obj).buffer);
+  }
+
+  @Override
+  public int hashCode() {
+    return hashCode;
+  }
+}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
index 1953f2959..6c608472f 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
@@ -3,6 +3,8 @@ package io.ebeaninternal.server.expression;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.server.querydefn.HashCodeBindHash;
 
 public class RawExpressionTest extends BaseExpressionTest {
 
@@ -61,11 +63,17 @@ public class RawExpressionTest extends BaseExpressionTest {
   }
 
   public void assert_queryBindHash_isDifferent(RawExpression exp0, RawExpression exp1) {
-    assertThat(exp0.queryBindHash()).isNotEqualTo(exp1.queryBindHash());
+    assertThat(getHash(exp0)).isNotEqualTo(getHash(exp1));
   }
 
   public void assert_queryBindHash_isSame(RawExpression exp0, RawExpression exp1) {
-    assertThat(exp0.queryBindHash()).isEqualTo(exp1.queryBindHash());
+    assertThat(getHash(exp0)).isEqualTo(getHash(exp1));
   }
 
+  private int getHash(RawExpression query) {
+    BindHash hash = new HashCodeBindHash();
+    query.queryBindHash(hash);
+    hash.finish();
+    return hash.hashCode();
+  }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
index d9e621221..cb1738ba8 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
@@ -4,6 +4,7 @@ package io.ebeaninternal.server.querydefn;
 import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.Ebean;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import org.junit.Test;
@@ -62,7 +63,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isNotEqualTo(q2.createQueryPlanKey());
-    assertThat(q1.queryBindHash()).isNotEqualTo(q2.queryBindHash());
+    assertThat(getHash(q1)).isNotEqualTo(getHash(q2));
   }
 
   @Test
@@ -73,7 +74,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey());
-    assertThat(q1.queryBindHash()).isNotEqualTo(q2.queryBindHash());
+    assertThat(getHash(q1)).isNotEqualTo(getHash(q2));
   }
 
   @Test
@@ -84,7 +85,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey());
-    assertThat(q1.queryBindHash()).isEqualTo(q2.queryBindHash());
+    assertThat(getHash(q1)).isEqualTo(getHash(q2));
   }
 
   @Test
@@ -110,4 +111,11 @@ public class DefaultOrmQueryTest extends BaseTestCase {
     OrmQueryRequest<T> r2 = createQueryRequest(SpiQuery.Type.LIST, q2, null);
     q2.prepare(r2);
   }
+
+  private int getHash(DefaultOrmQuery<Order> query) {
+    BindHash hash = new HashCodeBindHash();
+    query.queryBindHash(hash);
+    hash.finish();
+    return hash.hashCode();
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java
index f9e732220..4c4d56109 100644
--- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java
+++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java
@@ -3,7 +3,7 @@ package org.tests.cache;
 import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.DB;
-import io.ebean.Ebean;
+import io.ebean.ExpressionList;
 import io.ebean.bean.BeanCollection;
 import io.ebean.cache.ServerCache;
 import org.ebeantest.LoggedSqlCollector;
@@ -14,6 +14,7 @@ import org.tests.model.basic.ResetBasicData;
 import org.tests.model.cache.EColAB;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,8 +27,7 @@ public class TestQueryCache extends BaseTestCase {
     new EColAB("02", "10").save();
 
     List<EColAB> list1 =
-      Ebean.getServer(null)
-        .find(EColAB.class)
+      DB.find(EColAB.class)
         .setUseQueryCache(true)
         .where()
         .eq("columnA", "01")
@@ -35,8 +35,7 @@ public class TestQueryCache extends BaseTestCase {
         .findList();
 
     List<EColAB> list2 =
-      Ebean.getServer(null)
-        .find(EColAB.class)
+      DB.find(EColAB.class)
         .setUseQueryCache(true)
         .where()
         .eq("columnA", "02")
@@ -57,7 +56,7 @@ public class TestQueryCache extends BaseTestCase {
     new EColAB("03", "SingleAttribute").save();
     new EColAB("03", "SingleAttribute").save();
 
-    List<String> colA_first = Ebean.getServer(null)
+    List<String> colA_first = DB
       .find(EColAB.class)
       .setUseQueryCache(true)
       .setDistinct(true)
@@ -66,7 +65,7 @@ public class TestQueryCache extends BaseTestCase {
       .eq("columnB", "SingleAttribute")
       .findSingleAttributeList();
 
-    List<String> colA_Second = Ebean.getServer(null)
+    List<String> colA_Second = DB
       .find(EColAB.class)
       .setUseQueryCache(true)
       .setDistinct(true)
@@ -77,7 +76,7 @@ public class TestQueryCache extends BaseTestCase {
 
     assertThat(colA_Second).isSameAs(colA_first);
 
-    List<String> colA_NotDistinct = Ebean.getServer(null)
+    List<String> colA_NotDistinct = DB
       .find(EColAB.class)
       .setUseQueryCache(true)
       .select("columnA")
@@ -89,7 +88,7 @@ public class TestQueryCache extends BaseTestCase {
 
     // ensure that findCount & findSingleAttribute use different
     // slots in cache. If not a "Cannot cast List to int" should happen.
-    int count = Ebean.getServer(null)
+    int count = DB
         .find(EColAB.class)
         .setUseQueryCache(true)
         .select("columnA")
@@ -107,13 +106,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "count")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "count")
@@ -126,7 +125,7 @@ public class TestQueryCache extends BaseTestCase {
 
     // and now, ensure that we hit the database
     LoggedSqlCollector.start();
-    int count2 = Ebean.find(EColAB.class)
+    int count2 = DB.find(EColAB.class)
         .setUseQueryCache(CacheMode.OFF)
         .where()
         .eq("columnB", "count")
@@ -142,13 +141,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "abc")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "def")
@@ -167,13 +166,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "uvw")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.PUT)
       .where()
       .eq("columnB", "uvw")
@@ -193,13 +192,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.PUT)
       .where()
       .eq("columnB", "xyz")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "xyz")
@@ -214,26 +213,26 @@ public class TestQueryCache extends BaseTestCase {
 
   @Test
   @SuppressWarnings("unchecked")
-  public void test() {
+  public void testReadOnlyFind() {
 
     ResetBasicData.reset();
 
-    ServerCache customerCache = Ebean.getServerCacheManager().getQueryCache(Customer.class);
+    ServerCache customerCache = DB.getServerCacheManager().getQueryCache(Customer.class);
     customerCache.clear();
 
-    List<Customer> list = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
+    List<Customer> list = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
       .ilike("name", "Rob").findList();
 
     BeanCollection<Customer> bc = (BeanCollection<Customer>) list;
     Assert.assertTrue(bc.isReadOnly());
     Assert.assertFalse(bc.isEmpty());
     Assert.assertTrue(!list.isEmpty());
-    Assert.assertTrue(Ebean.getBeanState(list.get(0)).isReadOnly());
+    Assert.assertTrue(DB.getBeanState(list.get(0)).isReadOnly());
 
-    List<Customer> list2 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
+    List<Customer> list2 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
       .ilike("name", "Rob").findList();
 
-    List<Customer> list2B = Ebean.find(Customer.class).setUseQueryCache(true)
+    List<Customer> list2B = DB.find(Customer.class).setUseQueryCache(true)
       // .setReadOnly(true)
       .where().ilike("name", "Rob").findList();
 
@@ -245,7 +244,7 @@ public class TestQueryCache extends BaseTestCase {
 
 
 
-    List<Customer> list3 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where()
+    List<Customer> list3 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where()
         .ilike("name", "Rob").findList();
 
     Assert.assertNotSame(list, list3);
@@ -269,13 +268,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<Integer> colA_first = Ebean.find(EColAB.class)
+    List<Integer> colA_first = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "someId")
       .findIds();
 
-    List<Integer> colA_second = Ebean.find(EColAB.class)
+    List<Integer> colA_second = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "someId")
@@ -289,7 +288,7 @@ public class TestQueryCache extends BaseTestCase {
 
     // and now, ensure that we hit the database
     LoggedSqlCollector.start();
-    colA_second = Ebean.find(EColAB.class)
+    colA_second = DB.find(EColAB.class)
         .setUseQueryCache(CacheMode.PUT)
         .where()
         .eq("columnB", "someId")
@@ -299,4 +298,35 @@ public class TestQueryCache extends BaseTestCase {
     assertThat(sql).hasSize(1);
   }
 
+  @Test
+  public void findCountDifferentQueriesBit() {
+    DB.getDefault().getPluginApi().getServerCacheManager().clearAll();
+    differentFindCount(q->q.bitwiseAny("id",1), q->q.bitwiseAny("id",0));
+    differentFindCount(q->q.bitwiseAll("id",1), q->q.bitwiseAll("id",0));
+    // differentFindCount(q->q.bitwiseNot("id",1), q->q.bitwiseNot("id",0)); NOT 1 == AND 1 = 0
+    differentFindCount(q->q.bitwiseAnd("id",1, 0), q->q.bitwiseAnd("id",1, 1));
+
+    differentFindCount(q->q.bitwiseAnd("id",2, 0), q->q.bitwiseAnd("id",4, 0));
+    differentFindCount(q->q.bitwiseAnd("id",2, 1), q->q.bitwiseAnd("id",4, 1));
+    // Will produce hash collision
+    differentFindCount(q->q.bitwiseAnd("id",10, 0), q->q.bitwiseAnd("id",0, 928210));
+
+  }
+
+  void differentFindCount(Consumer<ExpressionList<EColAB>> q0, Consumer<ExpressionList<EColAB>> q1) {
+    LoggedSqlCollector.start();
+
+    ExpressionList<EColAB> el0 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where();
+    q0.accept(el0);
+    el0.findCount();
+
+    ExpressionList<EColAB> el1 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where();
+    q1.accept(el1);
+    el1.findCount();
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(2); // different queries
+  }
+
 }

From e18c190905fa8a2a2051e6bba3447ad1a942408d Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Mon, 9 Aug 2021 09:46:49 +0200
Subject: [PATCH 353/447] Fix the test to run with java 8

---
 .../server/profile/BasicProfileLocationTest.java            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
index 84a53442a..9d99b17ce 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
@@ -14,7 +14,11 @@ public class BasicProfileLocationTest {
 
     assertThat(loc.obtain()).isTrue();
     assertThat(loc.fullLocation()).endsWith(":12)");
-    assertThat(loc.location()).isEqualTo("java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0");
+    if (System.getProperty("java.version").startsWith("1.8")) {
+      assertThat(loc.location()).isEqualTo("sun.reflect.NativeMethodAccessorImpl.invoke0");
+    } else {
+      assertThat(loc.location()).isEqualTo("java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0");
+    }
     assertThat(loc.label()).isEqualTo("NativeMethodAccessorImpl.invoke0");
   }
 

From c8ae3c5ef65da0ad043f9a0c302720abd298fda9 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 10 Aug 2021 09:30:25 +0200
Subject: [PATCH 354/447] FIX: Changelog-oldValue did not work for Json mutable
 properties

---
 .../io/ebean/bean/EntityBeanIntercept.java    | 13 ++++++---
 .../org/tests/changelog/TestChangeLog.java    | 27 +++++++++++++++++++
 .../tests/model/basic/EBasicChangeLog.java    | 19 ++++++++++++-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 78d8e5f8c..527860200 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -395,6 +395,15 @@ public final class EntityBeanIntercept implements Serializable {
     this.owner._ebean_setEmbeddedLoaded();
     this.lazyLoadProperty = -1;
     this.origValues = null;
+    // after save, transfer the mutable next values back to mutable info
+    if (mutableNext != null) {
+      for (int i = 0; i < mutableNext.length; i++) {
+        MutableValueNext next = mutableNext[i];
+        if (next != null) {
+          mutableInfo(i, next.info());
+        }
+      }
+    }
     this.mutableNext = null;
     for (int i = 0; i < flags.length; i++) {
       flags[i] &= ~(FLAG_CHANGED_PROP | FLAG_ORIG_VALUE_SET);
@@ -1223,9 +1232,7 @@ public final class EntityBeanIntercept implements Serializable {
     if (mutableNext == null) {
       return null;
     }
-    final MutableValueNext next = mutableNext[propertyIndex];
-    mutableInfo(propertyIndex, next.info());
-    return next.content();
+    return mutableNext[propertyIndex].content();
   }
 
 }
diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
index 2adbbfc4b..a10a41276 100644
--- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -16,10 +16,13 @@ import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.event.changelog.ChangeType;
 import io.ebean.event.changelog.TxnState;
+import io.ebeantest.LoggedSql;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.tests.model.basic.EBasicChangeLog;
+import org.tests.model.json.PlainBean;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -130,7 +133,31 @@ public class TestChangeLog extends BaseTestCase {
     assertThat(change.getEvent()).isEqualTo(ChangeType.DELETE);
     assertThat(change.getData()).isNull();
   }
+  
+  @Test
+  public void testWithJsonMutationDetection() {
 
+    EBasicChangeLog bean = new EBasicChangeLog();
+    bean.setName(null);
+    bean.setShortDescription("hello");
+    PlainBean jsonBean = new PlainBean();
+    bean.setPlainBean(jsonBean);
+    jsonBean.setName("A");    
+    server.save(bean);
+    
+    BeanChange change = firstChange();
+    assertThat(change.getEvent()).isEqualTo(ChangeType.INSERT);
+    
+    jsonBean.setName("B");
+    LoggedSql.start();
+    server.save(bean);
+    assertThat(LoggedSql.stop()).isNotEmpty();
+    
+    change = firstChange();
+    assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE);
+    assertThat(change.getData()).contains("\"plainBean\":{\"name\":\"B\"");
+    assertThat(change.getOldData()).contains("\"plainBean\":{\"name\":\"A\"");
+  }
   private Database createServer() {
 
     DatabaseConfig config = new DatabaseConfig();
diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java
index 88e3e4f10..0ac02e749 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java
@@ -2,6 +2,7 @@ package org.tests.model.basic;
 
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.ChangeLog;
+import io.ebean.annotation.DbJson;
 import io.ebean.annotation.ReadAudit;
 import io.ebean.annotation.WhenCreated;
 import io.ebean.annotation.WhenModified;
@@ -12,11 +13,16 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
+import org.tests.model.json.PlainBean;
+
+import static io.ebean.annotation.MutationDetection.SOURCE;
+
 import java.sql.Timestamp;
 
 @Cache(enableQueryCache = true)
 @ReadAudit
-@ChangeLog(updatesThatInclude = {"name", "shortDescription"})
+@ChangeLog(updatesThatInclude = {"name", "shortDescription", "plainBean"})
 @Entity
 public class EBasicChangeLog {
 
@@ -46,6 +52,9 @@ public class EBasicChangeLog {
 
   @Version
   Long version;
+  
+  @DbJson(length = 500, mutationDetection = SOURCE) // such that we can rebuild old values
+  PlainBean plainBean;
 
   public Long getId() {
     return id;
@@ -118,4 +127,12 @@ public class EBasicChangeLog {
   public void setVersion(Long version) {
     this.version = version;
   }
+
+  public PlainBean getPlainBean() {
+    return plainBean;
+  }
+
+  public void setPlainBean(PlainBean plainBean) {
+    this.plainBean = plainBean;
+  }
 }

From 3e8f76cd6d054cbc9bb88392c4e3048d8857841b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 10 Aug 2021 21:49:31 +1200
Subject: [PATCH 355/447] Update HashCodeBindHash to use values for equals()

---
 .../server/querydefn/DefaultOrmQuery.java             |  3 ++-
 .../server/querydefn/HashCodeBindHash.java            | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 6f3334ede..f29889a88 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1300,7 +1300,8 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   public HashQuery queryHash() {
     // calculateQueryPlanHash is called just after potential AutoTune tuning
     // so queryPlanHash is calculated well before this method is called
-    BindHash hash = bindHashAlgorithm == null ? new HashCodeBindHash() : new MdBindHash(bindHashAlgorithm);
+    //BindHash hash = bindHashAlgorithm == null ? new HashCodeBindHash() : new MdBindHash(bindHashAlgorithm);
+    BindHash hash = new HashCodeBindHash();// : new MdBindHash(bindHashAlgorithm);
     queryBindHash(hash);
     hash.finish();
     return new HashQuery(queryPlanKey, hash);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
index cc6cd5f13..9bc9c60fc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 import io.ebeaninternal.api.BindHash;
@@ -12,28 +14,33 @@ import io.ebeaninternal.api.BindHash;
  */
 public class HashCodeBindHash implements BindHash {
 
-  int hashCode;
+  private final List<Object> values = new ArrayList<>();
+  private int hashCode;
 
   @Override
   public BindHash update(int intValue) {
+    values.add(intValue);
     hashCode = hashCode * 92821 + intValue;
     return this;
   }
 
   @Override
   public BindHash update(long longValue) {
+    values.add(longValue);
     hashCode = hashCode * 92821 + Long.hashCode(longValue);
     return this;
   }
 
   @Override
   public BindHash update(boolean boolValue) {
+    values.add(boolValue);
     hashCode = hashCode * 92821 + Boolean.hashCode(boolValue);
     return this;
   }
 
   @Override
   public BindHash update(Object value) {
+    values.add(value);
     hashCode = hashCode * 92821 + Objects.hashCode(value);
     return this;
   }
@@ -45,7 +52,7 @@ public class HashCodeBindHash implements BindHash {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof HashCodeBindHash && ((HashCodeBindHash) obj).hashCode == hashCode;
+    return obj instanceof HashCodeBindHash && ((HashCodeBindHash) obj).values.equals(values);
   }
 
   @Override

From ede1ad0a4c0d067bfa2823d0ec24530c7e88254e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 10 Aug 2021 21:58:41 +1200
Subject: [PATCH 356/447] Fix BindParams equals() and hashCode()

---
 .../java/io/ebeaninternal/api/BindParams.java | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index 2817c4ba1..3a81f2f0a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -4,11 +4,7 @@ import io.ebeaninternal.server.persist.MultiValueWrapper;
 import io.ebeaninternal.server.querydefn.NaturalKeyBindParam;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 /**
@@ -414,6 +410,7 @@ public class BindParams implements Serializable {
     @Override
     public int hashCode() {
       int hc = getClass().hashCode();
+      hc = hc * 92821 + (encryptionKey ? 0 : 1);
       hc = hc * 92821 + (isInParam ? 0 : 1);
       hc = hc * 92821 + (isOutParam ? 0 : 1);
       hc = hc * 92821 + (type);
@@ -421,13 +418,17 @@ public class BindParams implements Serializable {
       return hc;
     }
 
-    void queryBindHash(BindHash hash) {
-      hash.update(isInParam).update(isOutParam).update(type).update(inValue);
-    }
-
     @Override
     public boolean equals(Object o) {
-      return o != null && (o == this || (o instanceof Param) && hashCode() == o.hashCode());
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      Param param = (Param) o;
+      return encryptionKey == param.encryptionKey && isInParam == param.isInParam && isOutParam == param.isOutParam
+        && type == param.type && Objects.equals(inValue, param.inValue);
+    }
+
+    void queryBindHash(BindHash hash) {
+      hash.update(isInParam).update(isOutParam).update(type).update(inValue);
     }
 
     /**

From 2dc48cf08d4519e66bc8bc81b9f31a791407e47d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 10 Aug 2021 22:00:46 +1200
Subject: [PATCH 357/447] ArrayContainsExpression equals() to use enhanced for
 loop

---
 .../server/expression/ArrayContainsExpression.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
index ac6d27d0e..3c200c046 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
@@ -52,8 +52,8 @@ public class ArrayContainsExpression extends AbstractExpression {
   @Override
   public void queryBindHash(BindHash hash) {
     hash.update(values.length);
-    for (int i = 0; i < values.length; i++) {
-      hash.update(values[i]);
+    for (Object value : values) {
+      hash.update(value);
     }
   }
 

From ac3edbedf41ef627f5d99f77507dbfac4fc51dd5 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 10 Aug 2021 22:07:48 +1200
Subject: [PATCH 358/447] Remove MdBindHash, tidy DefaultOrmQuery

---
 .../server/querydefn/DefaultOrmQuery.java     |  67 +--------
 .../server/querydefn/MdBindHash.java          | 138 ------------------
 2 files changed, 5 insertions(+), 200 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index f29889a88..e4735e32b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1,30 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
-import io.ebean.CacheMode;
-import io.ebean.CountDistinctOrder;
-import io.ebean.Database;
-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.*;
 import io.ebean.OrderBy.Property;
-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.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.ObjectGraphOrigin;
@@ -32,31 +9,10 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.plugin.BeanType;
-import io.ebean.plugin.LoadErrorHandler;
-import io.ebeaninternal.api.BindHash;
-import io.ebeaninternal.api.BindParams;
-import io.ebeaninternal.api.CQueryPlanKey;
-import io.ebeaninternal.api.CacheIdLookup;
-import io.ebeaninternal.api.CacheIdLookupMany;
-import io.ebeaninternal.api.CacheIdLookupSingle;
-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;
-import io.ebeaninternal.api.SpiNamedParam;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.api.SpiQuerySecondary;
-import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanNaturalKey;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.InheritInfo;
-import io.ebeaninternal.server.deploy.TableJoin;
+import io.ebeaninternal.server.deploy.*;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.expression.DefaultExpressionList;
 import io.ebeaninternal.server.expression.IdInExpression;
@@ -68,14 +24,7 @@ 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.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -93,8 +42,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();
 
-  private final ReentrantLock lock = new ReentrantLock();
-
   private final Class<T> beanType;
 
   private final ExpressionFactory expressionFactory;
@@ -285,8 +232,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   private boolean orderById;
 
-  private final String bindHashAlgorithm;
-
   private ProfileLocation profileLocation;
 
   public DefaultOrmQuery(BeanDescriptor<T> desc, SpiEbeanServer server, ExpressionFactory expressionFactory) {
@@ -295,7 +240,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     this.beanType = desc.getBeanType();
     this.server = server;
     this.orderById = server.getServerConfig().isDefaultOrderById();
-    this.bindHashAlgorithm = "MD5"; // TODO: server.getServerConfig().isUseMd5BindHash();
     this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading();
     this.expressionFactory = expressionFactory;
     this.detail = new OrmQueryDetail();
@@ -1300,8 +1244,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   public HashQuery queryHash() {
     // calculateQueryPlanHash is called just after potential AutoTune tuning
     // so queryPlanHash is calculated well before this method is called
-    //BindHash hash = bindHashAlgorithm == null ? new HashCodeBindHash() : new MdBindHash(bindHashAlgorithm);
-    BindHash hash = new HashCodeBindHash();// : new MdBindHash(bindHashAlgorithm);
+    BindHash hash = new HashCodeBindHash();
     queryBindHash(hash);
     hash.finish();
     return new HashQuery(queryPlanKey, hash);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java
deleted file mode 100644
index 4791a9c07..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/MdBindHash.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed Materials - Property of FOCONIS AG
- * (C) Copyright FOCONIS AG.
- */
-
-package io.ebeaninternal.server.querydefn;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.UUID;
-
-import io.ebeaninternal.api.BindHash;
-
-/**
- * Bind hash that uses a MessageDigest to compute a collision resistent hash.
- *
- * @author Roland Praml, FOCONIS AG
- *
- */
-public class MdBindHash implements BindHash {
-  private MessageDigest md;
-  private byte[] buffer;
-  private int hashCode;
-
-  public MdBindHash(String algorithm) {
-    try {
-      md = MessageDigest.getInstance(algorithm);
-    } catch (NoSuchAlgorithmException nsae) {
-      throw new InternalError(algorithm + " not supported", nsae);
-    }
-  }
-
-  @Override
-  public BindHash update(int v) {
-    md.update((byte) (v >>> 24));
-    md.update((byte) (v >>> 16));
-    md.update((byte) (v >>> 8));
-    md.update((byte) (v >>> 0));
-    return this;
-  }
-
-  @Override
-  public BindHash update(long v) {
-    md.update((byte) (v >>> 56));
-    md.update((byte) (v >>> 48));
-    md.update((byte) (v >>> 40));
-    md.update((byte) (v >>> 32));
-    md.update((byte) (v >>> 24));
-    md.update((byte) (v >>> 16));
-    md.update((byte) (v >>> 8));
-    md.update((byte) (v >>> 0));
-    return this;
-  }
-
-  @Override
-  public BindHash update(boolean boolValue) {
-    md.update(boolValue ? (byte) 1 : (byte) 0);
-    return this;
-  }
-
-  @Override
-  public BindHash update(Object value) {
-    if (value == null) {
-      md.update((byte) 0);
-
-      // do some special handling for known object types
-    } else if (value instanceof String) {
-      md.update(((String) value).getBytes());
-
-    } else if (value instanceof Long) {
-      update(((Long) value).longValue());
-
-    } else if (value instanceof Double) {
-      double d = ((Double) value).doubleValue();
-      update(Double.doubleToLongBits(d));
-
-    } else if (value instanceof UUID) {
-      UUID uuid = (UUID) value;
-      update(uuid.getLeastSignificantBits());
-      update(uuid.getMostSignificantBits());
-
-    } else if (value instanceof Date) {
-      update(((Date) value).getTime());
-
-    } else if (value instanceof Instant) {
-      update(((Instant) value).getEpochSecond());
-      update(((Instant) value).getNano());
-
-    } else if (value instanceof LocalDate) {
-      update(((LocalDate) value).toEpochDay());
-
-    } else if (value instanceof LocalTime) {
-      update(((LocalTime) value).toSecondOfDay());
-      update(((LocalTime) value).toNanoOfDay());
-
-    } else if (value instanceof LocalDateTime) {
-      update(((LocalDateTime) value).toLocalDate().toEpochDay());
-      update(((LocalDateTime) value).toLocalTime().toSecondOfDay());
-      update(((LocalDateTime) value).toLocalTime().toNanoOfDay());
-
-    } else {
-      // Fall back to hashCode for all other types
-      updateOther(value);
-    }
-    return this;
-  }
-
-  /**
-   * Update all other object. May be overridden to handle joda dates.
-   */
-  protected void updateOther(Object value) {
-    // Fall back to hashCode for all other types
-    update(value.hashCode());
-  }
-
-  @Override
-  public void finish() {
-    buffer = md.digest();
-    hashCode = Arrays.hashCode(buffer);
-    md = null; // clear memory
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof MdBindHash && Arrays.equals(buffer, ((MdBindHash) obj).buffer);
-  }
-
-  @Override
-  public int hashCode() {
-    return hashCode;
-  }
-}

From e1ad210bb088aa7da3a6ee15fe6775742becf784 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 10 Aug 2021 22:18:33 +1200
Subject: [PATCH 359/447] Tidy JunctionExpression

---
 .../server/expression/JunctionExpression.java | 38 ++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 51eba8f39..88614873d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -114,9 +114,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     context.startBool(type);
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.writeDocQuery(context);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.writeDocQuery(context);
     }
     context.endBool();
   }
@@ -124,9 +123,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   @Override
   public void writeDocQueryJunction(DocQueryContext context) throws IOException {
     context.startBoolGroupList(type);
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.writeDocQuery(context);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.writeDocQuery(context);
     }
     context.endBoolGroupList();
   }
@@ -139,18 +137,15 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
-
     List<SpiExpression> list = exprList.internalList();
-
     // get the current state for 'require outer joins'
     boolean parentOuterJoins = manyWhereJoin.isRequireOuterJoins();
     if (type == Type.OR) {
       // turn on outer joins required for disjunction expressions
       manyWhereJoin.setRequireOuterJoins(true);
     }
-
-    for (SpiExpression aList : list) {
-      aList.containsMany(desc, manyWhereJoin);
+    for (SpiExpression expr : list) {
+      expr.containsMany(desc, manyWhereJoin);
     }
     if (type == Type.OR && !parentOuterJoins) {
       // restore state to not forcing outer joins
@@ -177,18 +172,14 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.addBindValues(request);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.addBindValues(request);
     }
   }
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     List<SpiExpression> list = exprList.internalList();
-
     if (!list.isEmpty()) {
       request.append(type.prefix());
       request.append("(");
@@ -205,9 +196,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.prepareExpression(request);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.prepareExpression(request);
     }
   }
 
@@ -227,10 +217,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void queryBindHash(BindHash hash) {
-    int hc = JunctionExpression.class.getName().hashCode();
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.queryBindHash(hash);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.queryBindHash(hash);
     }
   }
 
@@ -275,7 +263,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.textCommonTerms(search, options);
   }
 
-
   @Override
   public ExpressionList<T> allEq(Map<String, Object> propertyMap) {
     return exprList.allEq(propertyMap);
@@ -1025,7 +1012,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public String nestedPath(BeanDescriptor<?> desc) {
-
     PrepareDocNested.prepare(exprList, desc, type);
     String nestedPath = exprList.allDocNestedPath;
     if (nestedPath != null) {

From e47b1737a82382093714d07bc3f20f787c63c7f9 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 10 Aug 2021 22:28:31 +1200
Subject: [PATCH 360/447] Add HashCodeBindHashTest

---
 .../querydefn/HashCodeBindHashTest.java       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/querydefn/HashCodeBindHashTest.java

diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/HashCodeBindHashTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/HashCodeBindHashTest.java
new file mode 100644
index 000000000..dea0a2e0c
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/HashCodeBindHashTest.java
@@ -0,0 +1,37 @@
+package io.ebeaninternal.server.querydefn;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class HashCodeBindHashTest {
+
+  @Test
+  public void update_with_null() {
+
+    HashCodeBindHash hash = new HashCodeBindHash();
+    hash.update(1).update(null).update("hello");
+
+    HashCodeBindHash hash2 = new HashCodeBindHash();
+    hash2.update(1).update(null).update("hello");
+
+    assertThat(hash).isEqualTo(hash2);
+  }
+
+  @Test
+  public void notEqual() {
+
+    HashCodeBindHash hash = new HashCodeBindHash();
+    hash.update(1).update(null).update("hello");
+
+    HashCodeBindHash hash2 = new HashCodeBindHash();
+    hash2.update(1).update("hello");
+
+    HashCodeBindHash hash3 = new HashCodeBindHash();
+    hash2.update(1).update(null);
+
+    assertThat(hash).isNotEqualTo(hash2);
+    assertThat(hash).isNotEqualTo(hash3);
+    assertThat(hash2).isNotEqualTo(hash3);
+  }
+}

From 75fa7cb7fddda9d5699354e8c0a298abfc6888bc Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 10 Aug 2021 13:24:13 +0200
Subject: [PATCH 361/447] PushJson/PopJson did not work correctly, if null
 beans were involved

---
 .../type/ScalarTypeJsonObjectMapper.java      |  4 +-
 .../org/tests/json/TestDbJson_Jackson3.java   | 16 ++++
 .../org/tests/model/json/EBasicJsonMulti.java | 81 +++++++++++++++++++
 3 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 7ae24420f..41cb28d49 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -80,11 +80,11 @@ class ScalarTypeJsonObjectMapper {
     @Override
     public Object read(DataReader reader) throws SQLException {
       String json = reader.getString();
+      // pushJson such that we MD5 and store on EntityBeanIntercept later
+      reader.pushJson(json);
       if (json == null || json.isEmpty()) {
         return null;
       }
-      // pushJson such that we MD5 and store on EntityBeanIntercept later
-      reader.pushJson(json);
       try {
         return objectReader.readValue(json, deserType);
       } catch (IOException e) {
diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
index c1cc3c40d..5b58b3108 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java
@@ -10,6 +10,7 @@ import io.ebeantest.LoggedSql;
 import org.junit.Test;
 import org.tests.model.json.EBasicJsonJackson3;
 import org.tests.model.json.EBasicJsonList;
+import org.tests.model.json.EBasicJsonMulti;
 import org.tests.model.json.PlainBean;
 import org.tests.model.json.PlainBeanDirtyAware;
 
@@ -221,6 +222,21 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     LoggedSql.stop();
   }
+  
+  @Test
+  public void push_pop_test() {
+    
+    EBasicJsonMulti bean = new EBasicJsonMulti();
+    bean.setPlainValue2(new PlainBeanDirtyAware("x", 42));
+    bean.save();
+    
+    bean = DB.find(EBasicJsonMulti.class, bean.getId());
+    bean.setPlainValue1(null); // already null
+    bean.setPlainValue2(null);
+    bean.setPlainValue3(null); // already null
+    BeanState state = DB.getBeanState(bean);
+    assertThat(state.getDirtyValues()).hasSize(1).containsKey("plainValue2");
+  }
 
   private void expectedSql(int i, String s) {
     assertThat(LoggedSql.collect().get(i)).contains(s);
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java
new file mode 100644
index 000000000..23dcd33d9
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java
@@ -0,0 +1,81 @@
+package org.tests.model.json;
+
+import io.ebean.Model;
+import io.ebean.annotation.DbJson;
+import io.ebean.annotation.MutationDetection;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+import static io.ebean.annotation.MutationDetection.NONE;
+import static io.ebean.annotation.MutationDetection.SOURCE;
+
+@Entity
+public class EBasicJsonMulti extends Model {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @DbJson(length = 500, mutationDetection = SOURCE)
+  PlainBeanDirtyAware plainValue1;
+
+  @DbJson(length = 500, mutationDetection = SOURCE)
+  PlainBeanDirtyAware plainValue2;
+
+  @DbJson(length = 500, mutationDetection = SOURCE)
+  PlainBeanDirtyAware plainValue3;
+
+  @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 PlainBeanDirtyAware getPlainValue1() {
+    return plainValue1;
+  }
+
+  public void setPlainValue1(PlainBeanDirtyAware plainValue1) {
+    this.plainValue1 = plainValue1;
+  }
+
+  public PlainBeanDirtyAware getPlainValue2() {
+    return plainValue2;
+  }
+
+  public void setPlainValue2(PlainBeanDirtyAware plainValue2) {
+    this.plainValue2 = plainValue2;
+  }
+
+  public PlainBeanDirtyAware getPlainValue3() {
+    return plainValue3;
+  }
+
+  public void setPlainValue3(PlainBeanDirtyAware plainValue3) {
+    this.plainValue3 = plainValue3;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}

From 60dfaab22ce4f10539c2c570a8d014d616321efd Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 10 Aug 2021 15:29:10 +0200
Subject: [PATCH 362/447] Enables select + exists for dynamic formula
 properties

---
 .../server/deploy/BeanDescriptor.java         |  2 +-
 .../server/query/SqlTreeBuilder.java          |  8 ++---
 .../java/org/tests/query/TestQueryAlias.java  | 29 +++++++++++++++----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 8e8b02b6f..055f2605a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2519,7 +2519,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     if (propName.indexOf('(') > -1) {
       return findSqlTreeFormula(propName, path);
     }
-    return _findBeanProperty(propName);
+    return findProperty(propName);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 239e8a58e..7e165ef57 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -365,11 +365,11 @@ public final class SqlTreeBuilder {
    * This means it can included individual properties of an embedded bean.
    * </p>
    */
-  private void addPropertyToSubQuery(SqlTreeProperties selectProps, STreeType desc, String propName) {
-    STreeProperty p = desc.findProperty(propName);
+  private void addPropertyToSubQuery(SqlTreeProperties selectProps, STreeType desc, String propName, String path) {
+    STreeProperty p = desc.findPropertyWithDynamic(propName, path);
     if (p == null) {
       logger.error("property [" + propName + "]not found on " + desc + " for query - excluding it.");
-
+      return;
     } else if (p instanceof STreePropertyAssoc && p.isEmbedded()) {
       // if the property is embedded we need to lookup the real column name
       int pos = propName.indexOf('.');
@@ -383,7 +383,7 @@ public final class SqlTreeBuilder {
 
   private void addProperty(SqlTreeProperties selectProps, STreeType desc, OrmQueryProperties queryProps, String propName) {
     if (subQuery) {
-      addPropertyToSubQuery(selectProps, desc, propName);
+      addPropertyToSubQuery(selectProps, desc, propName, queryProps.getPath());
       return;
     }
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java
index de378586c..4e77d49d6 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java
@@ -1,7 +1,7 @@
 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;
@@ -16,11 +16,11 @@ public class TestQueryAlias extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class)
+    Query<CKeyParent> sq = DB.createQuery(CKeyParent.class)
       .select("id.oneKey").alias("st0")
       .setAutoTune(false).where().query();
 
-    Query<CKeyParent> pq = Ebean.find(CKeyParent.class).alias("myt0").where().in("id.oneKey", sq).query();
+    Query<CKeyParent> pq = DB.find(CKeyParent.class).alias("myt0").where().in("id.oneKey", sq).query();
 
     pq.findList();
 
@@ -36,17 +36,36 @@ public class TestQueryAlias extends BaseTestCase {
     assertThat(sql).contains("ckey_parent myt0");
     assertThat(sql).contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)");
   }
+  
+  @Test
+  public void testExistsWithConcat() {
+
+    ResetBasicData.reset();
+
+    Query<CKeyParent> sq = DB.createQuery(CKeyParent.class)
+      .select("concat(id.oneKey,id.twoKey)").alias("st0")
+      .setAutoTune(false).where().query();
+
+    Query<CKeyParent> pq = DB.find(CKeyParent.class).alias("myt0").where().in("concat(id.oneKey,id.twoKey)", sq).query();
+
+    pq.findList();
+
+    String sql = pq.getGeneratedSql();
+
+    assertThat(sql).contains("ckey_parent myt0");
+    assertThat(sql).contains("(concat(myt0.one_key,myt0.two_key)) in (select concat(st0.one_key,st0.two_key) from ckey_parent st0)");
+  }
 
   @Test
   public void testNotExists() {
 
     ResetBasicData.reset();
 
-    Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class)
+    Query<CKeyParent> sq = DB.createQuery(CKeyParent.class)
       .select("id.oneKey").alias("st0")
       .setAutoTune(false).where().query();
 
-    Query<CKeyParent> pq = Ebean.find(CKeyParent.class).alias("myt0").where().notIn("id.oneKey", sq).query();
+    Query<CKeyParent> pq = DB.find(CKeyParent.class).alias("myt0").where().notIn("id.oneKey", sq).query();
 
     pq.findList();
 

From d08f7af1e0e03a3773eee88b82b1698e30ed43d8 Mon Sep 17 00:00:00 2001
From: Thomas Fellner <thomas.fellner@foconis.de>
Date: Tue, 10 Aug 2021 18:31:02 +0200
Subject: [PATCH 363/447] update ebean-ddl-generator version in ebean-core

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

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 11aac552a..b99bf98fb 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.9.4-RC1</version>
+      <version>12.11.0</version>
       <scope>test</scope>
     </dependency>
 

From 11e8e3696f7a0c17cefe2a467625f1cb2447d045 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 11 Aug 2021 12:24:36 +1200
Subject: [PATCH 364/447] BindParams does not need encryptionKey in
 equals/hashCode

---
 .../src/main/java/io/ebeaninternal/api/BindParams.java      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index 3a81f2f0a..b3da53833 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -410,8 +410,7 @@ public class BindParams implements Serializable {
     @Override
     public int hashCode() {
       int hc = getClass().hashCode();
-      hc = hc * 92821 + (encryptionKey ? 0 : 1);
-      hc = hc * 92821 + (isInParam ? 0 : 1);
+``      hc = hc * 92821 + (isInParam ? 0 : 1);
       hc = hc * 92821 + (isOutParam ? 0 : 1);
       hc = hc * 92821 + (type);
       hc = hc * 92821 + (inValue == null ? 0 : inValue.hashCode());
@@ -423,8 +422,7 @@ public class BindParams implements Serializable {
       if (this == o) return true;
       if (o == null || getClass() != o.getClass()) return false;
       Param param = (Param) o;
-      return encryptionKey == param.encryptionKey && isInParam == param.isInParam && isOutParam == param.isOutParam
-        && type == param.type && Objects.equals(inValue, param.inValue);
+      return isInParam == param.isInParam && isOutParam == param.isOutParam && type == param.type && Objects.equals(inValue, param.inValue);
     }
 
     void queryBindHash(BindHash hash) {

From fd2e542c0b90433140c41b3434cd0e84873f0643 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 11 Aug 2021 12:43:58 +1200
Subject: [PATCH 365/447] Change BindHash from interface to implementation,
 Delete unused server persist BindValues

---
 .../java/io/ebeaninternal/api/BindHash.java   | 42 ++++------
 .../java/io/ebeaninternal/api/BindParams.java |  2 +-
 .../server/persist/BindValues.java            | 81 -------------------
 .../ebeaninternal/server/persist/Binder.java  | 27 -------
 .../server/querydefn/DefaultOrmQuery.java     |  3 +-
 .../server/querydefn/HashCodeBindHash.java    | 63 ---------------
 .../server/expression/RawExpressionTest.java  |  4 +-
 ...odeBindHashTest.java => BindHashTest.java} | 13 +--
 .../server/querydefn/DefaultOrmQueryTest.java |  3 +-
 9 files changed, 28 insertions(+), 210 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/persist/BindValues.java
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
 rename ebean-core/src/test/java/io/ebeaninternal/server/querydefn/{HashCodeBindHashTest.java => BindHashTest.java} (67%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
index d70c5f09d..b3ad8e49b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
@@ -1,37 +1,29 @@
 package io.ebeaninternal.api;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * BindHash implementation.
- *
- * @author Roland Praml, FOCONIS AG
- *
  */
-public interface BindHash {
+public class BindHash {
 
-  /**
-   * Update with boolean value.
-   */
-  BindHash update(boolean boolValue);
+  private final List<Object> values = new ArrayList<>();
 
-  /**
-   * Update with int value.
-   */
-  BindHash update(int intValue);
+  public BindHash update(Object value) {
+    values.add(value);
+    return this;
+  }
 
-  /**
-   * Update with long value.
-   */
-  BindHash update(long longValue);
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof BindHash && ((BindHash) obj).values.equals(values);
+  }
 
-  /**
-   * Update with object value.
-   */
-  BindHash update(Object value);
+  @Override
+  public int hashCode() {
+    return values.hashCode();
+  }
 
-  /**
-   * finishes the hash. May be used to compute internal state. After finish, no
-   * update method must be called
-   */
-  void finish();
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index b3da53833..74e7dfa23 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -410,7 +410,7 @@ public class BindParams implements Serializable {
     @Override
     public int hashCode() {
       int hc = getClass().hashCode();
-``      hc = hc * 92821 + (isInParam ? 0 : 1);
+      hc = hc * 92821 + (isInParam ? 0 : 1);
       hc = hc * 92821 + (isOutParam ? 0 : 1);
       hc = hc * 92821 + (type);
       hc = hc * 92821 + (inValue == null ? 0 : inValue.hashCode());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BindValues.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BindValues.java
deleted file mode 100644
index 6d71e8d79..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BindValues.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.ebeaninternal.server.persist;
-
-import java.util.ArrayList;
-
-/**
- * Holds a list of bind values for binding to a PreparedStatement.
- */
-class BindValues {
-
-  private final ArrayList<Value> list = new ArrayList<>();
-
-  /**
-   * Create with a Binder.
-   */
-  public BindValues() {
-  }
-
-  /**
-   * Add a bind value with its JDBC datatype.
-   *
-   * @param value  the bind value
-   * @param dbType the type as per java.sql.Types
-   */
-  public void add(Object value, int dbType, String name) {
-    list.add(new Value(value, dbType, name));
-  }
-
-  /**
-   * List of bind values.
-   */
-  public ArrayList<Value> values() {
-    return list;
-  }
-
-  /**
-   * A Value has additionally the JDBC data type.
-   */
-  public static class Value {
-
-    private final Object value;
-
-    private final int dbType;
-
-    private final String name;
-
-    /**
-     * Create the value.
-     */
-    Value(Object value, int dbType, String name) {
-      this.value = value;
-      this.dbType = dbType;
-      this.name = name;
-    }
-
-    /**
-     * Return the type as per java.sql.Types.
-     */
-    public int getDbType() {
-      return dbType;
-    }
-
-    /**
-     * Return the value.
-     */
-    public Object getValue() {
-      return value;
-    }
-
-    /**
-     * Return the property name.
-     */
-    public String getName() {
-      return name;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-  }
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 1d94d7a81..600a7e21a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -77,33 +77,6 @@ public class Binder {
     return asOfStandardsBased;
   }
 
-  /**
-   * Bind the values to the Prepared Statement.
-   */
-  public void bind(BindValues bindValues, DataBind dataBind, StringBuilder bindBuf) throws SQLException {
-    String logPrefix = "";
-    ArrayList<BindValues.Value> list = bindValues.values();
-    for (BindValues.Value bindValue : list) {
-      Object val = bindValue.getValue();
-      int dt = bindValue.getDbType();
-      bindObject(dataBind, val, dt);
-
-      if (bindBuf != null) {
-        bindBuf.append(logPrefix);
-        if (logPrefix.isEmpty()) {
-          logPrefix = ", ";
-        }
-        bindBuf.append(bindValue.getName());
-        bindBuf.append("=");
-        if (isLob(dt)) {
-          bindBuf.append("[LOB]");
-        } else {
-          bindBuf.append(val);
-        }
-      }
-    }
-  }
-
   /**
    * Bind the parameters to the preparedStatement returning the bind log.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index e4735e32b..865b3184b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1244,9 +1244,8 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   public HashQuery queryHash() {
     // calculateQueryPlanHash is called just after potential AutoTune tuning
     // so queryPlanHash is calculated well before this method is called
-    BindHash hash = new HashCodeBindHash();
+    BindHash hash = new BindHash();
     queryBindHash(hash);
-    hash.finish();
     return new HashQuery(queryPlanKey, hash);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
deleted file mode 100644
index 9bc9c60fc..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/HashCodeBindHash.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.ebeaninternal.server.querydefn;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import io.ebeaninternal.api.BindHash;
-
-/**
- * HashCode builder that uses Object.hashCode for computing bind-hashes.
- * This is a fast and lightweight implementation, but may produce collisions.
- *
- * @author Roland Praml, FOCONIS AG
- */
-public class HashCodeBindHash implements BindHash {
-
-  private final List<Object> values = new ArrayList<>();
-  private int hashCode;
-
-  @Override
-  public BindHash update(int intValue) {
-    values.add(intValue);
-    hashCode = hashCode * 92821 + intValue;
-    return this;
-  }
-
-  @Override
-  public BindHash update(long longValue) {
-    values.add(longValue);
-    hashCode = hashCode * 92821 + Long.hashCode(longValue);
-    return this;
-  }
-
-  @Override
-  public BindHash update(boolean boolValue) {
-    values.add(boolValue);
-    hashCode = hashCode * 92821 + Boolean.hashCode(boolValue);
-    return this;
-  }
-
-  @Override
-  public BindHash update(Object value) {
-    values.add(value);
-    hashCode = hashCode * 92821 + Objects.hashCode(value);
-    return this;
-  }
-
-  @Override
-  public void finish() {
-    // nothing to do
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof HashCodeBindHash && ((HashCodeBindHash) obj).values.equals(values);
-  }
-
-  @Override
-  public int hashCode() {
-    return hashCode;
-  }
-
-}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
index 6c608472f..99c7d7eec 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
@@ -4,7 +4,6 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import io.ebeaninternal.api.BindHash;
-import io.ebeaninternal.server.querydefn.HashCodeBindHash;
 
 public class RawExpressionTest extends BaseExpressionTest {
 
@@ -71,9 +70,8 @@ public class RawExpressionTest extends BaseExpressionTest {
   }
 
   private int getHash(RawExpression query) {
-    BindHash hash = new HashCodeBindHash();
+    BindHash hash = new BindHash();
     query.queryBindHash(hash);
-    hash.finish();
     return hash.hashCode();
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/HashCodeBindHashTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindHashTest.java
similarity index 67%
rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/HashCodeBindHashTest.java
rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindHashTest.java
index dea0a2e0c..a74f4432f 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/HashCodeBindHashTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindHashTest.java
@@ -1,18 +1,19 @@
 package io.ebeaninternal.server.querydefn;
 
+import io.ebeaninternal.api.BindHash;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class HashCodeBindHashTest {
+public class BindHashTest {
 
   @Test
   public void update_with_null() {
 
-    HashCodeBindHash hash = new HashCodeBindHash();
+    BindHash hash = new BindHash();
     hash.update(1).update(null).update("hello");
 
-    HashCodeBindHash hash2 = new HashCodeBindHash();
+    BindHash hash2 = new BindHash();
     hash2.update(1).update(null).update("hello");
 
     assertThat(hash).isEqualTo(hash2);
@@ -21,13 +22,13 @@ public class HashCodeBindHashTest {
   @Test
   public void notEqual() {
 
-    HashCodeBindHash hash = new HashCodeBindHash();
+    BindHash hash = new BindHash();
     hash.update(1).update(null).update("hello");
 
-    HashCodeBindHash hash2 = new HashCodeBindHash();
+    BindHash hash2 = new BindHash();
     hash2.update(1).update("hello");
 
-    HashCodeBindHash hash3 = new HashCodeBindHash();
+    BindHash hash3 = new BindHash();
     hash2.update(1).update(null);
 
     assertThat(hash).isNotEqualTo(hash2);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
index cb1738ba8..999459892 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
@@ -113,9 +113,8 @@ public class DefaultOrmQueryTest extends BaseTestCase {
   }
 
   private int getHash(DefaultOrmQuery<Order> query) {
-    BindHash hash = new HashCodeBindHash();
+    BindHash hash = new BindHash();
     query.queryBindHash(hash);
-    hash.finish();
     return hash.hashCode();
   }
 }

From ec7c7048db86a677e85d4d066cd76f77cd1cc23a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 11 Aug 2021 13:19:44 +1200
Subject: [PATCH 366/447] Refactor rename BindHash to BindValuesKey

---
 .../java/io/ebeaninternal/api/BindHash.java   | 29 --------------
 .../java/io/ebeaninternal/api/BindParams.java | 12 +++---
 .../io/ebeaninternal/api/BindValuesKey.java   | 35 +++++++++++++++++
 .../java/io/ebeaninternal/api/HashQuery.java  | 12 +++---
 .../io/ebeaninternal/api/SpiExpression.java   |  2 +-
 .../java/io/ebeaninternal/api/SpiQuery.java   |  2 +-
 .../expression/AbstractTextExpression.java    |  4 +-
 .../expression/AllEqualsExpression.java       | 10 ++---
 .../expression/ArrayContainsExpression.java   |  8 ++--
 .../expression/ArrayIsEmptyExpression.java    |  6 +--
 .../server/expression/BetweenExpression.java  |  6 +--
 .../expression/BetweenPropertyExpression.java |  6 +--
 .../server/expression/BitwiseExpression.java  |  6 +--
 .../CaseInsensitiveEqualExpression.java       |  6 +--
 .../expression/DefaultExampleExpression.java  | 10 ++---
 .../expression/DefaultExpressionList.java     | 10 ++---
 .../expression/ExistsQueryExpression.java     |  6 +--
 .../server/expression/IdExpression.java       |  6 +--
 .../server/expression/IdInExpression.java     |  8 ++--
 .../server/expression/InExpression.java       |  8 ++--
 .../server/expression/InPairsExpression.java  |  8 ++--
 .../server/expression/InQueryExpression.java  |  6 +--
 .../server/expression/InRangeExpression.java  |  6 +--
 .../server/expression/IsEmptyExpression.java  |  4 +-
 .../server/expression/JsonPathExpression.java |  6 +--
 .../server/expression/JunctionExpression.java |  6 +--
 .../server/expression/LikeExpression.java     |  6 +--
 .../server/expression/LogicExpression.java    |  6 +--
 .../expression/NativeILikeExpression.java     |  6 +--
 .../NestedPathWrapperExpression.java          |  6 +--
 .../server/expression/NoopExpression.java     |  4 +-
 .../server/expression/NotExpression.java      |  6 +--
 .../server/expression/NullExpression.java     |  6 +--
 .../server/expression/RawExpression.java      |  8 ++--
 .../server/expression/SimpleExpression.java   |  6 +--
 .../server/querydefn/DefaultOrmQuery.java     | 18 ++++-----
 .../server/expression/RawExpressionTest.java  | 14 +++----
 .../server/querydefn/BindHashTest.java        | 38 -------------------
 .../server/querydefn/BindValuesKeyTest.java   | 38 +++++++++++++++++++
 .../server/querydefn/DefaultOrmQueryTest.java | 16 ++++----
 40 files changed, 204 insertions(+), 202 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
 delete mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindHashTest.java
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
deleted file mode 100644
index b3ad8e49b..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindHash.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.ebeaninternal.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * BindHash implementation.
- */
-public class BindHash {
-
-  private final List<Object> values = new ArrayList<>();
-
-  public BindHash update(Object value) {
-    values.add(value);
-    return this;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof BindHash && ((BindHash) obj).values.equals(values);
-  }
-
-  @Override
-  public int hashCode() {
-    return values.hashCode();
-  }
-
-
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index 74e7dfa23..64a0a0287 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -50,10 +50,10 @@ public class BindParams implements Serializable {
     positionedParameters.clear();
   }
 
-  public void queryBindHash(BindHash hash) {
-    hash.update(positionedParameters.size());
-    for (Param positionedParameter : positionedParameters) {
-       positionedParameter.queryBindHash(hash);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(positionedParameters.size());
+    for (Param param : positionedParameters) {
+       param.queryBindHash(key);
     }
   }
 
@@ -425,8 +425,8 @@ public class BindParams implements Serializable {
       return isInParam == param.isInParam && isOutParam == param.isOutParam && type == param.type && Objects.equals(inValue, param.inValue);
     }
 
-    void queryBindHash(BindHash hash) {
-      hash.update(isInParam).update(isOutParam).update(type).update(inValue);
+    void queryBindHash(BindValuesKey key) {
+      key.add(isInParam).add(isOutParam).add(type).add(inValue);
     }
 
     /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
new file mode 100644
index 000000000..4a6eac324
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
@@ -0,0 +1,35 @@
+package io.ebeaninternal.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * BindValues used for L2 query cache key matching.
+ * <p>
+ * The equals/hashCode implementation must meet the requirement that the query bind values
+ * match for L2 query cache hit (given the query plan hash is already a match).
+ */
+public class BindValuesKey {
+
+  private final List<Object> values = new ArrayList<>();
+
+  /**
+   * Add a bind value.
+   */
+  public BindValuesKey add(Object value) {
+    values.add(value);
+    return this;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof BindValuesKey && ((BindValuesKey) obj).values.equals(values);
+  }
+
+  @Override
+  public int hashCode() {
+    return values.hashCode();
+  }
+
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
index 87241aedc..faddb7bee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
@@ -6,15 +6,14 @@ package io.ebeaninternal.api;
 public class HashQuery {
 
   private final CQueryPlanKey planHash;
-
-  private final BindHash bindHash;
+  private final BindValuesKey bindValuesKey;
 
   /**
    * Create the HashQuery.
    */
-  public HashQuery(CQueryPlanKey planHash, BindHash bindHash) {
+  public HashQuery(CQueryPlanKey planHash, BindValuesKey bindValuesKey) {
     this.planHash = planHash;
-    this.bindHash = bindHash;
+    this.bindValuesKey = bindValuesKey;
   }
 
   @Override
@@ -25,7 +24,7 @@ public class HashQuery {
   @Override
   public int hashCode() {
     int hc = 92821 * planHash.hashCode();
-    hc = 92821 * hc + bindHash.hashCode();
+    hc = 92821 * hc + bindValuesKey.hashCode();
     return hc;
   }
 
@@ -37,8 +36,7 @@ public class HashQuery {
     if (!(obj instanceof HashQuery)) {
       return false;
     }
-
     HashQuery e = (HashQuery) obj;
-    return e.bindHash.equals(bindHash) && e.planHash.equals(planHash);
+    return e.bindValuesKey.equals(bindValuesKey) && e.planHash.equals(planHash);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
index 32c3a3518..00879e15d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -56,7 +56,7 @@ public interface SpiExpression extends Expression {
   /**
    * Return the hash value for the values that will be bound.
    */
-  void queryBindHash(BindHash hash);
+  void queryBindHash(BindValuesKey key);
 
   /**
    * Return true if the expression is the same with respect to bind values.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index d8bae7503..2eae4506b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -635,7 +635,7 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    * query).
    * </p>
    */
-  void queryBindHash(BindHash hash);
+  void queryBindHash(BindValuesKey key);
 
   /**
    * Identifies queries that are exactly the same including bind variables.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
index d377e48dd..2a411675e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -38,7 +38,7 @@ public abstract class AbstractTextExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
+  public void queryBindHash(BindValuesKey key) {
     // do nothing, only execute against document store
   };
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
index df9e6095b..be0791a12 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -123,13 +123,11 @@ class AllEqualsExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-
-    hash.update(propMap.size());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(propMap.size());
     for (Object value : propMap.values()) {
-      hash.update(value);
+      key.add(value);
     }
-
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
index 3c200c046..1ca15f8f7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -50,10 +50,10 @@ public class ArrayContainsExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(values.length);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(values.length);
     for (Object value : values) {
-      hash.update(value);
+      key.add(value);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
index 0249acabb..5b58be0b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -34,8 +34,8 @@ public class ArrayIsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(empty);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(empty);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
index 37a3aab8f..27e7a5909 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -50,8 +50,8 @@ class BetweenExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(low()).update(high());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(low()).add(high());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
index 440dd5f1f..cdc199d70 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -96,8 +96,8 @@ class BetweenPropertyExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(val());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(val());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
index db1fa686d..20119b370 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -40,8 +40,8 @@ class BitwiseExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(flags).update(match);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(flags).add(match);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index 485d1b04f..ecefbe08a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -70,8 +70,8 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(val());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(val());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index 9149923e0..3c0e268b6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -5,7 +5,7 @@ import io.ebean.LikeType;
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -242,10 +242,10 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
    * Return a hash for the actual bind values used.
    */
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(list.size());
-    for (SpiExpression aList : list) {
-      aList.queryBindHash(hash);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(list.size());
+    for (SpiExpression expr : list) {
+      expr.queryBindHash(key);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index b5f9c6ec1..6c47467f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -26,7 +26,7 @@ import io.ebean.search.MultiMatch;
 import io.ebean.search.TextCommonTerms;
 import io.ebean.search.TextQueryString;
 import io.ebean.search.TextSimple;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -679,10 +679,10 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    * Calculate a hash based on the expressions.
    */
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(list.size());
-    for (SpiExpression aList : list) {
-      aList.queryBindHash(hash);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(list.size());
+    for (SpiExpression expr : list) {
+      expr.queryBindHash(key);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index b3fcf8ce0..9f1d1830d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -92,8 +92,8 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    subQuery.queryBindHash(hash);
+  public void queryBindHash(BindValuesKey key) {
+    subQuery.queryBindHash(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
index 904fbe9be..5c20e66b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -78,8 +78,8 @@ class IdExpression extends NonPrepareExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(value);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(value);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
index 390d0bebb..8dbceb419 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -134,10 +134,10 @@ public class IdInExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(idCollection.size());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(idCollection.size());
     for (Object elem : idCollection) {
-      hash.update(elem);
+      key.add(elem);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index a5719f71a..bbc2bf7eb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -177,10 +177,10 @@ class InExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(bindValues.size());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(bindValues.size());
     for (Object bindValue : bindValues) {
-      hash.update(bindValue);
+      key.add(bindValue);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index a7079ae55..6f2aae853 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression;
 import io.ebean.Pairs;
 import io.ebean.Pairs.Entry;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -125,10 +125,10 @@ class InPairsExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(entries.size());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(entries.size());
     for (Pairs.Entry entry : entries) {
-      hash.update(entry.getA()).update(entry.getB());
+      key.add(entry.getA()).add(entry.getB());
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 619f7b715..769f83b84 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -73,8 +73,8 @@ class InQueryExpression extends AbstractExpression implements UnsupportedDocStor
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    subQuery.queryBindHash(hash);
+  public void queryBindHash(BindValuesKey key) {
+    subQuery.queryBindHash(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
index abe0b7338..c8a8dc96f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -48,8 +48,8 @@ class InRangeExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(low()).update(high());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(low()).add(high());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
index bb65962b3..4ca943619 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -104,7 +104,7 @@ class IsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
+  public void queryBindHash(BindValuesKey key) {
     // no bind values
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
index 18e0aa924..d501068d9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
@@ -84,8 +84,8 @@ class JsonPathExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(value).update(upperValue);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(value).add(upperValue);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 88614873d..75c17ba19 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -25,7 +25,7 @@ import io.ebean.search.MultiMatch;
 import io.ebean.search.TextCommonTerms;
 import io.ebean.search.TextQueryString;
 import io.ebean.search.TextSimple;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -216,9 +216,9 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
+  public void queryBindHash(BindValuesKey key) {
     for (SpiExpression expr : exprList.internalList()) {
-      expr.queryBindHash(hash);
+      expr.queryBindHash(key);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
index 587e6064c..355cdfa3c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.LikeType;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -71,8 +71,8 @@ class LikeExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(strValue());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(strValue());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index cbd487b3e..d6f7894e0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression;
 import io.ebean.Expression;
 import io.ebean.Junction;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -169,8 +169,8 @@ abstract class LogicExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(expOne).update(expTwo);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(expOne).add(expTwo);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
index 8c51d2f5d..efb77d37a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.LikeType;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -55,8 +55,8 @@ class NativeILikeExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(val);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(val);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
index f3ed1badd..0931486af 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -80,8 +80,8 @@ class NestedPathWrapperExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    delegate.queryBindHash(hash);
+  public void queryBindHash(BindValuesKey key) {
+    delegate.queryBindHash(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
index 92180cea1..0a8a67f24 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -75,7 +75,7 @@ class NoopExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
+  public void queryBindHash(BindValuesKey key) {
     // no bind values
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
index e9df6d856..4d6a4aba1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.Expression;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 import io.ebeaninternal.api.SpiExpression;
@@ -100,8 +100,8 @@ final class NotExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    exp.queryBindHash(hash);
+  public void queryBindHash(BindValuesKey key) {
+    exp.queryBindHash(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index daded43cb..1ec123fda 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -95,7 +95,7 @@ class NullExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(notNull);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(notNull);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
index 721d69b25..080f541b7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -74,10 +74,10 @@ class RawExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(values.length);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(values.length);
     for (Object value : values) {
-      hash.update(value);
+      key.add(value);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
index e50d9856c..3e0db8707 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
@@ -5,7 +5,7 @@ import io.ebean.plugin.ExpressionPath;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
@@ -122,8 +122,8 @@ public class SimpleExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(value());
+  public void queryBindHash(BindValuesKey key) {
+    key.add(value());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 865b3184b..4508458b8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1225,12 +1225,12 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * </p>
    */
   @Override
-  public void queryBindHash(BindHash hash) {
-    hash.update(id);
-    if (whereExpressions != null) whereExpressions.queryBindHash(hash);
-    if (havingExpressions != null) havingExpressions.queryBindHash(hash);
-    if (bindParams != null) bindParams.queryBindHash(hash);
-    hash.update(asOf).update(versionsStart).update(versionsEnd);
+  public void queryBindHash(BindValuesKey key) {
+    key.add(id);
+    if (whereExpressions != null) whereExpressions.queryBindHash(key);
+    if (havingExpressions != null) havingExpressions.queryBindHash(key);
+    if (bindParams != null) bindParams.queryBindHash(key);
+    key.add(asOf).add(versionsStart).add(versionsEnd);
   }
 
   /**
@@ -1244,9 +1244,9 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   public HashQuery queryHash() {
     // calculateQueryPlanHash is called just after potential AutoTune tuning
     // so queryPlanHash is calculated well before this method is called
-    BindHash hash = new BindHash();
-    queryBindHash(hash);
-    return new HashQuery(queryPlanKey, hash);
+    BindValuesKey bindKey = new BindValuesKey();
+    queryBindHash(bindKey);
+    return new HashQuery(queryPlanKey, bindKey);
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
index 99c7d7eec..3568a3bf6 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 
 public class RawExpressionTest extends BaseExpressionTest {
 
@@ -62,16 +62,16 @@ public class RawExpressionTest extends BaseExpressionTest {
   }
 
   public void assert_queryBindHash_isDifferent(RawExpression exp0, RawExpression exp1) {
-    assertThat(getHash(exp0)).isNotEqualTo(getHash(exp1));
+    assertThat(bindKey(exp0)).isNotEqualTo(bindKey(exp1));
   }
 
   public void assert_queryBindHash_isSame(RawExpression exp0, RawExpression exp1) {
-    assertThat(getHash(exp0)).isEqualTo(getHash(exp1));
+    assertThat(bindKey(exp0)).isEqualTo(bindKey(exp1));
   }
 
-  private int getHash(RawExpression query) {
-    BindHash hash = new BindHash();
-    query.queryBindHash(hash);
-    return hash.hashCode();
+  private BindValuesKey bindKey(RawExpression query) {
+    BindValuesKey bindValuesKey = new BindValuesKey();
+    query.queryBindHash(bindValuesKey);
+    return bindValuesKey;
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindHashTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindHashTest.java
deleted file mode 100644
index a74f4432f..000000000
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindHashTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.ebeaninternal.server.querydefn;
-
-import io.ebeaninternal.api.BindHash;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class BindHashTest {
-
-  @Test
-  public void update_with_null() {
-
-    BindHash hash = new BindHash();
-    hash.update(1).update(null).update("hello");
-
-    BindHash hash2 = new BindHash();
-    hash2.update(1).update(null).update("hello");
-
-    assertThat(hash).isEqualTo(hash2);
-  }
-
-  @Test
-  public void notEqual() {
-
-    BindHash hash = new BindHash();
-    hash.update(1).update(null).update("hello");
-
-    BindHash hash2 = new BindHash();
-    hash2.update(1).update("hello");
-
-    BindHash hash3 = new BindHash();
-    hash2.update(1).update(null);
-
-    assertThat(hash).isNotEqualTo(hash2);
-    assertThat(hash).isNotEqualTo(hash3);
-    assertThat(hash2).isNotEqualTo(hash3);
-  }
-}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java
new file mode 100644
index 000000000..1a7d3b39f
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java
@@ -0,0 +1,38 @@
+package io.ebeaninternal.server.querydefn;
+
+import io.ebeaninternal.api.BindValuesKey;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class BindValuesKeyTest {
+
+  @Test
+  public void update_with_null() {
+
+    BindValuesKey hash = new BindValuesKey();
+    hash.add(1).add(null).add("hello");
+
+    BindValuesKey hash2 = new BindValuesKey();
+    hash2.add(1).add(null).add("hello");
+
+    assertThat(hash).isEqualTo(hash2);
+  }
+
+  @Test
+  public void notEqual() {
+
+    BindValuesKey hash = new BindValuesKey();
+    hash.add(1).add(null).add("hello");
+
+    BindValuesKey hash2 = new BindValuesKey();
+    hash2.add(1).add("hello");
+
+    BindValuesKey hash3 = new BindValuesKey();
+    hash2.add(1).add(null);
+
+    assertThat(hash).isNotEqualTo(hash2);
+    assertThat(hash).isNotEqualTo(hash3);
+    assertThat(hash2).isNotEqualTo(hash3);
+  }
+}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
index 999459892..b3b657c4a 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
@@ -4,7 +4,7 @@ package io.ebeaninternal.server.querydefn;
 import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.Ebean;
-import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import org.junit.Test;
@@ -63,7 +63,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isNotEqualTo(q2.createQueryPlanKey());
-    assertThat(getHash(q1)).isNotEqualTo(getHash(q2));
+    assertThat(bindKey(q1)).isNotEqualTo(bindKey(q2));
   }
 
   @Test
@@ -74,7 +74,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey());
-    assertThat(getHash(q1)).isNotEqualTo(getHash(q2));
+    assertThat(bindKey(q1)).isNotEqualTo(bindKey(q2));
   }
 
   @Test
@@ -85,7 +85,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey());
-    assertThat(getHash(q1)).isEqualTo(getHash(q2));
+    assertThat(bindKey(q1)).isEqualTo(bindKey(q2));
   }
 
   @Test
@@ -112,9 +112,9 @@ public class DefaultOrmQueryTest extends BaseTestCase {
     q2.prepare(r2);
   }
 
-  private int getHash(DefaultOrmQuery<Order> query) {
-    BindHash hash = new BindHash();
-    query.queryBindHash(hash);
-    return hash.hashCode();
+  private BindValuesKey bindKey(DefaultOrmQuery<Order> query) {
+    BindValuesKey key = new BindValuesKey();
+    query.queryBindHash(key);
+    return key;
   }
 }

From 144a3b54bb51d804712a086a0e1921eceb1faf86 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 11 Aug 2021 13:25:04 +1200
Subject: [PATCH 367/447] Refactor rename method queryBindHash() to
 queryBindKey()

---
 .../java/io/ebeaninternal/api/SpiExpression.java   |  4 ++--
 .../main/java/io/ebeaninternal/api/SpiQuery.java   |  8 +++-----
 .../server/expression/AbstractTextExpression.java  |  2 +-
 .../server/expression/AllEqualsExpression.java     |  2 +-
 .../server/expression/ArrayContainsExpression.java |  2 +-
 .../server/expression/ArrayIsEmptyExpression.java  |  2 +-
 .../server/expression/BetweenExpression.java       |  2 +-
 .../expression/BetweenPropertyExpression.java      |  2 +-
 .../server/expression/BitwiseExpression.java       |  2 +-
 .../expression/CaseInsensitiveEqualExpression.java |  2 +-
 .../expression/DefaultExampleExpression.java       |  7 ++-----
 .../server/expression/DefaultExpressionList.java   |  7 ++-----
 .../server/expression/ExistsQueryExpression.java   |  4 ++--
 .../server/expression/IdExpression.java            |  2 +-
 .../server/expression/IdInExpression.java          |  2 +-
 .../server/expression/InExpression.java            |  2 +-
 .../server/expression/InPairsExpression.java       |  2 +-
 .../server/expression/InQueryExpression.java       |  4 ++--
 .../server/expression/InRangeExpression.java       |  2 +-
 .../server/expression/IsEmptyExpression.java       |  2 +-
 .../server/expression/JsonPathExpression.java      |  2 +-
 .../server/expression/JunctionExpression.java      |  4 ++--
 .../server/expression/LikeExpression.java          |  2 +-
 .../server/expression/LogicExpression.java         |  2 +-
 .../server/expression/NativeILikeExpression.java   |  2 +-
 .../expression/NestedPathWrapperExpression.java    |  4 ++--
 .../server/expression/NoopExpression.java          |  2 +-
 .../server/expression/NotExpression.java           |  4 ++--
 .../server/expression/NullExpression.java          |  2 +-
 .../server/expression/RawExpression.java           |  2 +-
 .../server/expression/SimpleExpression.java        |  2 +-
 .../server/querydefn/DefaultOrmQuery.java          | 14 ++++----------
 .../server/expression/RawExpressionTest.java       |  2 +-
 .../server/querydefn/DefaultOrmQueryTest.java      |  2 +-
 34 files changed, 47 insertions(+), 61 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
index 00879e15d..8fe986259 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -54,9 +54,9 @@ public interface SpiExpression extends Expression {
   void queryPlanHash(StringBuilder builder);
 
   /**
-   * Return the hash value for the values that will be bound.
+   * Build the key for bind values of the query.
    */
-  void queryBindHash(BindValuesKey key);
+  void queryBindKey(BindValuesKey key);
 
   /**
    * Return true if the expression is the same with respect to bind values.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 2eae4506b..5ba0b6eeb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -629,13 +629,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   CQueryPlanKey prepare(SpiOrmQueryRequest<T> request);
 
   /**
-   * Calculate a hash based on the bind values used in the query.
+   * Build the key for the bind values used in the query (for l2 query cache).
    * <p>
-   * Combined with queryPlanHash() to return getQueryHash (a unique hash for a
-   * query).
-   * </p>
+   * Combined with queryPlanHash() to return queryHash (a unique key for a query).
    */
-  void queryBindHash(BindValuesKey key);
+  void queryBindKey(BindValuesKey key);
 
   /**
    * Identifies queries that are exactly the same including bind variables.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
index 2a411675e..363bcb08d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
@@ -38,7 +38,7 @@ public abstract class AbstractTextExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     // do nothing, only execute against document store
   };
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
index be0791a12..56761dcf2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
@@ -123,7 +123,7 @@ class AllEqualsExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(propMap.size());
     for (Object value : propMap.values()) {
       key.add(value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
index 1ca15f8f7..7a9e903f6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
@@ -50,7 +50,7 @@ public class ArrayContainsExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(values.length);
     for (Object value : values) {
       key.add(value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
index 5b58be0b4..f9cd530c8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
@@ -34,7 +34,7 @@ public class ArrayIsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(empty);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
index 27e7a5909..ed3d58d8b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
@@ -50,7 +50,7 @@ class BetweenExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(low()).add(high());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
index cdc199d70..55b08380d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
@@ -96,7 +96,7 @@ class BetweenPropertyExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(val());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
index 20119b370..460af37ec 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
@@ -40,7 +40,7 @@ class BitwiseExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(flags).add(match);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index ecefbe08a..3a6224d9c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -70,7 +70,7 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(val());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index 3c0e268b6..e6353edd0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -238,14 +238,11 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
     builder.append("]");
   }
 
-  /**
-   * Return a hash for the actual bind values used.
-   */
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(list.size());
     for (SpiExpression expr : list) {
-      expr.queryBindHash(key);
+      expr.queryBindKey(key);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 6c47467f2..97899f091 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -675,14 +675,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     builder.append("]");
   }
 
-  /**
-   * Calculate a hash based on the expressions.
-   */
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(list.size());
     for (SpiExpression expr : list) {
-      expr.queryBindHash(key);
+      expr.queryBindKey(key);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 9f1d1830d..4ba939066 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -92,8 +92,8 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
-    subQuery.queryBindHash(key);
+  public void queryBindKey(BindValuesKey key) {
+    subQuery.queryBindKey(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
index 5c20e66b3..94cab6de7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
@@ -78,7 +78,7 @@ class IdExpression extends NonPrepareExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(value);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
index 8dbceb419..edf56b443 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
@@ -134,7 +134,7 @@ public class IdInExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(idCollection.size());
     for (Object elem : idCollection) {
       key.add(elem);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index bbc2bf7eb..0bc5a4588 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -177,7 +177,7 @@ class InExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(bindValues.size());
     for (Object bindValue : bindValues) {
       key.add(bindValue);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index 6f2aae853..e5bd27413 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -125,7 +125,7 @@ class InPairsExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(entries.size());
     for (Pairs.Entry entry : entries) {
       key.add(entry.getA()).add(entry.getB());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 769f83b84..48647d0c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -73,8 +73,8 @@ class InQueryExpression extends AbstractExpression implements UnsupportedDocStor
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
-    subQuery.queryBindHash(key);
+  public void queryBindKey(BindValuesKey key) {
+    subQuery.queryBindKey(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
index c8a8dc96f..04b242ba8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
@@ -48,7 +48,7 @@ class InRangeExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(low()).add(high());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
index 4ca943619..d6b878bfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
@@ -104,7 +104,7 @@ class IsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     // no bind values
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
index d501068d9..1d954dcc1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
@@ -84,7 +84,7 @@ class JsonPathExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(value).add(upperValue);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 75c17ba19..a253bbb2b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -216,9 +216,9 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     for (SpiExpression expr : exprList.internalList()) {
-      expr.queryBindHash(key);
+      expr.queryBindKey(key);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
index 355cdfa3c..f40501929 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
@@ -71,7 +71,7 @@ class LikeExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(strValue());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index d6f7894e0..a66e2e88a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -169,7 +169,7 @@ abstract class LogicExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(expOne).add(expTwo);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
index efb77d37a..f64933df5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
@@ -55,7 +55,7 @@ class NativeILikeExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(val);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
index 0931486af..b76bfef4d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
@@ -80,8 +80,8 @@ class NestedPathWrapperExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
-    delegate.queryBindHash(key);
+  public void queryBindKey(BindValuesKey key) {
+    delegate.queryBindKey(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
index 0a8a67f24..6c8d709e7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
@@ -75,7 +75,7 @@ class NoopExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     // no bind values
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
index 4d6a4aba1..462e60d9e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java
@@ -100,8 +100,8 @@ final class NotExpression implements SpiExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
-    exp.queryBindHash(key);
+  public void queryBindKey(BindValuesKey key) {
+    exp.queryBindKey(key);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index 1ec123fda..2808acce7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -95,7 +95,7 @@ class NullExpression extends AbstractExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(notNull);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
index 080f541b7..9e1c3e8dc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
@@ -74,7 +74,7 @@ class RawExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(values.length);
     for (Object value : values) {
       key.add(value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
index 3e0db8707..bc23b84f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
@@ -122,7 +122,7 @@ public class SimpleExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(value());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 4508458b8..834abb856 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1218,17 +1218,11 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     }
   }
 
-  /**
-   * Calculate a hash based on the bind values used in the query.
-   * <p>
-   * Used with queryPlanHash() to get a unique hash for a query.
-   * </p>
-   */
   @Override
-  public void queryBindHash(BindValuesKey key) {
+  public void queryBindKey(BindValuesKey key) {
     key.add(id);
-    if (whereExpressions != null) whereExpressions.queryBindHash(key);
-    if (havingExpressions != null) havingExpressions.queryBindHash(key);
+    if (whereExpressions != null) whereExpressions.queryBindKey(key);
+    if (havingExpressions != null) havingExpressions.queryBindKey(key);
     if (bindParams != null) bindParams.queryBindHash(key);
     key.add(asOf).add(versionsStart).add(versionsEnd);
   }
@@ -1245,7 +1239,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     // calculateQueryPlanHash is called just after potential AutoTune tuning
     // so queryPlanHash is calculated well before this method is called
     BindValuesKey bindKey = new BindValuesKey();
-    queryBindHash(bindKey);
+    queryBindKey(bindKey);
     return new HashQuery(queryPlanKey, bindKey);
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
index 3568a3bf6..eb12ff460 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java
@@ -71,7 +71,7 @@ public class RawExpressionTest extends BaseExpressionTest {
 
   private BindValuesKey bindKey(RawExpression query) {
     BindValuesKey bindValuesKey = new BindValuesKey();
-    query.queryBindHash(bindValuesKey);
+    query.queryBindKey(bindValuesKey);
     return bindValuesKey;
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
index b3b657c4a..b2b4902ad 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
@@ -114,7 +114,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
   private BindValuesKey bindKey(DefaultOrmQuery<Order> query) {
     BindValuesKey key = new BindValuesKey();
-    query.queryBindHash(key);
+    query.queryBindKey(key);
     return key;
   }
 }

From c267366578b7877313f87569b503e77f331a6d8b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 11 Aug 2021 15:32:54 +1200
Subject: [PATCH 368/447] Refactor tidy internals - aList -> expr in for loops
 etc. No functional change.

---
 .../io/ebeaninternal/api/LoadBeanRequest.java | 13 +------
 .../server/core/DefaultServer.java            | 12 +++---
 .../deploy/meta/DeployBeanDescriptor.java     |  6 +--
 .../expression/DefaultExampleExpression.java  | 16 +++-----
 .../expression/DefaultExpressionList.java     | 38 ++++++++-----------
 .../server/expression/JunctionExpression.java |  5 +--
 6 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
index fef666a63..9d72463a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
@@ -92,9 +92,7 @@ public class LoadBeanRequest extends LoadRequest {
    * Return the list of Id values for the beans in the lazy load buffer.
    */
   public List<Object> getIdList() {
-
     List<Object> idList = new ArrayList<>();
-
     BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
     for (EntityBeanIntercept ebi : batch) {
       idList.add(desc.getId(ebi.getOwner()));
@@ -106,10 +104,8 @@ public class LoadBeanRequest extends LoadRequest {
    * Configure the query for lazy loading execution.
    */
   public void configureQuery(SpiQuery<?> query, List<Object> idList) {
-
     query.setMode(SpiQuery.Mode.LAZYLOAD_BEAN);
     query.setPersistenceContext(loadBuffer.getPersistenceContext());
-
     String mode = isLazy() ? "+lazy" : "+query";
     query.setLoadDescription(mode, getDescription());
 
@@ -117,9 +113,7 @@ public class LoadBeanRequest extends LoadRequest {
       // cascade the batch size (if set) for further lazy loading
       query.setLazyLoadBatchSize(getBatchSize());
     }
-
     loadBuffer.configureQuery(query, lazyLoadProperty);
-
     if (idList.size() == 1) {
       query.where().idEq(idList.get(0));
     } else {
@@ -131,19 +125,16 @@ public class LoadBeanRequest extends LoadRequest {
    * Load the beans into the L2 cache if that is requested and check for load failures due to deletes.
    */
   public void postLoad(List<?> list) {
-
     Set<Object> loadedIds = new HashSet<>();
-
     BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
     // collect Ids and maybe load bean cache
-    for (Object aList : list) {
-      EntityBean loadedBean = (EntityBean) aList;
+    for (Object bean : list) {
+      EntityBean loadedBean = (EntityBean) bean;
       loadedIds.add(desc.getId(loadedBean));
     }
     if (isLoadCache()) {
       desc.cacheBeanPutAll(list);
     }
-
     if (lazyLoadProperty != null) {
       for (EntityBeanIntercept ebi : batch) {
         // check if the underlying row in DB was deleted. Mark the bean as 'failed' if
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 2040e3f78..4f0eed00b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2055,17 +2055,15 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return transactionManager;
   }
 
-  public void register(BeanPersistController c) {
-    List<BeanDescriptor<?>> list = beanDescriptorManager.getBeanDescriptorList();
-    for (BeanDescriptor<?> aList : list) {
-      aList.register(c);
+  public void register(BeanPersistController controller) {
+    for (BeanDescriptor<?> desc : beanDescriptorManager.getBeanDescriptorList()) {
+      desc.register(controller);
     }
   }
 
   public void deregister(BeanPersistController c) {
-    List<BeanDescriptor<?>> list = beanDescriptorManager.getBeanDescriptorList();
-    for (BeanDescriptor<?> aList : list) {
-      aList.deregister(c);
+    for (BeanDescriptor<?> desc : beanDescriptorManager.getBeanDescriptorList()) {
+      desc.deregister(c);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 79ca0beb1..f0184948e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -702,13 +702,11 @@ public class DeployBeanDescriptor<T> {
   }
 
   public void sortProperties() {
-
     ArrayList<DeployBeanProperty> list = new ArrayList<>(propMap.values());
     list.sort(PROP_ORDER);
-
     propMap = new LinkedHashMap<>(list.size());
-    for (DeployBeanProperty aList : list) {
-      addBeanProperty(aList);
+    for (DeployBeanProperty property : list) {
+      addBeanProperty(property);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index e6353edd0..cd8a59857 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -137,10 +137,8 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
   @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins whereManyJoins) {
     list = buildExpressions(desc);
-    if (list != null) {
-      for (SpiExpression aList : list) {
-        aList.containsMany(desc, whereManyJoins);
-      }
+    for (SpiExpression expr : list) {
+      expr.containsMany(desc, whereManyJoins);
     }
   }
 
@@ -187,8 +185,8 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
 
   @Override
   public void validate(SpiExpressionValidation validation) {
-    for (SpiExpression aList : list) {
-      aList.validate(validation);
+    for (SpiExpression expr : list) {
+      expr.validate(validation);
     }
   }
 
@@ -229,10 +227,9 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
    */
   @Override
   public void queryPlanHash(StringBuilder builder) {
-
     builder.append("Example[");
-    for (SpiExpression aList : list) {
-      aList.queryPlanHash(builder);
+    for (SpiExpression expr : list) {
+      expr.queryPlanHash(builder);
       builder.append(",");
     }
     builder.append("]");
@@ -264,7 +261,6 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
    * Build the List of expressions.
    */
   private ArrayList<SpiExpression> buildExpressions(BeanDescriptor<?> beanDescriptor) {
-
     ArrayList<SpiExpression> list = new ArrayList<>();
     addExpressions(list, beanDescriptor, entity, null);
     return list;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 97899f091..ed3f57e14 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -110,10 +110,8 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    * @return A single SpiExpression that has the nestedPath set
    */
   SpiExpression wrap(List<SpiExpression> list, String nestedPath, Junction.Type type) {
-
     DefaultExpressionList<T> wrapper = new DefaultExpressionList<>(query, expr, null, list, false);
     wrapper.setAllDocNested(nestedPath);
-
     if (type != null) {
       return new JunctionExpression<>(type, wrapper);
     } else {
@@ -122,15 +120,15 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   void simplifyEntries() {
-    for (SpiExpression element : list) {
-      element.simplify();
+    for (SpiExpression expr : list) {
+      expr.simplify();
     }
   }
 
   @Override
   public void prefixProperty(String path) {
-    for (SpiExpression exp : list) {
-      exp.prefixProperty(path);
+    for (SpiExpression expr : list) {
+      expr.prefixProperty(path);
     }
   }
 
@@ -175,7 +173,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
         context.startNested(allDocNestedPath);
       }
       int size = list.size();
-
       SpiExpression first = list.get(0);
       boolean explicitBool = first instanceof SpiJunction<?>;
       boolean implicitBool = !explicitBool && size > 1;
@@ -211,7 +208,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
 
   @Override
   public void writeDocQuery(DocQueryContext context, SpiExpression idEquals) throws IOException {
-
     if (allDocNestedPath != null) {
       context.startNested(allDocNestedPath);
     }
@@ -228,8 +224,8 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
       if (idEquals != null) {
         idEquals.writeDocQuery(context);
       }
-      for (SpiExpression aList : list) {
-        aList.writeDocQuery(context);
+      for (SpiExpression expr : list) {
+        expr.writeDocQuery(context);
       }
       context.endBool();
     }
@@ -279,16 +275,15 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    */
   @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins whereManyJoins) {
-
-    for (SpiExpression aList : list) {
-      aList.containsMany(desc, whereManyJoins);
+    for (SpiExpression expr : list) {
+      expr.containsMany(desc, whereManyJoins);
     }
   }
 
   @Override
   public void validate(SpiExpressionValidation validation) {
-    for (SpiExpression aList : list) {
-      aList.validate(validation);
+    for (SpiExpression expr : list) {
+      expr.validate(validation);
     }
   }
 
@@ -631,7 +626,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     for (int i = 0, size = list.size(); i < size; i++) {
       SpiExpression expression = list.get(i);
       if (i > 0) {
@@ -643,15 +637,15 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-    for (SpiExpression aList : list) {
-      aList.addBindValues(request);
+    for (SpiExpression expr : list) {
+      expr.addBindValues(request);
     }
   }
 
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
-    for (SpiExpression aList : list) {
-      aList.prepareExpression(request);
+    for (SpiExpression expr : list) {
+      expr.prepareExpression(request);
     }
   }
 
@@ -668,8 +662,8 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     if (allDocNestedPath != null) {
       builder.append("path:").append(allDocNestedPath).append(" ");
     }
-    for (SpiExpression aList : list) {
-      aList.queryPlanHash(builder);
+    for (SpiExpression expr : list) {
+      expr.queryPlanHash(builder);
       builder.append(",");
     }
     builder.append("]");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index a253bbb2b..5637fba7f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -207,9 +207,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   @Override
   public void queryPlanHash(StringBuilder builder) {
     builder.append(type).append("[");
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.queryPlanHash(builder);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.queryPlanHash(builder);
       builder.append(",");
     }
     builder.append("]");

From f50f0192d155bd1cb71b1a5b369a481d75fffe32 Mon Sep 17 00:00:00 2001
From: Thomas Fellner <thomas.fellner@foconis.de>
Date: Wed, 11 Aug 2021 08:47:49 +0200
Subject: [PATCH 369/447] Switch DB2 driver to the publicly available JCC
 driver

---
 ebean-core/pom.xml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index b99bf98fb..5324aec82 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -20,22 +20,13 @@
 
   <profiles>
     <profile>
-      <!-- Note: to use this profile, you need to download manually the db2jcc4 driver.
-        After that, install it into your local maven repository:
-
-        mvn install:install-file \
-          -Dfile=db2jcc4.jar \
-          -DgroupId=com.ibm.jdbc \
-          -DartifactId=db2jcc4 \
-          -Dversion=4.23.42 \
-          -Dpackaging=jar
-      -->
       <id>db2</id>
       <dependencies>
+        <!-- https://mvnrepository.com/artifact/com.ibm.db2/jcc -->
         <dependency>
-          <groupId>com.ibm.jdbc</groupId>
-          <artifactId>db2jcc4</artifactId>
-          <version>4.23.42</version>
+          <groupId>com.ibm.db2</groupId>
+          <artifactId>jcc</artifactId>
+          <version>11.5.5.0</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

From 1a2aba3f56df9c4d58e3e18f1498693492115b66 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 11 Aug 2021 08:54:40 +0200
Subject: [PATCH 370/447] Distinguish between exists and in subquery

---
 .../server/autotune/service/BaseQueryTuner.java        |  3 ++-
 .../main/java/io/ebeaninternal/api/SpiEbeanServer.java |  3 ++-
 .../src/main/java/io/ebeaninternal/api/SpiQuery.java   |  9 +++++++--
 .../io/ebeaninternal/server/core/DefaultServer.java    |  4 ++--
 .../server/expression/ExistsQueryExpression.java       |  3 ++-
 .../server/expression/InQueryExpression.java           |  3 ++-
 .../java/io/ebeaninternal/server/query/SqlTree.java    |  1 +
 .../io/ebeaninternal/server/query/SqlTreeBuilder.java  | 10 +++++++++-
 .../server/querydefn/DefaultOrmQuery.java              |  5 +++--
 .../java/io/ebeaninternal/api/TDSpiEbeanServer.java    |  6 +++---
 .../org/tests/query/cancel/SqlQueryCancelTest.java     |  8 ++++----
 11 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
index af969fd53..b93be5cc8 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java
@@ -146,7 +146,8 @@ public class BaseQueryTuner {
       case ID_LIST:
       case UPDATE:
       case DELETE:
-      case SUBQUERY:
+      case SQ_EXISTS:
+      case SQ_IN:
         return false;
       default:
         // not using autoTune when explicitly loading the l2 bean cache
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index daf6418d0..fae60f49d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -8,6 +8,7 @@ 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.api.SpiQuery.Type;
 import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -149,7 +150,7 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
   /**
    * Compile a query.
    */
-  <T> CQuery<T> compileQuery(Query<T> query, Transaction t);
+  <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction t);
 
   /**
    * Execute the findId's query but without copying the query.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 5ba0b6eeb..12a25fed8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -92,9 +92,14 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
     COUNT(FIND_COUNT, "findCount"),
 
     /**
-     * A subquery used as part of a where clause.
+     * A subquery used as part of an exists where clause.
      */
-    SUBQUERY(FIND_SUBQUERY, "subquery"),
+    SQ_EXISTS(FIND_SUBQUERY, "sqExists"),
+
+    /**
+     * A subquery used as part of an in where clause.
+     */
+    SQ_IN(FIND_SUBQUERY, "sqIn"),
 
     /**
      * Delete query.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 4f0eed00b..c52befdcc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -526,8 +526,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Compile a query. Only valid for ORM queries.
    */
   @Override
-  public <T> CQuery<T> compileQuery(Query<T> query, Transaction t) {
-    SpiOrmQueryRequest<T> qr = createQueryRequest(Type.SUBQUERY, query, t);
+  public <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction t) {
+    SpiOrmQueryRequest<T> qr = createQueryRequest(type, query, t);
     OrmQueryRequest<T> orm = (OrmQueryRequest<T>) qr;
     return cqueryEngine.buildQuery(orm);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 4ba939066..71ca665fe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.SpiQuery.Type;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
 
@@ -82,7 +83,7 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
    */
   protected CQuery<?> compileSubQuery(BeanQueryRequest<?> queryRequest) {
     SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer();
-    return ebeanServer.compileQuery(subQuery, queryRequest.getTransaction());
+    return ebeanServer.compileQuery(Type.SQ_EXISTS, subQuery, queryRequest.getTransaction());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 48647d0c2..a2d6d787c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.SpiQuery.Type;
 import io.ebeaninternal.server.query.CQuery;
 
 import java.io.IOException;
@@ -69,7 +70,7 @@ class InQueryExpression extends AbstractExpression implements UnsupportedDocStor
   private CQuery<?> compileSubQuery(BeanQueryRequest<?> queryRequest) {
 
     SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer();
-    return ebeanServer.compileQuery(subQuery, queryRequest.getTransaction());
+    return ebeanServer.compileQuery(Type.SQ_IN, subQuery, queryRequest.getTransaction());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index 1befa650b..5f548fd59 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -101,6 +101,7 @@ class SqlTree {
    * Return the String for the actual SQL.
    */
   String getSelectSql() {
+    assert selectSql != null : "selectSql was null";
     return selectSql;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 06465355c..a344244c4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -102,7 +102,11 @@ 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() || Type.DELETE == query.getType() || query.isCountDistinct();
+    this.subQuery = Type.SQ_EXISTS == query.getType()
+        || Type.SQ_IN == 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();
@@ -146,6 +150,10 @@ public final class SqlTreeBuilder {
     if (rawSql) {
       return "Not Used";
     }
+    if (query.getType() ==Type.SQ_EXISTS) {
+      // effective query is "where exists (select 1 from ...)"
+      return "1";
+    }
     rootNode.appendSelect(ctx, subQuery);
     return trimComma(ctx.getContent());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index db3a605ea..dea84fb80 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -565,7 +565,8 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * Limit the number of fetch joins to Many properties, mark as query joins as needed.
    */
   private void markQueryJoins() {
-    detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), type != Type.ATTRIBUTE && type != Type.SUBQUERY);
+    detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), 
+        type != Type.ATTRIBUTE && type != Type.SQ_EXISTS && type != Type.SQ_IN);
   }
 
   private boolean isAllowOneManyFetch() {
@@ -578,7 +579,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   @Override
   public void setDefaultSelectClause() {
-    if (type != Type.ATTRIBUTE && type != Type.SUBQUERY) {
+    if (type != Type.ATTRIBUTE && type != Type.SQ_EXISTS && type != Type.SQ_IN) {
       detail.setDefaultSelectClause(beanDescriptor);
     } else if (!detail.hasSelectClause()) {
       // explicit empty select when single attribute query on non-root fetch path
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index b09a0f54e..cb7e613a3 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -45,6 +45,7 @@ import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
+import io.ebeaninternal.api.SpiQuery.Type;
 import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -54,7 +55,6 @@ import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import java.lang.reflect.Type;
 import java.time.Clock;
 import java.util.Collection;
 import java.util.Collections;
@@ -256,7 +256,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public <T> CQuery<T> compileQuery(Query<T> query, Transaction t) {
+  public <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction t) {
     return null;
   }
 
@@ -316,7 +316,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public boolean isSupportedType(Type genericType) {
+  public boolean isSupportedType(java.lang.reflect.Type genericType) {
     return false;
   }
 
diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
index 9fc3d6b57..5fedc53e0 100644
--- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
+++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
@@ -113,8 +113,8 @@ public class SqlQueryCancelTest extends BaseTestCase {
     doCancelOrmAtBegin(Query::findOne);
     doCancelOrmAtBegin(q -> q.setMaxRows(1000).findPagedList().getList()); // untested
     doCancelOrmAtBegin(Query::findSet);
-    doCancelOrmAtBegin(Query::findSingleAttribute);
-    doCancelOrmAtBegin(Query::findSingleAttributeList);
+    doCancelOrmAtBegin(q -> q.select("name").findSingleAttribute());
+    doCancelOrmAtBegin(q -> q.select("name").findSingleAttributeList());
     doCancelOrmAtBegin(Query::findStream);
    //  testDuringRun(Query::findVersions);
     // EBasic has no history support, but it should work if @History is added
@@ -138,8 +138,8 @@ public class SqlQueryCancelTest extends BaseTestCase {
     // findOne cannot be tested, as H2 does the cancel check every 128 rows only
     doCancelOrmDuringRun(q -> q.setMaxRows(1000).findPagedList().getList()); // untested
     doCancelOrmDuringRun(Query::findSet);
-    doCancelOrmDuringRun(Query::findSingleAttribute);
-    doCancelOrmDuringRun(Query::findSingleAttributeList);
+    doCancelOrmDuringRun(q -> q.select("name").findSingleAttribute());
+    doCancelOrmDuringRun(q -> q.select("name").findSingleAttributeList());
     doCancelOrmDuringRun(Query::findStream);
    //  testDuringRun(Query::findVersions);
     // EBasic has no history support, but it should work if @History is added

From 2d240202022ab1e00033aebdd0f278d401aee4a0 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 11 Aug 2021 09:32:21 +0200
Subject: [PATCH 371/447] Added / enhanced test case

---
 .../server/query/SqlTreeBuilder.java          |  2 +-
 .../java/org/tests/query/TestQueryExists.java | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index a344244c4..65fa4f7f8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -150,7 +150,7 @@ public final class SqlTreeBuilder {
     if (rawSql) {
       return "Not Used";
     }
-    if (query.getType() ==Type.SQ_EXISTS) {
+    if (query.getType() == Type.SQ_EXISTS) {
       // effective query is "where exists (select 1 from ...)"
       return "1";
     }
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
index 93155bf9a..f885852b7 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
@@ -1,7 +1,7 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import io.ebeantest.LoggedSql;
 
@@ -21,7 +21,7 @@ public class TestQueryExists extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class)
+    Query<Order> query = DB.find(Order.class)
       .where().gt("id", 1)
       .query();
 
@@ -34,8 +34,8 @@ public class TestQueryExists extends BaseTestCase {
       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();
+    assertThat(DB.find(Order.class).where().gt("id", 1).exists()).isTrue();
+    assertThat(DB.find(Order.class).where().or().gt("id", 1).isNull("shipDate").exists()).isTrue();
   }
 
   @Test
@@ -43,13 +43,13 @@ public class TestQueryExists extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class)
+    Query<Order> query = DB.find(Order.class)
       .where().raw("exists (select 1 from o_order_detail where order_id = t0.id)")
       .query();
 
     List<Order> ordersThatHave = query.findList();
 
-    Query<Order> query2 = Ebean.find(Order.class)
+    Query<Order> query2 = DB.find(Order.class)
       .where().raw("not exists (select 1 from o_order_detail where order_id = t0.id)")
       .query();
 
@@ -67,13 +67,13 @@ public class TestQueryExists extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .where().raw("exists (select 1 from contact where customer_id = t0.id)")
       .query();
 
     List<Customer> customersWithContacts = query.findList();
 
-    Query<Customer> query2 = Ebean.find(Customer.class)
+    Query<Customer> query2 = DB.find(Customer.class)
       .where().raw("not exists (select 1 FROM contact where customer_id = t0.id)")
       .query();
 
@@ -89,26 +89,26 @@ public class TestQueryExists extends BaseTestCase {
   public void testExists() {
     ResetBasicData.reset();
 
-    Query<Order> subQuery = Ebean.find(Order.class).alias("sq").select("id").where().raw("sq.kcustomer_id = qt.id").query();
+    Query<Order> subQuery = DB.find(Order.class).alias("sq").select("id").where().raw("sq.kcustomer_id = qt.id").query();
 
-    Query<Customer> query = Ebean.find(Customer.class).alias("qt").where().exists(subQuery).query();
+    Query<Customer> query = DB.find(Customer.class).alias("qt").where().exists(subQuery).query();
 
     query.findList();
     String sql = query.getGeneratedSql();
 
-    assertThat(sql).contains("exists (");
+    assertThat(sql).contains("exists (select 1 from");
   }
 
   @Test
   public void testNotExists() {
     ResetBasicData.reset();
 
-    Query<Order> subQuery = Ebean.find(Order.class).alias("sq").select("id").where().raw("sq.kcustomer_id = qt.id").query();
-    Query<Customer> query = Ebean.find(Customer.class).alias("qt").where().notExists(subQuery).query();
+    Query<Order> subQuery = DB.find(Order.class).alias("sq").where().raw("sq.kcustomer_id = qt.id").query();
+    Query<Customer> query = DB.find(Customer.class).alias("qt").where().notExists(subQuery).query();
 
     query.findList();
     String sql = query.getGeneratedSql();
 
-    assertThat(sql).contains("not exists (");
+    assertThat(sql).contains("not exists (select 1 from");
   }
 }

From b676476cd257b70f74f60419a093bf3d1972956b Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 11 Aug 2021 20:51:46 +1200
Subject: [PATCH 372/447] Add SpiQuery.Type.defaultSelect() for ATTRIBUTE and
 sub-query type queries

---
 .../java/io/ebeaninternal/api/SpiQuery.java   | 21 +++++++++----
 .../server/query/CQueryBuilder.java           | 30 -------------------
 .../server/querydefn/DefaultOrmQuery.java     |  5 ++--
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 12a25fed8..5a6ae2217 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -84,7 +84,7 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
     /**
      * Find single attribute.
      */
-    ATTRIBUTE(FIND_ATTRIBUTE, "findAttribute"),
+    ATTRIBUTE(FIND_ATTRIBUTE, "findAttribute", false, false),
 
     /**
      * Find rowCount.
@@ -94,12 +94,12 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
     /**
      * A subquery used as part of an exists where clause.
      */
-    SQ_EXISTS(FIND_SUBQUERY, "sqExists"),
+    SQ_EXISTS(FIND_SUBQUERY, "sqExists", false, false),
 
     /**
      * A subquery used as part of an in where clause.
      */
-    SQ_IN(FIND_SUBQUERY, "sqIn"),
+    SQ_IN(FIND_SUBQUERY, "sqIn", false, false),
 
     /**
      * Delete query.
@@ -112,17 +112,21 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
     UPDATE(FIND_UPDATE, "update", true);
 
     private final boolean update;
+    private final boolean defaultSelect;
     private final String profileEventId;
     private final String label;
 
     Type(String profileEventId, String label) {
-      this(profileEventId, label, false);
+      this(profileEventId, label, false, true);
     }
-
     Type(String profileEventId, String label, boolean update) {
+      this(profileEventId, label, update, true);
+    }
+    Type(String profileEventId, String label, boolean update, boolean defaultSelect) {
       this.profileEventId = profileEventId;
       this.label = label;
       this.update = update;
+      this.defaultSelect = defaultSelect;
     }
 
     /**
@@ -132,6 +136,13 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
       return update;
     }
 
+    /**
+     * Return true if this allows default select clause.
+     */
+    public boolean defaultSelect() {
+      return defaultSelect;
+    }
+
     public String profileEventId() {
       return profileEventId;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 41439e4b6..9a4b1d32e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -46,9 +46,7 @@ class CQueryBuilder {
   private final SqlLimiter sqlLimiter;
   private final CQueryBuilderRawSql rawSqlHandler;
   private final Binder binder;
-
   private final boolean selectCountWithAlias;
-
   private final CQueryHistorySupport historySupport;
   private final CQueryDraftSupport draftSupport;
   private final DatabasePlatform dbPlatform;
@@ -79,7 +77,6 @@ class CQueryBuilder {
       if (sb.length() > 0) {
         sb.append(", ");
       }
-
       sb.append(name);
       sb.append(".");
       sb.append(token.trim());
@@ -91,7 +88,6 @@ class CQueryBuilder {
    * Build the delete query.
    */
   <T> CQueryUpdate buildUpdateQuery(boolean deleteRequest, OrmQueryRequest<T> request) {
-
     SpiQuery<T> query = request.getQuery();
     String rootTableAlias = query.getAlias();
     query.setupForDeleteOrUpdate();
@@ -105,7 +101,6 @@ class CQueryBuilder {
     }
 
     predicates.prepare(true);
-
     SqlTree sqlTree = createSqlTree(request, predicates);
 
     String sql;
@@ -114,7 +109,6 @@ class CQueryBuilder {
     } else {
       sql = buildUpdateSql(request, rootTableAlias, predicates, sqlTree);
     }
-
     // cache the query plan
     queryPlan = new CQueryPlan(request, sql, sqlTree, predicates.getLogWhereSql());
     request.putQueryPlan(queryPlan);
@@ -122,7 +116,6 @@ class CQueryBuilder {
   }
 
   private <T> String buildDeleteSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
-
     String alias = alias(rootTableAlias);
     if (sqlTree.noJoins() && !request.getQuery().hasMaxRowsOrFirstRow()) {
       if (dbPlatform.isSupportsDeleteTableAlias()) {
@@ -151,7 +144,6 @@ class CQueryBuilder {
   }
 
   private <T> String buildUpdateSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
-
     StringBuilder sb = new StringBuilder(200);
     sb.append("update ").append(request.getBeanDescriptor().getBaseTable());
     if (rootTableAlias != null) {
@@ -159,7 +151,6 @@ class CQueryBuilder {
     }
     sb.append(" set ").append(predicates.getDbUpdateClause());
     String updateClause = sb.toString();
-
     if (sqlTree.noJoins() && request.isInlineSqlUpdateLimit()) {
       // simple - update table set ... where ...
       return aliasStrip(buildSqlUpdate(updateClause, request, predicates, sqlTree).getSql());
@@ -186,7 +177,6 @@ class CQueryBuilder {
   }
 
   CQueryFetchSingleAttribute buildFetchAttributeQuery(OrmQueryRequest<?> request) {
-
     SpiQuery<?> query = request.getQuery();
     query.setSingleAttribute();
     if (!query.isIncludeSoftDeletes()) {
@@ -218,7 +208,6 @@ class CQueryBuilder {
    * Build the find ids query.
    */
   <T> CQueryFetchSingleAttribute buildFetchIdsQuery(OrmQueryRequest<T> request) {
-
     SpiQuery<T> query = request.getQuery();
     query.setSelectId();
     BeanDescriptor<T> desc = request.getBeanDescriptor();
@@ -246,9 +235,7 @@ class CQueryBuilder {
    * Build the row count query.
    */
   <T> CQueryRowCount buildRowCountQuery(OrmQueryRequest<T> request) {
-
     SpiQuery<T> query = request.getQuery();
-
     // always set the order by to null for row count query
     query.setOrder(null);
     query.setFirstRow(0);
@@ -310,7 +297,6 @@ class CQueryBuilder {
     // cache the query plan
     queryPlan = new CQueryPlan(request, sql, sqlTree, predicates.getLogWhereSql());
     request.putQueryPlan(queryPlan);
-
     return new CQueryRowCount(queryPlan, request, predicates);
   }
 
@@ -334,9 +320,7 @@ class CQueryBuilder {
    * names to physical deployment column names.
    */
   <T> CQuery<T> buildQuery(OrmQueryRequest<T> request) {
-
     CQueryPredicates predicates = new CQueryPredicates(binder, request);
-
     CQueryPlan queryPlan = request.getQueryPlan();
     if (queryPlan != null) {
       // Reuse the query plan so skip generating SqlTree and SQL.
@@ -370,7 +354,6 @@ class CQueryBuilder {
     boolean rawSql = request.isRawSql();
     if (rawSql) {
       queryPlan = new CQueryPlanRawSql(request, res, sqlTree, predicates.getLogWhereSql());
-
     } else {
       queryPlan = new CQueryPlan(request, res, sqlTree, false, predicates.getLogWhereSql());
     }
@@ -380,11 +363,9 @@ class CQueryBuilder {
       // log the query plan based bean type (i.e. ignoring query disabling for logging the sql/plan)
       desc.getReadAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.getFullName(), queryPlan.getAuditQueryKey(), queryPlan.getSql()));
     }
-
     // cache the query plan because we can reuse it and also
     // gather query performance statistics based on it.
     request.putQueryPlan(queryPlan);
-
     return new CQuery<>(request, predicates, queryPlan);
   }
 
@@ -393,18 +374,15 @@ class CQueryBuilder {
    * <p>
    * The SqlTree is immutable after construction and so is safe to use by
    * concurrent threads.
-   * </p>
    * <p>
    * The predicates is used to add additional joins that come from the where or
    * order by clauses that are not already included for the select clause.
-   * </p>
    */
   private SqlTree createSqlTree(OrmQueryRequest<?> request, CQueryPredicates predicates) {
     return createSqlTree(request, predicates, false);
   }
 
   private SqlTree createSqlTree(OrmQueryRequest<?> request, CQueryPredicates predicates, boolean forceColumnAlias) {
-
     if (request.isNativeSql()) {
       return createNativeSqlTree(request, predicates);
     }
@@ -423,9 +401,7 @@ class CQueryBuilder {
    * Create the SqlTree by reading the ResultSetMetaData and mapping table/columns to bean property paths.
    */
   private SqlTree createNativeSqlTree(OrmQueryRequest<?> request, CQueryPredicates predicates) {
-
     SpiQuery<?> query = request.getQuery();
-
     // parse named parameters returning the final sql to execute
     String sql = predicates.parseBindParams(query.getNativeSql());
     if (query.hasMaxRowsOrFirstRow()) {
@@ -469,10 +445,8 @@ class CQueryBuilder {
   }
 
   private SqlTree createRawSqlSqlTree(OrmQueryRequest<?> request, CQueryPredicates predicates) {
-
     BeanDescriptor<?> descriptor = request.getBeanDescriptor();
     ColumnMapping columnMapping = request.getQuery().getRawSql().getColumnMapping();
-
     PathProperties pathProps = new PathProperties();
 
     // convert list of columns into (tree like) PathProperties
@@ -498,12 +472,10 @@ class CQueryBuilder {
     }
 
     OrmQueryDetail detail = new OrmQueryDetail();
-
     // transfer PathProperties into OrmQueryDetail
     for (PathProperties.Props props : pathProps.getPathProps()) {
       detail.fetch(props.getPath(), props.getProperties());
     }
-
     // check if @Id property included in RawSql
     boolean rawNoId = true;
     BeanProperty idProperty = descriptor.getIdProperty();
@@ -511,7 +483,6 @@ class CQueryBuilder {
       // contains the @Id property for the root level bean
       rawNoId = false;
     }
-
     // build SqlTree based on OrmQueryDetail of the RawSql
     return new SqlTreeBuilder(request, predicates, detail, rawNoId).build();
   }
@@ -603,7 +574,6 @@ class CQueryBuilder {
     private void appendSelect() {
       if (selectClause != null) {
         sb.append(selectClause);
-
       } else {
         useSqlLimiter = (query.hasMaxRowsOrFirstRow() && select.getManyProperty() == null);
         if (!useSqlLimiter) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index dea84fb80..b5aeec323 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -565,8 +565,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * Limit the number of fetch joins to Many properties, mark as query joins as needed.
    */
   private void markQueryJoins() {
-    detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), 
-        type != Type.ATTRIBUTE && type != Type.SQ_EXISTS && type != Type.SQ_IN);
+    detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), type.defaultSelect());
   }
 
   private boolean isAllowOneManyFetch() {
@@ -579,7 +578,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   @Override
   public void setDefaultSelectClause() {
-    if (type != Type.ATTRIBUTE && type != Type.SQ_EXISTS && type != Type.SQ_IN) {
+    if (type.defaultSelect()) {
       detail.setDefaultSelectClause(beanDescriptor);
     } else if (!detail.hasSelectClause()) {
       // explicit empty select when single attribute query on non-root fetch path

From c51140b59aadbfa83f5d39b9f3a73eb5a3ae7fbc Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 12 Aug 2021 13:01:07 +1200
Subject: [PATCH 373/447] Add DefaultServer.toString() and tidy DbOffline
 remove unnecessary log message

---
 ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java | 5 -----
 .../java/io/ebeaninternal/server/core/DefaultServer.java     | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java b/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java
index 3c5ca5a7b..9e184ad61 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java
@@ -1,8 +1,6 @@
 package io.ebeaninternal.api;
 
 import io.ebean.annotation.Platform;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Helper to indicate that an EbeanServer should come up offline
@@ -10,8 +8,6 @@ import org.slf4j.LoggerFactory;
  */
 public class DbOffline {
 
-  private static final Logger logger = LoggerFactory.getLogger(DbOffline.class);
-
   private static final String KEY = "ebean.dboffline";
 
   private static boolean generateMigration;
@@ -73,7 +69,6 @@ public class DbOffline {
   public static void reset() {
     generateMigration = false;
     System.clearProperty(KEY);
-    logger.debug("reset");
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index c52befdcc..1c77e06a8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -490,6 +490,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
+  public String toString() {
+    return "Database{" + serverName + "}";
+  }
+
   /**
    * Return the server name.
    */

From eeacad0fb987735a82c45b0c7788232900f27bbb Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 12 Aug 2021 14:36:14 +1200
Subject: [PATCH 374/447] #2307 - ENH: Add
 DatabaseFactory.disableShutdownHook() ... [ alias for
 ShutdownManager.deregisterShutdownHook() ]

---
 .../main/java/io/ebean/DatabaseFactory.java   | 23 +++++++--
 .../java/io/ebean/event/ShutdownManager.java  | 22 ++++-----
 .../server/lib/ShutdownManagerTest.java       | 48 +++++++++++++++++++
 3 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
index 4aace866a..8dbf05fd0 100644
--- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
+++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
@@ -2,6 +2,7 @@ package io.ebean;
 
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.DatabaseConfig;
+import io.ebean.event.ShutdownManager;
 import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;
 
@@ -16,18 +17,15 @@ import java.util.concurrent.locks.ReentrantLock;
  * <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 {
 
@@ -68,6 +66,16 @@ public class DatabaseFactory {
 
   /**
    * Create using the DatabaseConfig object to configure the database.
+   *
+   * <pre>{@code
+   *
+   *   DatabaseConfig config = new DatabaseConfig();
+   *   config.setName("db");
+   *   config.loadProperties();
+   *
+   *   Database database = DatabaseFactory.create(config);
+   *
+   * }</pre>
    */
   public static Database create(DatabaseConfig config) {
     lock.lock();
@@ -115,7 +123,6 @@ public class DatabaseFactory {
    * 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>
    */
   public static void shutdown() {
     lock.lock();
@@ -126,6 +133,14 @@ public class DatabaseFactory {
     }
   }
 
+  /**
+   * Removes the JVM shutdown hook and means the application must shut down ebean
+   * explicitly using {@link DatabaseFactory#shutdown()}.
+   */
+  public static void disableShutdownHook() {
+    ShutdownManager.deregisterShutdownHook();
+  }
+
   private static Database createInternal(DatabaseConfig config) {
     return getContainer(config.getContainerConfig()).createServer(config);
   }
diff --git a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
index f762b0084..4011683ca 100644
--- a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
+++ b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
@@ -14,10 +14,9 @@ import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * Manages the shutdown of the JVM Runtime.
+ * Manages the shutdown of Ebean.
  * <p>
  * Makes sure all the resources are shutdown properly and in order.
- * </p>
  */
 public final class ShutdownManager {
 
@@ -44,6 +43,9 @@ public final class ShutdownManager {
   private ShutdownManager() {
   }
 
+  /**
+   * Registers the container (potentially with cluster management).
+   */
   public static void registerContainer(SpiContainer ebeanContainer) {
     container = ebeanContainer;
   }
@@ -94,7 +96,7 @@ public final class ShutdownManager {
   /**
    * Register the shutdown hook with the Runtime.
    */
-  protected static void registerShutdownHook() {
+  private static void registerShutdownHook() {
     lock.lock();
     try {
       String value = System.getProperty("ebean.registerShutdownHook");
@@ -123,13 +125,10 @@ public final class ShutdownManager {
         // Already run shutdown...
         return;
       }
-
       if (logger.isDebugEnabled()) {
         logger.debug("Shutting down");
       }
-
       stopping = true;
-
       deregisterShutdownHook();
 
       String shutdownRunner = System.getProperty("ebean.shutdown.runnable");
@@ -147,7 +146,6 @@ public final class ShutdownManager {
         // shutdown cluster networking if active
         container.shutdown();
       }
-
       // shutdown any registered servers that have not
       // already been shutdown manually
       for (Database server : databases) {
@@ -158,7 +156,6 @@ public final class ShutdownManager {
           ex.printStackTrace();
         }
       }
-
       if ("true".equalsIgnoreCase(System.getProperty("ebean.datasource.deregisterAllDrivers", "false"))) {
         deregisterAllJdbcDrivers();
       }
@@ -168,15 +165,15 @@ public final class ShutdownManager {
   }
 
   private static void deregisterAllJdbcDrivers() {
-    // This manually deregisters all JDBC drivers
+    // This manually de-registers all JDBC drivers
     Enumeration<Driver> drivers = DriverManager.getDrivers();
     while (drivers.hasMoreElements()) {
       Driver driver = drivers.nextElement();
       try {
-        logger.info("Deregistering jdbc driver: " + driver);
+        logger.info("De-registering jdbc driver: " + driver);
         DriverManager.deregisterDriver(driver);
       } catch (SQLException e) {
-        logger.error("Error deregistering driver " + driver, e);
+        logger.error("Error de-registering driver " + driver, e);
       }
     }
   }
@@ -209,6 +206,9 @@ public final class ShutdownManager {
   }
 
   private static class ShutdownHook extends Thread {
+    private ShutdownHook() {
+      super("EbeanHook");
+    }
     @Override
     public void run() {
       ShutdownManager.shutdown();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java
index e5f8c3853..f643597ed 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java
@@ -2,12 +2,60 @@ package io.ebeaninternal.server.lib;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.event.ShutdownManager;
 import org.junit.Ignore;
 import org.junit.Test;
 
 public class ShutdownManagerTest extends BaseTestCase {
 
+  /**
+   * Run this test manually. Most typical when we want the application code to control shutdown.
+   */
+  @Ignore
+  @Test
+  public void test_disableShutdownHook_shutdownManually() {
+    // disable hook to make sure app code controls when shutdown is executed
+    DatabaseFactory.disableShutdownHook();
+    DB.getDefault();
+
+    System.out.println("shutdown manually ... ");
+    // application code explicitly calls shutdown()
+    DatabaseFactory.shutdown();
+  }
+
+  /**
+   * Run this test manually.
+   */
+  @Ignore
+  @Test
+  public void test_shutdownHook() {
+    DB.getDefault(); // shutdown fired via shutdown hook, default behaviour
+  }
+
+  /**
+   * Run this test manually.
+   */
+  @Ignore
+  @Test
+  public void test_disableShutdownHook() {
+    DB.getDefault();
+    DatabaseFactory.disableShutdownHook(); // no shutdown is run here (not great, don't do this)
+  }
+
+  /**
+   * Run this test manually.
+   */
+  @Ignore
+  @Test
+  public void test_shutdownManually() {
+    DB.getDefault();
+    System.out.println("shutdown manually ... ");
+    // note this removes the shutdown hook, only "useful" if it runs BEFORE a JVM shutdown is invoked (hook invoked)
+    DatabaseFactory.shutdown();
+  }
+
   /**
    * Run this test manually.
    */

From a17683c549adc153981399d0f61c0d7ca36aa9c5 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 12 Aug 2021 16:32:12 +1200
Subject: [PATCH 375/447] #2307 - Tidy ShutdownManager DatabaseFactory only

---
 .../main/java/io/ebean/DatabaseFactory.java   | 19 +++++--------------
 .../server/lib/ShutdownManagerTest.java       |  6 +++---
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
index 8dbf05fd0..588f48c24 100644
--- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
+++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java
@@ -2,7 +2,6 @@ package io.ebean;
 
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.DatabaseConfig;
-import io.ebean.event.ShutdownManager;
 import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;
 
@@ -46,7 +45,7 @@ public class DatabaseFactory {
   public static void initialiseContainer(ContainerConfig containerConfig) {
     lock.lock();
     try {
-      getContainer(containerConfig);
+      container(containerConfig);
     } finally {
       lock.unlock();
     }
@@ -58,7 +57,7 @@ public class DatabaseFactory {
   public static Database create(String name) {
     lock.lock();
     try {
-      return getContainer(null).createServer(name);
+      return container(null).createServer(name);
     } finally {
       lock.unlock();
     }
@@ -133,24 +132,16 @@ public class DatabaseFactory {
     }
   }
 
-  /**
-   * Removes the JVM shutdown hook and means the application must shut down ebean
-   * explicitly using {@link DatabaseFactory#shutdown()}.
-   */
-  public static void disableShutdownHook() {
-    ShutdownManager.deregisterShutdownHook();
-  }
-
   private static Database createInternal(DatabaseConfig config) {
-    return getContainer(config.getContainerConfig()).createServer(config);
+    return container(config.getContainerConfig()).createServer(config);
   }
 
   /**
-   * Get the EbeanContainer initialising it if necessary.
+   * Return the SpiContainer initialising it if necessary.
    *
    * @param containerConfig the configuration controlling clustering communication
    */
-  private static SpiContainer getContainer(ContainerConfig containerConfig) {
+  private static SpiContainer container(ContainerConfig containerConfig) {
     // thread safe in that all calling methods hold lock
     if (container != null) {
       return container;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java
index f643597ed..c48756ed7 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java
@@ -17,12 +17,12 @@ public class ShutdownManagerTest extends BaseTestCase {
   @Test
   public void test_disableShutdownHook_shutdownManually() {
     // disable hook to make sure app code controls when shutdown is executed
-    DatabaseFactory.disableShutdownHook();
+    ShutdownManager.deregisterShutdownHook();
     DB.getDefault();
 
     System.out.println("shutdown manually ... ");
     // application code explicitly calls shutdown()
-    DatabaseFactory.shutdown();
+    ShutdownManager.shutdown();
   }
 
   /**
@@ -41,7 +41,7 @@ public class ShutdownManagerTest extends BaseTestCase {
   @Test
   public void test_disableShutdownHook() {
     DB.getDefault();
-    DatabaseFactory.disableShutdownHook(); // no shutdown is run here (not great, don't do this)
+    ShutdownManager.deregisterShutdownHook(); // no shutdown is run here (not great, don't do this)
   }
 
   /**

From fc7379aabc56b1697872df9c34fffb46fa7a1ea6 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 13 Aug 2021 09:18:31 +1200
Subject: [PATCH 376/447] Tidy internals - server.persist.dml package for
 whitespace and typos

---
 .../server/persist/PstmtFactory.java          |  5 ---
 .../server/persist/dml/DeleteHandler.java     |  2 --
 .../server/persist/dml/DeleteMeta.java        |  8 +----
 .../server/persist/dml/DmlBeanPersister.java  |  6 ----
 .../persist/dml/DmlBeanPersisterFactory.java  |  3 --
 .../server/persist/dml/DmlHandler.java        | 18 ----------
 .../persist/dml/GenerateDmlRequest.java       |  5 ---
 .../server/persist/dml/InsertHandler.java     | 28 +++------------
 .../server/persist/dml/InsertMeta.java        | 21 +++---------
 .../server/persist/dml/MetaFactory.java       | 19 +++--------
 .../server/persist/dml/UpdateHandler.java     |  5 ---
 .../server/persist/dml/UpdateMeta.java        | 11 ------
 .../server/persist/dml/UpdatePlan.java        | 34 -------------------
 13 files changed, 14 insertions(+), 151 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
index cf8b294df..14b24dd3b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
@@ -56,7 +56,6 @@ class PstmtFactory {
     if (t.isLogSql()) {
       t.logSql(TrimLogSql.trim(sql));
     }
-
     Connection conn = t.getInternalConnection();
     PreparedStatement stmt = conn.prepareStatement(sql);
     BatchedPstmt bs = new BatchedPstmt(stmt, false, sql, t);
@@ -68,10 +67,8 @@ class PstmtFactory {
    * Return a callable statement taking into account batch requirements.
    */
   CallableStatement getCstmtBatch(SpiTransaction t, boolean logSql, String sql, BatchPostExecute batchExe) throws SQLException {
-
     BatchedPstmtHolder batch = t.getBatchControl().getPstmtHolder();
     CallableStatement stmt = (CallableStatement) batch.getStmt(sql, batchExe);
-
     if (stmt != null) {
       return stmt;
     }
@@ -79,10 +76,8 @@ class PstmtFactory {
     if (logSql) {
       t.logSql(sql);
     }
-
     Connection conn = t.getInternalConnection();
     stmt = conn.prepareCall(sql);
-
     BatchedPstmt bs = new BatchedPstmt(stmt, false, sql, t);
     batch.addStmt(bs, batchExe);
     return stmt;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
index 7889e94af..9320a49fa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
@@ -29,10 +29,8 @@ public class DeleteHandler extends DmlHandler {
    */
   @Override
   public void bind() throws SQLException {
-
     sql = meta.getSql(persistRequest);
     SpiTransaction t = persistRequest.getTransaction();
-
     PreparedStatement pstmt;
     if (persistRequest.isBatched()) {
       pstmt = getPstmtBatch(t, sql, persistRequest, false);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
index c51a62531..ccb196947 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
@@ -41,9 +41,7 @@ final class DeleteMeta extends BaseMeta {
    * Bind the request based on the concurrency mode.
    */
   public void bind(PersistRequestBean<?> persist, DmlHandler bind) throws SQLException {
-
     EntityBean bean = persist.getEntityBean();
-
     id.dmlBind(bind, bean);
     if (tenantId != null) {
       tenantId.dmlBind(bind, bean);
@@ -58,7 +56,6 @@ final class DeleteMeta extends BaseMeta {
    * get or generate the sql based on the concurrency mode.
    */
   public String getSql(PersistRequestBean<?> request) {
-
     if (id.isEmpty()) {
       throw new IllegalStateException("Can not deleteById on " + request.getFullName() + " as no @Id property");
     }
@@ -77,10 +74,7 @@ final class DeleteMeta extends BaseMeta {
   }
 
   private String genSql(ConcurrencyMode conMode, String table) {
-
-    GenerateDmlRequest request = new GenerateDmlRequest();
-    request.append("delete from ").append(table);
-    request.append(" where ");
+    GenerateDmlRequest request = new GenerateDmlRequest().append("delete from ").append(table).append(" where ");
     return appendWhere(request, conMode);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
index 5c925e8d2..f07d207b8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
@@ -19,11 +19,8 @@ import java.sql.SQLException;
 public final class DmlBeanPersister implements BeanPersister {
 
   private final DatabasePlatform dbPlatform;
-
   private final UpdateMeta updateMeta;
-
   private final InsertMeta insertMeta;
-
   private final DeleteMeta deleteMeta;
 
   DmlBeanPersister(DatabasePlatform dbPlatform, UpdateMeta updateMeta, InsertMeta insertMeta, DeleteMeta deleteMeta) {
@@ -61,7 +58,6 @@ public final class DmlBeanPersister implements BeanPersister {
    * execute request taking batching into account.
    */
   private int execute(PersistRequestBean<?> request, PersistHandler handler) {
-
     boolean batched = request.isBatched();
     try {
       handler.bind();
@@ -72,7 +68,6 @@ public final class DmlBeanPersister implements BeanPersister {
       } else {
         return handler.executeNoBatch();
       }
-
     } catch (SQLException e) {
       // log the error to the transaction log
       String msg = "Error[" + StringHelper.removeNewLines(e.getMessage()) + "]";
@@ -80,7 +75,6 @@ public final class DmlBeanPersister implements BeanPersister {
         request.getTransaction().logSummary(msg);
       }
       throw dbPlatform.translate(msg, e);
-
     } finally {
       if (!batched) {
         handler.close();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java
index a06ac1505..6e349dee1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java
@@ -11,7 +11,6 @@ import io.ebeaninternal.server.persist.BeanPersisterFactory;
 public class DmlBeanPersisterFactory implements BeanPersisterFactory {
 
   private final DatabasePlatform dbPlatform;
-
   private final MetaFactory metaFactory;
 
   public DmlBeanPersisterFactory(DatabasePlatform dbPlatform) {
@@ -24,11 +23,9 @@ public class DmlBeanPersisterFactory implements BeanPersisterFactory {
    */
   @Override
   public BeanPersister create(BeanDescriptor<?> desc) {
-
     if (desc.isDocStoreOnly()) {
       return new DocStoreBeanPersister(GeneratedProperties.of(desc));
     }
-
     UpdateMeta updMeta = metaFactory.createUpdate(desc);
     DeleteMeta delMeta = metaFactory.createDelete(desc);
     InsertMeta insMeta = metaFactory.createInsert(desc);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 0a4bb6b8a..3baeb6551 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -27,28 +27,14 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   private static final short BATCHED_FIRST = 1;
   private static final short BATCHED = 2;
 
-  /**
-   * The originating request.
-   */
   final PersistRequestBean<?> persistRequest;
-
   private final StringBuilder bindLog;
-
   final SpiTransaction transaction;
-
   private final boolean logLevelSql;
-
   private final long now;
-
-  /**
-   * The PreparedStatement used for the dml.
-   */
   DataBind dataBind;
-
   BatchedPstmt batchedPstmt;
-
   String sql;
-
   private short batchedStatus;
 
   DmlHandler(PersistRequestBean<?> persistRequest) {
@@ -226,7 +212,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   }
 
   private void bindInternal(boolean log, Object value, BeanProperty prop) throws SQLException {
-
     if (log) {
       if (bindLog.length() > 0) {
         bindLog.append(",");
@@ -249,14 +234,12 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
    * Check with useGeneratedKeys to get appropriate PreparedStatement.
    */
   PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) throws SQLException {
-
     Connection conn = t.getInternalConnection();
     if (genKeys) {
       // the Id generated is always the first column
       // Required to stop Oracle10 giving us Oracle rowId??
       // Other jdbc drivers seem fine without this hint.
       return conn.prepareStatement(sql, GENERATED_KEY_COLUMNS);
-
     } else {
       return conn.prepareStatement(sql);
     }
@@ -272,7 +255,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
       batchedStatus = batchedPstmt.isEmpty() ? BATCHED_FIRST : BATCHED;
       return batchedPstmt.getStatement(request);
     }
-
     batchedStatus = BATCHED_FIRST;
     PreparedStatement stmt = getPstmt(t, sql, genKeys);
     batchedPstmt = new BatchedPstmt(stmt, genKeys, sql, t);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
index 5093ae111..809115563 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
@@ -6,14 +6,10 @@ package io.ebeaninternal.server.persist.dml;
 public class GenerateDmlRequest {
 
   private final StringBuilder sb = new StringBuilder(100);
-
   private StringBuilder insertBindBuffer;
-
   private String prefix;
   private String prefix2;
-
   private int insertMode;
-
   private int bindColumnCount;
 
   /**
@@ -33,7 +29,6 @@ public class GenerateDmlRequest {
   }
 
   public void appendColumn(String column, String bind) {
-
     ++bindColumnCount;
 
     sb.append(prefix);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index f1508bf50..d9fb1e8f0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -20,24 +20,11 @@ import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
  */
 public class InsertHandler extends DmlHandler {
 
-  /**
-   * The associated InsertMeta data.
-   */
   private final InsertMeta meta;
-
-  /**
-   * Set to true when the key is concatenated.
-   */
-  private final boolean concatinatedKey;
-
-  /**
-   * Flag set when using getGeneratedKeys.
-   */
+  private final boolean concatenatedKey;
   private boolean useGeneratedKeys;
-
   /**
-   * A SQL Select used to fetch back the Id where generatedKeys is not
-   * supported.
+   * SQL Select used to fetch back the Id where generatedKeys is not supported.
    */
   private boolean useSelectLastInsertedId;
 
@@ -47,7 +34,7 @@ public class InsertHandler extends DmlHandler {
   public InsertHandler(PersistRequestBean<?> persist, InsertMeta meta) {
     super(persist);
     this.meta = meta;
-    this.concatinatedKey = meta.isConcatenatedKey();
+    this.concatenatedKey = meta.isConcatenatedKey();
   }
 
   @Override
@@ -60,17 +47,14 @@ public class InsertHandler extends DmlHandler {
    */
   @Override
   public void bind() throws SQLException {
-
     BeanDescriptor<?> desc = persistRequest.getBeanDescriptor();
     EntityBean bean = persistRequest.getEntityBean();
-
     Object idValue = desc.getId(bean);
-
     boolean withId = !isNullOrZero(idValue);
 
     // check to see if we are going to use generated keys
     if (!withId) {
-      if (concatinatedKey) {
+      if (concatenatedKey) {
         // expecting a concatenated key that can
         // be built from supplied AssocOne beans
         withId = meta.deriveConcatenatedId(persistRequest);
@@ -84,10 +68,8 @@ public class InsertHandler extends DmlHandler {
     }
 
     SpiTransaction t = persistRequest.getTransaction();
-
     // get the appropriate sql
     sql = meta.getSql(withId, persistRequest.isPublish());
-
     PreparedStatement pstmt;
     if (persistRequest.isBatched()) {
       pstmt = getPstmtBatch(t, sql, persistRequest, useGeneratedKeys);
@@ -139,7 +121,6 @@ public class InsertHandler extends DmlHandler {
    * For non batch insert with generated keys.
    */
   private void getGeneratedKeys() throws SQLException {
-
     ResultSet rset = dataBind.getPstmt().getGeneratedKeys();
     try {
       setGeneratedKey(rset);
@@ -164,7 +145,6 @@ public class InsertHandler extends DmlHandler {
    * SQL select to fetch back the Id value.
    */
   private void fetchGeneratedKeyUsingSelect() throws SQLException {
-
     PreparedStatement stmt = null;
     ResultSet rset = null;
     try {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
index abaefd095..588b778e7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
@@ -26,28 +26,18 @@ final class InsertMeta {
   private final String sqlWithId;
   private final String sqlDraftNullId;
   private final String sqlDraftWithId;
-
   private final BindableId id;
-
   private final Bindable discriminator;
-
   private final BindableList all;
-
   private final BindableList allExcludeDraftOnly;
-
   private final boolean supportsGetGeneratedKeys;
-
-  private final boolean concatinatedKey;
-
+  private final boolean concatenatedKey;
   /**
    * Used for DB that do not support getGeneratedKeys.
    */
   private final boolean supportsSelectLastInsertedId;
-
   private final Bindable shadowFKey;
-
   private final String[] identityDbColumns;
-
   private final Platform platform;
 
   InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
@@ -66,7 +56,7 @@ final class InsertMeta {
     // only available for single Id property
     if (id.isConcatenated()) {
       // concatenated key
-      this.concatinatedKey = true;
+      this.concatenatedKey = true;
       this.identityDbColumns = null;
       this.sqlNullId = null;
       this.sqlDraftNullId = null;
@@ -75,7 +65,7 @@ final class InsertMeta {
 
     } else {
       // insert sql for db identity or sequence insert
-      this.concatinatedKey = false;
+      this.concatenatedKey = false;
       if (id.getIdentityColumn() == null) {
         this.identityDbColumns = new String[]{};
         this.supportsGetGeneratedKeys = false;
@@ -99,7 +89,7 @@ final class InsertMeta {
    * Return true if this is a concatenated key.
    */
   boolean isConcatenatedKey() {
-    return concatinatedKey;
+    return concatenatedKey;
   }
 
   String[] getIdentityDbColumns() {
@@ -133,7 +123,6 @@ final class InsertMeta {
    * Bind the request based on whether the id value(s) are null.
    */
   public void bind(DmlHandler request, EntityBean bean, boolean withId, boolean publish) throws SQLException {
-
     if (withId) {
       id.dmlBind(request, bean);
     }
@@ -154,7 +143,6 @@ final class InsertMeta {
    * get the sql based whether the id value(s) are null.
    */
   public String getSql(boolean withId, boolean publish) {
-
     if (withId) {
       return publish ? sqlWithId : sqlDraftWithId;
     } else {
@@ -163,7 +151,6 @@ final class InsertMeta {
   }
 
   private String genSql(boolean nullId, String table, boolean draftTable) {
-
     GenerateDmlRequest request = new GenerateDmlRequest();
     request.setInsertSetMode();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
index 6df6d088c..de7c2bb39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
@@ -24,19 +24,17 @@ import java.util.List;
  */
 class MetaFactory {
 
-  private final FactoryBaseProperties baseFact;
-  private final FactoryEmbedded embeddedFact;
-  private final FactoryVersion versionFact = new FactoryVersion();
-  private final FactoryAssocOnes assocOneFact = new FactoryAssocOnes();
-
-  private final FactoryId idFact = new FactoryId();
-
   /**
    * Include Lobs in the base statement. Generally true. Oracle9 used to require
    * a separate statement for Clobs and Blobs.
    */
   private static final boolean includeLobs = true;
 
+  private final FactoryBaseProperties baseFact;
+  private final FactoryEmbedded embeddedFact;
+  private final FactoryVersion versionFact = new FactoryVersion();
+  private final FactoryAssocOnes assocOneFact = new FactoryAssocOnes();
+  private final FactoryId idFact = new FactoryId();
   private final DatabasePlatform dbPlatform;
 
   MetaFactory(DatabasePlatform dbPlatform) {
@@ -52,9 +50,7 @@ class MetaFactory {
    * Create the UpdateMeta for the given bean type.
    */
   UpdateMeta createUpdate(BeanDescriptor<?> desc) {
-
     List<Bindable> setList = new ArrayList<>();
-
     baseFact.create(setList, desc, DmlMode.UPDATE, includeLobs);
     embeddedFact.create(setList, desc, DmlMode.UPDATE, includeLobs);
     assocOneFact.create(setList, desc, DmlMode.UPDATE);
@@ -75,7 +71,6 @@ class MetaFactory {
    * Create the DeleteMeta for the given bean type.
    */
   DeleteMeta createDelete(BeanDescriptor<?> desc) {
-
     BindableId id = idFact.createId(desc);
     Bindable version = versionFact.createForDelete(desc);
     Bindable tenantId = versionFact.createTenantId(desc);
@@ -86,19 +81,15 @@ class MetaFactory {
    * Create the InsertMeta for the given bean type.
    */
   InsertMeta createInsert(BeanDescriptor<?> desc) {
-
     BindableId id = idFact.createId(desc);
 
     List<Bindable> allList = new ArrayList<>();
-
     baseFact.create(allList, desc, DmlMode.INSERT, includeLobs);
     embeddedFact.create(allList, desc, DmlMode.INSERT, includeLobs);
     assocOneFact.create(allList, desc, DmlMode.INSERT);
 
     BindableList allBindable = new BindableList(allList);
-
     BeanPropertyAssocOne<?> unidirectional = desc.getUnidirectional();
-
     Bindable shadowFkey;
     if (unidirectional == null) {
       shadowFkey = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
index 85f96c192..8a3e724c8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
@@ -14,7 +14,6 @@ import java.sql.SQLException;
 public class UpdateHandler extends DmlHandler {
 
   private final UpdateMeta meta;
-
   private boolean emptySetClause;
 
   UpdateHandler(PersistRequestBean<?> persist, UpdateMeta meta) {
@@ -32,18 +31,14 @@ public class UpdateHandler extends DmlHandler {
    */
   @Override
   public void bind() throws SQLException {
-
     SpiUpdatePlan updatePlan = meta.getUpdatePlan(persistRequest);
-
     if (updatePlan.isEmptySetClause()) {
       emptySetClause = true;
       return;
     }
 
     sql = updatePlan.getSql();
-
     SpiTransaction t = persistRequest.getTransaction();
-
     PreparedStatement pstmt;
     if (persistRequest.isBatched()) {
       pstmt = getPstmtBatch(t, sql, persistRequest, false);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
index 49dbbaea4..4b667e521 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
@@ -30,16 +30,12 @@ final class UpdateMeta extends BaseMeta {
    * Bind the request based on the concurrency mode.
    */
   public void bind(PersistRequestBean<?> persist, DmlHandler bind, SpiUpdatePlan updatePlan) throws SQLException {
-
     EntityBean bean = persist.getEntityBean();
-
     updatePlan.bindSet(bind, bean);
-
     id.dmlBind(bind, bean);
     if (tenantId != null) {
       tenantId.dmlBind(bind, bean);
     }
-
     if (persist.getConcurrencyMode() == ConcurrencyMode.VERSION) {
       version.dmlBind(bind, bean);
     }
@@ -53,9 +49,7 @@ final class UpdateMeta extends BaseMeta {
   }
 
   private SpiUpdatePlan getDynamicUpdatePlan(PersistRequestBean<?> persistRequest) {
-
     String key = persistRequest.getUpdatePlanHash();
-
     // check if we can use a cached UpdatePlan
     BeanDescriptor<?> beanDescriptor = persistRequest.getBeanDescriptor();
     SpiUpdatePlan updatePlan = beanDescriptor.getUpdatePlan(key);
@@ -71,20 +65,16 @@ final class UpdateMeta extends BaseMeta {
     BindableList bindableList = new BindableList(list);
 
     ConcurrencyMode mode = persistRequest.getConcurrencyMode();
-
     // build the SQL for this update statement
     String sql = genSql(mode, bindableList, persistRequest.getUpdateTable());
 
     updatePlan = new UpdatePlan(key, mode, sql, bindableList);
-
     // add the UpdatePlan to the cache
     beanDescriptor.putUpdatePlan(key, updatePlan);
-
     return updatePlan;
   }
 
   private String genSql(ConcurrencyMode conMode, BindableList bindableList, String tableName) {
-
     GenerateDmlRequest request = new GenerateDmlRequest();
     request.append("update ").append(tableName).append(" set ");
     request.setUpdateSetMode();
@@ -95,7 +85,6 @@ final class UpdateMeta extends BaseMeta {
       // with the result that nothing is in the set clause
       return null;
     }
-
     request.append(" where ");
     return appendWhere(request, conMode);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
index 9422d83dd..97811b5cf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
@@ -13,26 +13,13 @@ import java.sql.SQLException;
 class UpdatePlan implements SpiUpdatePlan {
 
   private final String key;
-
   private final ConcurrencyMode mode;
-
   private final String sql;
-
   private final Bindable set;
-
   private final long timeCreated;
-
   private final boolean emptySetClause;
-
   private long timeLastUsed;
 
-  /**
-   * Create a non cached UpdatePlan.
-   */
-  UpdatePlan(ConcurrencyMode mode, String sql, Bindable set) {
-    this(null, mode, sql, set);
-  }
-
   /**
    * Create a UpdatePlan with a given key.
    */
@@ -50,9 +37,6 @@ class UpdatePlan implements SpiUpdatePlan {
     return emptySetClause;
   }
 
-  /**
-   * Run the prepared statement binding for the 'update set' properties.
-   */
   @Override
   public void bindSet(DmlHandler bind, EntityBean bean) throws SQLException {
     set.dmlBind(bind, bean);
@@ -60,49 +44,31 @@ class UpdatePlan implements SpiUpdatePlan {
     this.timeLastUsed = System.currentTimeMillis();
   }
 
-  /**
-   * Return the time this plan was created.
-   */
   @Override
   public long getTimeCreated() {
     return timeCreated;
   }
 
-  /**
-   * Return the time this plan was last used.
-   */
   @Override
   public long getTimeLastUsed() {
     return timeLastUsed;
   }
 
-  /**
-   * Return the key.
-   */
   @Override
   public String getKey() {
     return key;
   }
 
-  /**
-   * Return the concurrency mode for this plan.
-   */
   @Override
   public ConcurrencyMode getMode() {
     return mode;
   }
 
-  /**
-   * Return the DML statement.
-   */
   @Override
   public String getSql() {
     return sql;
   }
 
-  /**
-   * Return the Bindable properties for the update set.
-   */
   @Override
   public Bindable getSet() {
     return set;

From 965c1e803fa67806d39e725ec1c640bc933bd830 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Fri, 13 Aug 2021 10:47:14 +0200
Subject: [PATCH 377/447] FIX: mutationDetection = SOURCE works also for
 special json types

---
 .../server/type/DefaultTypeManager.java       |  13 +-
 .../server/type/ScalarTypeJsonList.java       |  66 ++++----
 .../server/type/ScalarTypeJsonMap.java        | 116 +++++++++-----
 .../type/ScalarTypeJsonMapPostgres.java       |  22 +--
 .../server/type/ScalarTypeJsonSet.java        |  68 ++++----
 .../server/type/ScalarTypeJsonListTest.java   |  12 +-
 .../java/org/tests/json/TestOldValue.java     | 120 ++++++++++++++
 .../org/tests/model/json/EBasicOldValue.java  | 146 ++++++++++++++++++
 8 files changed, 446 insertions(+), 117 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/json/TestOldValue.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 1400b2180..4419f1e1f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -289,7 +289,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   @Override
   public ScalarType<?> getDbMapScalarType() {
-    return (postgres) ? hstoreType : ScalarTypeJsonMap.typeFor(false, Types.VARCHAR);
+    return (postgres) ? hstoreType : ScalarTypeJsonMap.typeFor(false, Types.VARCHAR, false);
   }
 
   @Override
@@ -312,7 +312,7 @@ public final class DefaultTypeManager implements TypeManager {
       return arrayTypeSetFactory.typeFor(valueType, nullable);
     }
     // fallback to JSON storage in VARCHAR column
-    return new ScalarTypeJsonSet.Varchar(getDocType(valueType), nullable);
+    return new ScalarTypeJsonSet.Varchar(getDocType(valueType), nullable, false); // TODO: keepSource for @DbArray?
   }
 
   private ScalarType<?> getArrayScalarTypeList(Type valueType, boolean nullable) {
@@ -323,7 +323,7 @@ public final class DefaultTypeManager implements TypeManager {
       return arrayTypeListFactory.typeFor(valueType, nullable);
     }
     // fallback to JSON storage in VARCHAR column
-    return new ScalarTypeJsonList.Varchar(getDocType(valueType), nullable);
+    return new ScalarTypeJsonList.Varchar(getDocType(valueType), nullable, false); // TODO: keepSource for @DbArray?
   }
 
   private Class<? extends Enum<?>> asEnumClass(Type valueType) {
@@ -340,10 +340,11 @@ public final class DefaultTypeManager implements TypeManager {
     Type genericType = prop.getGenericType();
     boolean hasJacksonAnnotations = objectMapperPresent && checkJacksonAnnotations(prop);
 
+    boolean keepSource = prop.getMutationDetection() == MutationDetection.SOURCE;
     if (type.equals(List.class)) {
       DocPropertyType docType = getDocType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
-        return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable());
+        return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource);
       } else {
         return createJsonObjectMapperType(prop, dbType, docType);
       }
@@ -351,14 +352,14 @@ public final class DefaultTypeManager implements TypeManager {
     if (type.equals(Set.class)) {
       DocPropertyType docType = getDocType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
-        return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable());
+        return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource);
       } else {
         return createJsonObjectMapperType(prop, dbType, docType);
       }
     }
     if (type.equals(Map.class)) {
       if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) {
-        return ScalarTypeJsonMap.typeFor(postgres, dbType);
+        return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource);
       } else {
         return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index a196085a6..7ca361405 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -24,24 +24,24 @@ public class ScalarTypeJsonList {
   /**
    * Return the appropriate ScalarType based requested dbType and if Postgres.
    */
-  public static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docType, boolean nullable) {
+  public static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docType, boolean nullable, boolean keepSource) {
     if (postgres) {
       switch (dbType) {
         case DbPlatformType.JSONB:
-          return new ScalarTypeJsonList.JsonB(docType, nullable);
+          return new ScalarTypeJsonList.JsonB(docType, nullable, keepSource);
         case DbPlatformType.JSON:
-          return new ScalarTypeJsonList.Json(docType, nullable);
+          return new ScalarTypeJsonList.Json(docType, nullable, keepSource);
       }
     }
-    return new ScalarTypeJsonList.Varchar(docType, nullable);
+    return new ScalarTypeJsonList.Varchar(docType, nullable, keepSource);
   }
 
   /**
    * List mapped to DB VARCHAR.
    */
   public static class Varchar extends ScalarTypeJsonList.Base {
-    public Varchar(DocPropertyType docType, boolean nullable) {
-      super(Types.VARCHAR, docType, nullable);
+    public Varchar(DocPropertyType docType, boolean nullable, boolean keepSource) {
+      super(Types.VARCHAR, docType, nullable, keepSource);
     }
   }
 
@@ -49,8 +49,8 @@ public class ScalarTypeJsonList {
    * List mapped to Postgres JSON.
    */
   private static class Json extends ScalarTypeJsonList.PgBase {
-    public Json(DocPropertyType docType, boolean nullable) {
-      super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, docType, nullable);
+    public Json(DocPropertyType docType, boolean nullable, boolean keepSource) {
+      super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, docType, nullable, keepSource);
     }
   }
 
@@ -58,8 +58,8 @@ public class ScalarTypeJsonList {
    * List mapped to Postgres JSONB.
    */
   private static class JsonB extends ScalarTypeJsonList.PgBase {
-    public JsonB(DocPropertyType docType, boolean nullable) {
-      super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, docType, nullable);
+    public JsonB(DocPropertyType docType, boolean nullable, boolean keepSource) {
+      super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, docType, nullable, keepSource);
     }
   }
 
@@ -68,14 +68,24 @@ public class ScalarTypeJsonList {
    */
   @SuppressWarnings("rawtypes")
   private abstract static class Base extends ScalarTypeJsonCollection<List> {
+    private final boolean keepSource;
 
-    public Base(int dbType, DocPropertyType docType, boolean nullable) {
+    public Base(int dbType, DocPropertyType docType, boolean nullable, boolean keepSource) {
       super(List.class, dbType, docType, nullable);
+      this.keepSource = keepSource;
+    }
+    
+    @Override
+    public boolean isJsonMapper() {
+      return keepSource;
     }
 
     @Override
     public List read(DataReader reader) throws SQLException {
       String json = reader.getString();
+      if (isJsonMapper()) {
+        reader.pushJson(json);
+      }
       try {
         // parse JSON into modifyAware list
         return EJson.parseList(json, true);
@@ -85,17 +95,15 @@ public class ScalarTypeJsonList {
     }
 
     @Override
-    public void bind(DataBinder binder, List value) throws SQLException {
+    public final void bind(DataBinder binder, List value) throws SQLException {
+      String rawJson = isJsonMapper() ? binder.popJson() : null;
+      if (rawJson == null && value != null) {
+        rawJson = formatValue(value);
+      }
       if (value == null) {
         bindNull(binder);
-      } else if (value.isEmpty()) {
-        binder.setString("[]");
       } else {
-        try {
-          binder.setString(EJson.write(value));
-        } catch (IOException e) {
-          throw new SQLException("Failed to format List into JSON content", e);
-        }
+        bindRawJson(binder, rawJson);
       }
     }
 
@@ -107,9 +115,16 @@ public class ScalarTypeJsonList {
         binder.setString("[]");
       }
     }
+    
+    protected void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
+      binder.setString(rawJson);
+    }
 
     @Override
     public String formatValue(List value) {
+      if (value.isEmpty()) {
+        return "[]"; 
+      }
       try {
         return EJson.write(value);
       } catch (IOException e) {
@@ -144,19 +159,14 @@ public class ScalarTypeJsonList {
 
     final String pgType;
 
-    PgBase(int jdbcType, String pgType, DocPropertyType docType, boolean nullable) {
-      super(jdbcType, docType, nullable);
+    PgBase(int jdbcType, String pgType, DocPropertyType docType, boolean nullable, boolean keepSource) {
+      super(jdbcType, docType, nullable, keepSource);
       this.pgType = pgType;
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public void bind(DataBinder binder, List value) throws SQLException {
-      if (value == null) {
-        bindNull(binder);
-      } else {
-        binder.setObject(PostgresHelper.asObject(pgType, formatValue(value)));
-      }
+    protected void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
+      binder.setObject(PostgresHelper.asObject(pgType, rawJson));
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index 6dd4f900b..507e7012b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -15,6 +15,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -26,27 +27,21 @@ import java.util.Map;
 @SuppressWarnings("rawtypes")
 public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
 
-  private static final ScalarTypeJsonMap CLOB = new ScalarTypeJsonMap.Clob();
-  private static final ScalarTypeJsonMap BLOB = new ScalarTypeJsonMap.Blob();
-  private static final ScalarTypeJsonMap VARCHAR = new ScalarTypeJsonMap.Varchar();
-  private static final ScalarTypeJsonMap JSON = new ScalarTypeJsonMapPostgres.JSON();
-  private static final ScalarTypeJsonMap JSONB = new ScalarTypeJsonMapPostgres.JSONB();
-
   /**
    * Return the ScalarType for the requested dbType and postgres.
    */
-  public static ScalarTypeJsonMap typeFor(boolean postgres, int dbType) {
+  public static ScalarTypeJsonMap typeFor(boolean postgres, int dbType, boolean keepSource) {
     switch (dbType) {
       case Types.VARCHAR:
-        return VARCHAR;
+        return new ScalarTypeJsonMap.Varchar(keepSource);
       case Types.BLOB:
-        return BLOB;
+        return new ScalarTypeJsonMap.Blob(keepSource);
       case Types.CLOB:
-        return CLOB;
+        return new ScalarTypeJsonMap.Clob(keepSource);
       case DbPlatformType.JSONB:
-        return postgres ? JSONB : CLOB;
+        return postgres ? new ScalarTypeJsonMapPostgres.JSONB(keepSource) : new ScalarTypeJsonMap.Clob(keepSource);
       case DbPlatformType.JSON:
-        return postgres ? JSON : CLOB;
+        return postgres ? new ScalarTypeJsonMapPostgres.JSON(keepSource) : new ScalarTypeJsonMap.Clob(keepSource);
       default:
         throw new IllegalStateException("Unknown dbType " + dbType);
     }
@@ -54,41 +49,50 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
 
   public static class Clob extends ScalarTypeJsonMap {
 
-    public Clob() {
-      super(Types.CLOB);
+    public Clob(boolean keepSource) {
+      super(Types.CLOB, keepSource);
     }
 
     @Override
-    public Map read(DataReader reader) throws SQLException {
-      String content = reader.getStringFromStream();
-      if (content == null) {
-        return null;
-      }
-      return parse(content);
+    protected String readJson(DataReader reader) throws SQLException {
+      return reader.getStringFromStream();
     }
   }
 
   public static class Varchar extends ScalarTypeJsonMap {
 
-    public Varchar() {
-      super(Types.VARCHAR);
+    public Varchar(boolean keepSource) {
+      super(Types.VARCHAR, keepSource);
     }
   }
 
   public static class Blob extends ScalarTypeJsonMap {
-    public Blob() {
-      super(Types.BLOB);
+    public Blob(boolean keepSource) {
+      super(Types.BLOB, keepSource);
     }
 
     @Override
     public Map read(DataReader reader) throws SQLException {
       InputStream is = reader.getBinaryStream();
       if (is == null) {
+        if (isJsonMapper()) {
+          reader.pushJson(null);
+        }
         return null;
       }
       try {
-        try (InputStreamReader inputStreamReader = new InputStreamReader(is)) {
-          return parse(inputStreamReader);
+        if (isJsonMapper()) {
+          StringWriter rawJson = new StringWriter();
+           try (InputStreamReader inputStreamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+             inputStreamReader.transferTo(rawJson);
+          }
+           reader.pushJson(rawJson.toString());
+           return parse(rawJson.toString());
+          
+        } else {
+          try (InputStreamReader inputStreamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+            return parse(inputStreamReader);
+          }
         }
       } catch (IOException e) {
         throw new SQLException("Error reading Blob stream from DB", e);
@@ -96,18 +100,22 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
     }
 
     @Override
-    public void bind(DataBinder binder, Map value) throws SQLException {
-      if (value == null) {
-        binder.setNull(Types.BLOB);
-      } else {
-        String rawJson = formatValue(value);
-        binder.setBytes(rawJson.getBytes(StandardCharsets.UTF_8));
-      }
+    protected void bindNull(DataBinder binder) throws SQLException {
+      binder.setNull(Types.BLOB);
     }
+    
+    @Override
+    protected void bindJson(DataBinder binder, String rawJson) throws SQLException {
+      binder.setBytes(rawJson.getBytes(StandardCharsets.UTF_8));
+    }
+    
   }
 
-  public ScalarTypeJsonMap(int jdbcType) {
+  private final boolean keepSource;
+  
+  public ScalarTypeJsonMap(int jdbcType, boolean keepSource) {
     super(Map.class, false, jdbcType);
+    this.keepSource = keepSource;
   }
 
   /**
@@ -125,26 +133,56 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   public boolean isDirty(Object value) {
     return TypeJsonManager.checkIsDirty(value);
   }
+  
+ 
+  
+  @Override
+  public boolean isJsonMapper() {
+    return keepSource;
+  }
+  
 
   @Override
   public Map read(DataReader reader) throws SQLException {
-    String rawJson = reader.getString();
+    String rawJson = readJson(reader);
+    if (isJsonMapper()) {
+      reader.pushJson(rawJson);
+    }
+
     if (rawJson == null) {
       return null;
     }
+
     return parse(rawJson);
   }
 
+
+  protected String readJson(DataReader reader) throws SQLException {
+    return reader.getString();
+  }
+  
   @Override
-  public void bind(DataBinder binder, Map value) throws SQLException {
+  public final void bind(DataBinder binder, Map value) throws SQLException {
+    String rawJson = isJsonMapper() ? binder.popJson() : null;
+    if (rawJson == null && value != null) {
+      rawJson = formatValue(value);
+    }
+
     if (value == null) {
-      binder.setNull(Types.VARCHAR);
+      bindNull(binder);
     } else {
-      String rawJson = formatValue(value);
-      binder.setString(rawJson);
+      bindJson(binder, rawJson);
     }
   }
+  
+  protected void bindNull(DataBinder binder) throws SQLException {
+    binder.setNull(Types.VARCHAR);
+  }
 
+  protected void bindJson(DataBinder binder, String rawJson) throws SQLException {
+    binder.setString(rawJson);
+  }
+  
   @Override
   public Object toJdbcType(Object value) {
     return value;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
index 87eecc5f9..46a585ebc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
@@ -4,7 +4,6 @@ import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataBinder;
 
 import java.sql.SQLException;
-import java.util.Map;
 
 /**
  * Support for the Postgres DB types JSON and JSONB.
@@ -13,15 +12,18 @@ public abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
 
   final String postgresType;
 
-  ScalarTypeJsonMapPostgres(int jdbcType, String postgresType) {
-    super(jdbcType);
+  ScalarTypeJsonMapPostgres(int jdbcType, String postgresType, boolean keepSource) {
+    super(jdbcType, keepSource);
     this.postgresType = postgresType;
   }
 
-  @SuppressWarnings("rawtypes")
   @Override
-  public void bind(DataBinder binder, Map value) throws SQLException {
-    String rawJson = (value == null) ? null : formatValue(value);
+  protected void bindNull(DataBinder binder) throws SQLException {
+    binder.setObject(PostgresHelper.asObject(postgresType, null));
+  }
+  
+  @Override
+  protected void bindJson(DataBinder binder, String rawJson) throws SQLException {
     binder.setObject(PostgresHelper.asObject(postgresType, rawJson));
   }
 
@@ -30,8 +32,8 @@ public abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
    */
   public static class JSON extends ScalarTypeJsonMapPostgres {
 
-    public JSON() {
-      super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE);
+    public JSON(boolean keepSource) {
+      super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, keepSource);
     }
   }
 
@@ -40,8 +42,8 @@ public abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
    */
   public static class JSONB extends ScalarTypeJsonMapPostgres {
 
-    public JSONB() {
-      super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE);
+    public JSONB(boolean keepSource) {
+      super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, keepSource);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index d95adb572..7e728b0d3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -26,24 +26,24 @@ public class ScalarTypeJsonSet {
   /**
    * Return the appropriate ScalarType for the requested dbType and Postgres.
    */
-  public static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docPropertyType, boolean nullable) {
+  public static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
     if (postgres) {
       switch (dbType) {
         case DbPlatformType.JSONB:
-          return new ScalarTypeJsonSet.JsonB(docPropertyType, nullable);
+          return new ScalarTypeJsonSet.JsonB(docPropertyType, nullable, keepSource);
         case DbPlatformType.JSON:
-          return new ScalarTypeJsonSet.Json(docPropertyType, nullable);
+          return new ScalarTypeJsonSet.Json(docPropertyType, nullable, keepSource);
       }
     }
-    return new ScalarTypeJsonSet.Varchar(docPropertyType, nullable);
+    return new ScalarTypeJsonSet.Varchar(docPropertyType, nullable, keepSource);
   }
 
   /**
    * List mapped to DB VARCHAR.
    */
   public static class Varchar extends ScalarTypeJsonSet.Base {
-    public Varchar(DocPropertyType docPropertyType, boolean nullable) {
-      super(Types.VARCHAR, docPropertyType, nullable);
+    public Varchar(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+      super(Types.VARCHAR, docPropertyType, nullable, keepSource);
     }
   }
 
@@ -51,8 +51,8 @@ public class ScalarTypeJsonSet {
    * List mapped to Postgres JSON.
    */
   private static class Json extends ScalarTypeJsonSet.PgBase {
-    public Json(DocPropertyType docPropertyType, boolean nullable) {
-      super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, docPropertyType, nullable);
+    public Json(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+      super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, docPropertyType, nullable, keepSource);
     }
   }
 
@@ -60,8 +60,8 @@ public class ScalarTypeJsonSet {
    * List mapped to Postgres JSONB.
    */
   private static class JsonB extends ScalarTypeJsonSet.PgBase {
-    public JsonB(DocPropertyType docPropertyType, boolean nullable) {
-      super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, docPropertyType, nullable);
+    public JsonB(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+      super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, docPropertyType, nullable, keepSource);
     }
   }
 
@@ -71,13 +71,25 @@ public class ScalarTypeJsonSet {
   @SuppressWarnings("rawtypes")
   private abstract static class Base extends ScalarTypeJsonCollection<Set> {
 
-    public Base(int dbType, DocPropertyType docPropertyType, boolean nullable) {
+    private boolean keepSource;
+    
+    public Base(int dbType, DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
       super(Set.class, dbType, docPropertyType, nullable);
+      this.keepSource = keepSource;
     }
 
+    
+    @Override
+    public boolean isJsonMapper() {
+      return keepSource;
+    }
+    
     @Override
     public Set read(DataReader reader) throws SQLException {
       String json = reader.getString();
+      if (isJsonMapper()) {
+        reader.pushJson(json);
+      }
       try {
         // parse JSON into modifyAware list
         return EJson.parseSet(json, true);
@@ -87,17 +99,15 @@ public class ScalarTypeJsonSet {
     }
 
     @Override
-    public void bind(DataBinder binder, Set value) throws SQLException {
+    public final void bind(DataBinder binder, Set value) throws SQLException {
+      String rawJson = isJsonMapper() ? binder.popJson() : null;
+      if (rawJson == null && value != null) {
+        rawJson = formatValue(value);
+      }
       if (value == null) {
         bindNull(binder);
-      } else if (value.isEmpty()) {
-        binder.setString("[]");
       } else {
-        try {
-          binder.setString(EJson.write(value));
-        } catch (IOException e) {
-          throw new SQLException("Failed to format Set into JSON content", e);
-        }
+        bindRawJson(binder, rawJson);
       }
     }
 
@@ -110,8 +120,15 @@ public class ScalarTypeJsonSet {
       }
     }
 
+    protected void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
+      binder.setString(rawJson);
+    }
+
     @Override
     public String formatValue(Set value) {
+      if (value.isEmpty()) {
+        return "[]";
+      }
       try {
         return EJson.write(value);
       } catch (IOException e) {
@@ -151,19 +168,14 @@ public class ScalarTypeJsonSet {
 
     final String pgType;
 
-    PgBase(int jdbcType, String pgType, DocPropertyType docPropertyType, boolean nullable) {
-      super(jdbcType, docPropertyType, nullable);
+    PgBase(int jdbcType, String pgType, DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+      super(jdbcType, docPropertyType, nullable, keepSource);
       this.pgType = pgType;
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public void bind(DataBinder binder, Set value) throws SQLException {
-      if (value == null) {
-        bindNull(binder);
-      } else {
-        binder.setObject(PostgresHelper.asObject(pgType, formatValue(value)));
-      }
+    protected void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
+      binder.setObject(PostgresHelper.asObject(pgType, rawJson));
     }
 
     @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java
index ff329efac..43ed867ba 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java
@@ -11,19 +11,19 @@ public class ScalarTypeJsonListTest extends BasePlatformArrayTypeFactoryTest {
   @Test
   public void typeFor_expect_nullToEmpty_when_postgresNonNull() throws SQLException {
 
-    assertBindNullTo_PGObjectEmpty(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONB, DocPropertyType.OBJECT, false));
-    assertBindNullTo_PGObjectEmpty(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSON, DocPropertyType.OBJECT, false));
+    assertBindNullTo_PGObjectEmpty(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONB, DocPropertyType.OBJECT, false, false));
+    assertBindNullTo_PGObjectEmpty(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSON, DocPropertyType.OBJECT, false, false));
 
-    assertBindNullTo_EmptyString(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONVarchar, DocPropertyType.OBJECT, false));
+    assertBindNullTo_EmptyString(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONVarchar, DocPropertyType.OBJECT, false, false));
   }
 
   @Test
   public void typeFor_expect_nullToNull_when_nullable() throws SQLException {
 
-    assertBindNullTo_PGObjectNull(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONB, DocPropertyType.OBJECT, true));
-    assertBindNullTo_PGObjectNull(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSON, DocPropertyType.OBJECT, true));
+    assertBindNullTo_PGObjectNull(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONB, DocPropertyType.OBJECT, true, false));
+    assertBindNullTo_PGObjectNull(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSON, DocPropertyType.OBJECT, true, false));
 
-    assertBindNullTo_Null(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONVarchar, DocPropertyType.OBJECT, true));
+    assertBindNullTo_Null(ScalarTypeJsonList.typeFor(true, ExtraDbTypes.JSONVarchar, DocPropertyType.OBJECT, true, false));
   }
 
 }
diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java
new file mode 100644
index 000000000..dec8a9f05
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java
@@ -0,0 +1,120 @@
+package org.tests.json;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import io.ebean.ValuePair;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import io.ebean.text.TextException;
+
+import org.assertj.core.api.SoftAssertions;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.tests.model.json.EBasicJsonList;
+import org.tests.model.json.EBasicOldValue;
+import org.tests.model.json.PlainBean;
+
+import javax.persistence.PersistenceException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+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.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class TestOldValue extends BaseTestCase {
+
+  
+  
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  @Test
+  public void testDbJsonOldValue() throws Exception {
+    EBasicOldValue bean = new EBasicOldValue();
+
+    bean.getStringList().add("sl1");
+    bean.getStringSet().add("ss1");
+    bean.getObjectMap().put("sk1","sm1");
+    bean.getLongList().add(1L);
+    bean.getLongSet().add(1001L);
+    bean.getLongMap().put("lk1",2001L);
+    bean.getIntList().add(2);
+    bean.getIntSet().add(1002);
+    bean.getIntMap().put("ik1",2002);
+
+    DB.save(bean);
+    bean = DB.find(EBasicOldValue.class, bean.getId());
+
+    bean.getStringList().add("sl2");
+    bean.getStringSet().add("ss2");
+    bean.getObjectMap().put("sk2","sm2");
+    bean.getLongList().add(5L);
+    bean.getLongSet().add(1005L);
+    bean.getLongMap().put("lk2",2005L);
+    bean.getIntList().add(6);
+    bean.getIntSet().add(1006);
+    bean.getIntMap().put("ik2",2006);
+
+    
+    Map<String, ValuePair> dirty = DB.getBeanState(bean).getDirtyValues();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(dirty).hasSize(9);
+
+    softly.assertThat((List)dirty.get("stringList").getOldValue()).containsExactly("sl1");
+    softly.assertThat((List)dirty.get("stringList").getNewValue()).containsExactly("sl1", "sl2");
+    softly.assertThat((List)dirty.get("longList").getOldValue()).containsExactly(1L);
+    softly.assertThat((List)dirty.get("longList").getNewValue()).containsExactly(1L, 5L);
+    softly.assertThat((List)dirty.get("intList").getOldValue()).containsExactly(2);
+    softly.assertThat((List)dirty.get("intList").getNewValue()).containsExactly(2, 6);
+
+    softly.assertThat((Set)dirty.get("stringSet").getOldValue()).containsExactly("ss1");
+    softly.assertThat((Set)dirty.get("stringSet").getNewValue()).containsExactly("ss1", "ss2");
+    softly.assertThat((Set)dirty.get("longSet").getOldValue()).containsExactly(1001L);
+    softly.assertThat((Set)dirty.get("longSet").getNewValue()).containsExactly(1001L, 1005L);
+    softly.assertThat((Set)dirty.get("intSet").getOldValue()).containsExactly(1002);
+    softly.assertThat((Set)dirty.get("intSet").getNewValue()).containsExactly(1002, 1006);
+
+    softly.assertThat((Map)dirty.get("objectMap").getOldValue()).containsEntry("sk1","sm1").hasSize(1);
+    softly.assertThat((Map)dirty.get("objectMap").getNewValue()).containsEntry("sk1","sm1").containsEntry("sk2","sm2").hasSize(2);
+    softly.assertThat((Map)dirty.get("longMap").getOldValue()).containsEntry("lk1",2001L).hasSize(1);
+    softly.assertThat((Map)dirty.get("longMap").getNewValue()).containsEntry("lk1",2001L).containsEntry("lk2",2005L).hasSize(2);
+    softly.assertThat((Map)dirty.get("intMap").getOldValue()).containsEntry("ik1",2002).hasSize(1);
+    softly.assertThat((Map)dirty.get("intMap").getNewValue()).containsEntry("ik1",2002).containsEntry("ik2",2006).hasSize(2);
+
+    softly.assertAll();
+
+  }
+  
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  @Test
+  @Ignore("Old value detection does not work for @DbArray")
+  public void testDbArrayOldValue() throws Exception {
+    EBasicOldValue bean = new EBasicOldValue();
+
+    bean.getStringArr().add("sa1");
+  
+
+    DB.save(bean);
+    bean = DB.find(EBasicOldValue.class, bean.getId());
+
+    bean.getStringArr().add("sa2");
+    
+
+    
+    Map<String, ValuePair> dirty = DB.getBeanState(bean).getDirtyValues();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(dirty).hasSize(1);
+
+    softly.assertThat((List)dirty.get("stringArr").getOldValue()).containsExactly("sa1");
+    softly.assertThat((List)dirty.get("stringArr").getNewValue()).containsExactly("sa1", "sa2");
+
+    softly.assertAll();
+
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
new file mode 100644
index 000000000..27a086ad5
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
@@ -0,0 +1,146 @@
+package org.tests.model.json;
+
+import io.ebean.annotation.DbArray;
+import io.ebean.annotation.DbJson;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.*;
+
+import static io.ebean.annotation.MutationDetection.SOURCE;
+
+@Entity
+public class EBasicOldValue {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @DbJson(mutationDetection = SOURCE)
+  Set<String> stringSet = new LinkedHashSet<>();
+
+  @DbJson(mutationDetection = SOURCE)
+  Set<Long> longSet = new LinkedHashSet<>();
+  
+  @DbJson(mutationDetection = SOURCE)
+  Set<Integer> intSet = new LinkedHashSet<>();
+  
+  @DbJson(mutationDetection = SOURCE)
+  List<String> stringList = new ArrayList<>();
+
+  @DbJson(mutationDetection = SOURCE)
+  List<Long> longList = new ArrayList<>();
+  
+  @DbJson(mutationDetection = SOURCE)
+  List<Integer> intList = new ArrayList<>();
+  
+  @DbJson(mutationDetection = SOURCE)
+  Map<String, Object> objectMap = new LinkedHashMap<>();
+
+  @DbJson(mutationDetection = SOURCE)
+  Map<String, Long> longMap = new LinkedHashMap<>();
+  
+  @DbJson(mutationDetection = SOURCE)
+  Map<String, Integer> intMap = new LinkedHashMap<>();
+
+  @DbArray()
+  List<String> stringArr = new ArrayList<>();
+  
+  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> getStringSet() {
+    return stringSet;
+  }
+
+  public void setStringSet(Set<String> stringSet) {
+    this.stringSet = stringSet;
+  }
+
+  public Set<Long> getLongSet() {
+    return longSet;
+  }
+
+  public void setLongSet(Set<Long> longSet) {
+    this.longSet = longSet;
+  }
+
+  public Set<Integer> getIntSet() {
+    return intSet;
+  }
+
+  public void setIntSet(Set<Integer> intSet) {
+    this.intSet = intSet;
+  }
+
+  public List<String> getStringList() {
+    return stringList;
+  }
+
+  public void setStringList(List<String> stringList) {
+    this.stringList = stringList;
+  }
+
+  public List<Long> getLongList() {
+    return longList;
+  }
+
+  public void setLongList(List<Long> longList) {
+    this.longList = longList;
+  }
+
+  public List<Integer> getIntList() {
+    return intList;
+  }
+
+  public void setIntList(List<Integer> intList) {
+    this.intList = intList;
+  }
+
+  public Map<String, Object> getObjectMap() {
+    return objectMap;
+  }
+
+  public void setObjectMap(Map<String, Object> objectMap) {
+    this.objectMap = objectMap;
+  }
+
+  public Map<String, Long> getLongMap() {
+    return longMap;
+  }
+
+  public void setLongMap(Map<String, Long> longMap) {
+    this.longMap = longMap;
+  }
+
+  public Map<String, Integer> getIntMap() {
+    return intMap;
+  }
+
+  public void setIntMap(Map<String, Integer> intMap) {
+    this.intMap = intMap;
+  }
+  
+  public List<String> getStringArr() {
+    return stringArr;
+  }
+
+  public void setStringArr(List<String> stringArr) {
+    this.stringArr = stringArr;
+  }
+
+}

From 6b263919d5ccd5c8f552d3268bbb01eb9ea84e65 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Fri, 13 Aug 2021 11:19:24 +0200
Subject: [PATCH 378/447] handle also JsonNode

---
 .../server/type/DefaultTypeManager.java       |  2 +-
 .../java/org/tests/json/TestOldValue.java     | 31 +++++++------------
 .../org/tests/model/json/EBasicOldValue.java  | 15 +++++++++
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 4419f1e1f..6e1e1f0d7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -364,7 +364,7 @@ public final class DefaultTypeManager implements TypeManager {
         return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
       }
     }
-    if (objectMapperPresent) {
+    if (objectMapperPresent && prop.getMutationDetection() == MutationDetection.DEFAULT) {
       if (type.equals(JsonNode.class)) {
         switch (dbType) {
           case Types.VARCHAR:
diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java
index dec8a9f05..f7bd391e5 100644
--- a/ebean-core/src/test/java/org/tests/json/TestOldValue.java
+++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java
@@ -3,32 +3,19 @@ package org.tests.json;
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.ValuePair;
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.Platform;
-import io.ebean.text.TextException;
 
 import org.assertj.core.api.SoftAssertions;
-import org.ebeantest.LoggedSqlCollector;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.tests.model.json.EBasicJsonList;
 import org.tests.model.json.EBasicOldValue;
-import org.tests.model.json.PlainBean;
 
-import javax.persistence.PersistenceException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-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.assertNull;
-import static org.junit.Assert.assertTrue;
-
 public class TestOldValue extends BaseTestCase {
 
   
@@ -37,6 +24,7 @@ public class TestOldValue extends BaseTestCase {
   @Test
   public void testDbJsonOldValue() throws Exception {
     EBasicOldValue bean = new EBasicOldValue();
+    JsonNodeFactory jnf = new JsonNodeFactory(false);
 
     bean.getStringList().add("sl1");
     bean.getStringSet().add("ss1");
@@ -47,7 +35,9 @@ public class TestOldValue extends BaseTestCase {
     bean.getIntList().add(2);
     bean.getIntSet().add(1002);
     bean.getIntMap().put("ik1",2002);
-
+    
+    bean.setJsonNode(jnf.arrayNode().add("Foo"));
+    
     DB.save(bean);
     bean = DB.find(EBasicOldValue.class, bean.getId());
 
@@ -60,11 +50,11 @@ public class TestOldValue extends BaseTestCase {
     bean.getIntList().add(6);
     bean.getIntSet().add(1006);
     bean.getIntMap().put("ik2",2006);
-
+    ((ArrayNode)bean.getJsonNode()).add("Bar");
     
     Map<String, ValuePair> dirty = DB.getBeanState(bean).getDirtyValues();
     SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(dirty).hasSize(9);
+    softly.assertThat(dirty).hasSize(10);
 
     softly.assertThat((List)dirty.get("stringList").getOldValue()).containsExactly("sl1");
     softly.assertThat((List)dirty.get("stringList").getNewValue()).containsExactly("sl1", "sl2");
@@ -87,6 +77,9 @@ public class TestOldValue extends BaseTestCase {
     softly.assertThat((Map)dirty.get("intMap").getOldValue()).containsEntry("ik1",2002).hasSize(1);
     softly.assertThat((Map)dirty.get("intMap").getNewValue()).containsEntry("ik1",2002).containsEntry("ik2",2006).hasSize(2);
 
+    softly.assertThat((ArrayNode)dirty.get("jsonNode").getOldValue()).hasToString("[\"Foo\"]");
+    softly.assertThat((ArrayNode)dirty.get("jsonNode").getNewValue()).hasToString("[\"Foo\",\"Bar\"]");
+
     softly.assertAll();
 
   }
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
index 27a086ad5..37e805412 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
@@ -5,6 +5,9 @@ import io.ebean.annotation.DbJson;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
 import java.util.*;
 
 import static io.ebean.annotation.MutationDetection.SOURCE;
@@ -44,9 +47,13 @@ public class EBasicOldValue {
   @DbJson(mutationDetection = SOURCE)
   Map<String, Integer> intMap = new LinkedHashMap<>();
 
+  @DbJson(mutationDetection = SOURCE)
+  JsonNode jsonNode;
+  
   @DbArray()
   List<String> stringArr = new ArrayList<>();
   
+  
   public Long getId() {
     return id;
   }
@@ -135,6 +142,14 @@ public class EBasicOldValue {
     this.intMap = intMap;
   }
   
+  public JsonNode getJsonNode() {
+    return jsonNode;
+  }
+  
+  public void setJsonNode(JsonNode jsonNode) {
+    this.jsonNode = jsonNode;
+  }
+  
   public List<String> getStringArr() {
     return stringArr;
   }

From 843b90cbbad96f70667a22785dd1d557ea3e1f96 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Fri, 13 Aug 2021 11:52:31 +0200
Subject: [PATCH 379/447] FIX: mutation info is not restored on cache hit

---
 .../server/deploy/BeanPropertyJsonMapper.java | 13 ++++++++++++
 .../org/tests/changelog/TestChangeLog.java    | 21 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index fdea2e449..f1b77f4bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -5,6 +5,7 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.MutableValueInfo;
 import io.ebean.bean.MutableValueNext;
+import io.ebean.bean.PersistenceContext;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
@@ -104,6 +105,18 @@ public class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
       throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
     }
   }
+  
+  @Override
+  public void setCacheDataValue(EntityBean bean, Object cacheData, PersistenceContext context) {
+    if (cacheData instanceof String) {
+      // parse back from string to support optimisation of java object serialisation
+      final MutableValueInfo hash = createMutableInfo((String)cacheData);
+      bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
+      cacheData = scalarType.parse((String) cacheData);
+    }
+    setValue(bean, cacheData);
+  }
+
 
   private static final class NextPair implements MutableValueNext {
 
diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
index a10a41276..75f8c97bd 100644
--- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -28,7 +28,7 @@ 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.*;
 
 public class TestChangeLog extends BaseTestCase {
 
@@ -158,6 +158,25 @@ public class TestChangeLog extends BaseTestCase {
     assertThat(change.getData()).contains("\"plainBean\":{\"name\":\"B\"");
     assertThat(change.getOldData()).contains("\"plainBean\":{\"name\":\"A\"");
   }
+  
+  @Test
+  public void testMutationWithCache() throws Exception {
+    EBasicChangeLog bean = new EBasicChangeLog();
+    bean.setName("Name1");
+    bean.setPlainBean(new PlainBean("foo", 42));
+    server.save(bean);
+    BeanChange change = firstChange();
+    assertThat(change.getData()).contains("\"plainBean\"");
+
+    server.find(EBasicChangeLog.class, bean.getId()); // load cache
+    bean = server.find(EBasicChangeLog.class, bean.getId()); // hit cache
+    bean.setShortDescription("Desc");
+    server.save(bean);
+
+    change = firstChange();
+    assertThat(change.getData()).doesNotContain("\"plainBean\"");
+  }
+
   private Database createServer() {
 
     DatabaseConfig config = new DatabaseConfig();

From ada8df5755e92292ceeda24eefa02558c860308f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Aug 2021 12:05:30 +1200
Subject: [PATCH 380/447] Improve startup logging messages

---
 .../server/core/DatabasePlatformFactory.java  | 10 +++-----
 .../server/core/DefaultContainer.java         | 25 ++++++-------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index a96907848..9a7c54034 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -36,9 +36,8 @@ import java.sql.SQLException;
 /**
  * Create a DatabasePlatform from the configuration.
  * <p>
- * Will used platform name or use the meta data from the JDBC driver to
+ * Will used platform name or use the metadata from the JDBC driver to
  * determine the platform automatically.
- * </p>
  */
 public class DatabasePlatformFactory {
 
@@ -54,14 +53,12 @@ public class DatabasePlatformFactory {
         logger.info("offline platform [{}]", offlinePlatform);
         return byDatabaseName(offlinePlatform);
       }
-
       if (config.getDatabasePlatformName() != null) {
         // choose based on dbName
         return byDatabaseName(config.getDatabasePlatformName());
       }
-
       if (config.getDataSourceConfig().isOffline()) {
-        throw new PersistenceException("You must specify a DatabasePlatformName when you are offline");
+        throw new PersistenceException("DatabasePlatformName must be specified with offline mode");
       }
       // guess using meta data from driver
       return byDataSource(config.getDataSource());
@@ -142,10 +139,10 @@ public class DatabasePlatformFactory {
    * Find the platform by the metaData.getDatabaseProductName().
    */
   private DatabasePlatform byDatabaseMeta(DatabaseMetaData metaData, Connection connection) throws SQLException {
-
     String dbProductName = metaData.getDatabaseProductName().toLowerCase();
     final int majorVersion = metaData.getDatabaseMajorVersion();
     final int minorVersion = metaData.getDatabaseMinorVersion();
+    logger.debug("platform for productName[{}] version[{}.{}]", dbProductName, majorVersion, minorVersion);
 
     if (dbProductName.contains("oracle")) {
       return oracleVersion(majorVersion);
@@ -206,7 +203,6 @@ public class DatabasePlatformFactory {
     } catch (SQLException e) {
       logger.warn("Error running detection query on Postgres", e);
     }
-
     if (majorVersion <= 9) {
       return new Postgres9Platform();
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 2c8bbfecc..e912b8cbb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -34,7 +34,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class DefaultContainer implements SpiContainer {
 
-  private static final Logger logger = LoggerFactory.getLogger("io.ebean.internal.DefaultContainer");
+  private static final Logger logger = LoggerFactory.getLogger("io.ebean.DB");
 
   private final ReentrantLock lock = new ReentrantLock();
   private final ClusterManager clusterManager;
@@ -77,9 +77,10 @@ public class DefaultContainer implements SpiContainer {
   public SpiEbeanServer createServer(DatabaseConfig config) {
     lock.lock();
     try {
+      long start = System.currentTimeMillis();
       applyConfigServices(config);
       setNamingConvention(config);
-      BootupClasses bootupClasses = getBootupClasses(config);
+      BootupClasses bootupClasses = bootupClasses(config);
 
       boolean online = true;
       if (config.isDocStoreOnly()) {
@@ -101,22 +102,18 @@ public class DefaultContainer implements SpiContainer {
         // use a configured DbEncrypt rather than the platform default
         config.getDatabasePlatform().setDbEncrypt(config.getDbEncrypt());
       }
-
       // inform the NamingConvention of the associated DatabasePlatform
       config.getNamingConvention().setDatabasePlatform(config.getDatabasePlatform());
-
       // executor and l2 caching service setup early (used during server construction)
       SpiBackgroundExecutor executor = createBackgroundExecutor(config);
       InternalConfiguration c = new InternalConfiguration(online, clusterManager, executor, config, bootupClasses);
-
       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
+      // generate and run DDL if required plus other plugins
       if (!DbOffline.isGenerateMigration()) {
         startServer(online, server);
       }
       DbOffline.reset();
+      logger.info("started database[{}] platform[{}] in {}ms", config.getName(), config.getDatabasePlatform().getPlatform(), System.currentTimeMillis() - start);
       return server;
     } finally {
       lock.unlock();
@@ -161,9 +158,8 @@ public class DefaultContainer implements SpiContainer {
    * Get the entities, scalarTypes, Listeners etc combining the class registered
    * ones with the already created instances.
    */
-  private BootupClasses getBootupClasses(DatabaseConfig config) {
-
-    BootupClasses bootup = getBootupClasses1(config);
+  private BootupClasses bootupClasses(DatabaseConfig config) {
+    BootupClasses bootup = bootupClasses1(config);
     bootup.addIdGenerators(config.getIdGenerators());
     bootup.addPersistControllers(config.getPersistControllers());
     bootup.addPostLoaders(config.getPostLoaders());
@@ -173,7 +169,6 @@ public class DefaultContainer implements SpiContainer {
     bootup.addQueryAdapters(config.getQueryAdapters());
     bootup.addServerConfigStartup(config.getServerConfigStartupListeners());
     bootup.addChangeLogInstances(config);
-
     bootup.runServerConfigStartup(config);
     return bootup;
   }
@@ -181,14 +176,12 @@ public class DefaultContainer implements SpiContainer {
   /**
    * Get the class based entities, scalarTypes, Listeners etc.
    */
-  private BootupClasses getBootupClasses1(DatabaseConfig config) {
-
+  private BootupClasses bootupClasses1(DatabaseConfig config) {
     List<Class<?>> entityClasses = config.getClasses();
     if (config.isDisableClasspathSearch() || (entityClasses != null && !entityClasses.isEmpty())) {
       // use classes we explicitly added via configuration
       return new BootupClasses(entityClasses);
     }
-
     return BootupClassPathSearch.search(config);
   }
 
@@ -205,7 +198,6 @@ public class DefaultContainer implements SpiContainer {
    * Set the DatabasePlatform if it has not already been set.
    */
   private void setDatabasePlatform(DatabaseConfig config) {
-
     DatabasePlatform platform = config.getDatabasePlatform();
     if (platform == null) {
       if (config.getTenantMode().isDynamicDataSource()) {
@@ -215,7 +207,6 @@ public class DefaultContainer implements SpiContainer {
       platform = new DatabasePlatformFactory().create(config);
       config.setDatabasePlatform(platform);
     }
-    logger.info("DatabasePlatform name:{} platform:{}", config.getName(), platform.getName());
     platform.configure(config.getPlatformConfig());
   }
 

From 1297324fa9b4e778a9b0f0e8305feda3c06df875 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Aug 2021 13:47:46 +1200
Subject: [PATCH 381/447] Fix where using JDK 10 Reader.transferTo() method
 plus add final to methods and classes

---
 .../server/type/ScalarTypeJsonList.java       |  46 ++++----
 .../server/type/ScalarTypeJsonMap.java        | 111 ++++++++----------
 .../type/ScalarTypeJsonMapPostgres.java       |  18 +--
 .../type/ScalarTypeJsonObjectMapper.java      |  26 ++--
 .../server/type/ScalarTypeJsonSet.java        |  46 ++++----
 5 files changed, 118 insertions(+), 129 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index 7ca361405..699c7ad0f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -19,12 +19,12 @@ import java.util.List;
 /**
  * Types for mapping List in JSON format to DB types VARCHAR, JSON and JSONB.
  */
-public class ScalarTypeJsonList {
+class ScalarTypeJsonList {
 
   /**
    * Return the appropriate ScalarType based requested dbType and if Postgres.
    */
-  public static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docType, boolean nullable, boolean keepSource) {
+  static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docType, boolean nullable, boolean keepSource) {
     if (postgres) {
       switch (dbType) {
         case DbPlatformType.JSONB:
@@ -39,8 +39,8 @@ public class ScalarTypeJsonList {
   /**
    * List mapped to DB VARCHAR.
    */
-  public static class Varchar extends ScalarTypeJsonList.Base {
-    public Varchar(DocPropertyType docType, boolean nullable, boolean keepSource) {
+  static final class Varchar extends ScalarTypeJsonList.Base {
+    Varchar(DocPropertyType docType, boolean nullable, boolean keepSource) {
       super(Types.VARCHAR, docType, nullable, keepSource);
     }
   }
@@ -48,8 +48,8 @@ public class ScalarTypeJsonList {
   /**
    * List mapped to Postgres JSON.
    */
-  private static class Json extends ScalarTypeJsonList.PgBase {
-    public Json(DocPropertyType docType, boolean nullable, boolean keepSource) {
+  private final static class Json extends ScalarTypeJsonList.PgBase {
+    Json(DocPropertyType docType, boolean nullable, boolean keepSource) {
       super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, docType, nullable, keepSource);
     }
   }
@@ -57,8 +57,8 @@ public class ScalarTypeJsonList {
   /**
    * List mapped to Postgres JSONB.
    */
-  private static class JsonB extends ScalarTypeJsonList.PgBase {
-    public JsonB(DocPropertyType docType, boolean nullable, boolean keepSource) {
+  private static final class JsonB extends ScalarTypeJsonList.PgBase {
+    JsonB(DocPropertyType docType, boolean nullable, boolean keepSource) {
       super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, docType, nullable, keepSource);
     }
   }
@@ -68,22 +68,22 @@ public class ScalarTypeJsonList {
    */
   @SuppressWarnings("rawtypes")
   private abstract static class Base extends ScalarTypeJsonCollection<List> {
-    private final boolean keepSource;
+    final boolean keepSource;
 
-    public Base(int dbType, DocPropertyType docType, boolean nullable, boolean keepSource) {
+    private Base(int dbType, DocPropertyType docType, boolean nullable, boolean keepSource) {
       super(List.class, dbType, docType, nullable);
       this.keepSource = keepSource;
     }
-    
+
     @Override
-    public boolean isJsonMapper() {
+    public final boolean isJsonMapper() {
       return keepSource;
     }
 
     @Override
-    public List read(DataReader reader) throws SQLException {
+    public final List read(DataReader reader) throws SQLException {
       String json = reader.getString();
-      if (isJsonMapper()) {
+      if (keepSource) {
         reader.pushJson(json);
       }
       try {
@@ -96,7 +96,7 @@ public class ScalarTypeJsonList {
 
     @Override
     public final void bind(DataBinder binder, List value) throws SQLException {
-      String rawJson = isJsonMapper() ? binder.popJson() : null;
+      String rawJson = keepSource ? binder.popJson() : null;
       if (rawJson == null && value != null) {
         rawJson = formatValue(value);
       }
@@ -115,15 +115,15 @@ public class ScalarTypeJsonList {
         binder.setString("[]");
       }
     }
-    
+
     protected void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
       binder.setString(rawJson);
     }
 
     @Override
-    public String formatValue(List value) {
+    public final String formatValue(List value) {
       if (value.isEmpty()) {
-        return "[]"; 
+        return "[]";
       }
       try {
         return EJson.write(value);
@@ -133,7 +133,7 @@ public class ScalarTypeJsonList {
     }
 
     @Override
-    public List parse(String value) {
+    public final List parse(String value) {
       try {
         return EJson.parseList(value, false);
       } catch (IOException e) {
@@ -142,12 +142,12 @@ public class ScalarTypeJsonList {
     }
 
     @Override
-    public List jsonRead(JsonParser parser) throws IOException {
+    public final List jsonRead(JsonParser parser) throws IOException {
       return EJson.parseList(parser, parser.getCurrentToken());
     }
 
     @Override
-    public void jsonWrite(JsonGenerator writer, List value) throws IOException {
+    public final void jsonWrite(JsonGenerator writer, List value) throws IOException {
       EJson.write(value, writer);
     }
   }
@@ -165,12 +165,12 @@ public class ScalarTypeJsonList {
     }
 
     @Override
-    protected void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
+    protected final void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
       binder.setObject(PostgresHelper.asObject(pgType, rawJson));
     }
 
     @Override
-    protected void bindNull(DataBinder binder) throws SQLException {
+    protected final void bindNull(DataBinder binder) throws SQLException {
       binder.setObject(PostgresHelper.asObject(pgType, nullable ? null : "[]"));
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index 507e7012b..93ecdab79 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -9,13 +9,7 @@ import io.ebean.core.type.DocPropertyType;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringWriter;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -25,12 +19,12 @@ import java.util.Map;
  * Type which maps Map<String,Object> to various DB types (Clob, Varchar, Blob) in JSON format.
  */
 @SuppressWarnings("rawtypes")
-public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
+abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
 
   /**
    * Return the ScalarType for the requested dbType and postgres.
    */
-  public static ScalarTypeJsonMap typeFor(boolean postgres, int dbType, boolean keepSource) {
+  static ScalarTypeJsonMap typeFor(boolean postgres, int dbType, boolean keepSource) {
     switch (dbType) {
       case Types.VARCHAR:
         return new ScalarTypeJsonMap.Varchar(keepSource);
@@ -47,9 +41,8 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
     }
   }
 
-  public static class Clob extends ScalarTypeJsonMap {
-
-    public Clob(boolean keepSource) {
+  private static final class Clob extends ScalarTypeJsonMap {
+    Clob(boolean keepSource) {
       super(Types.CLOB, keepSource);
     }
 
@@ -59,15 +52,14 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
     }
   }
 
-  public static class Varchar extends ScalarTypeJsonMap {
-
-    public Varchar(boolean keepSource) {
+  private static final class Varchar extends ScalarTypeJsonMap {
+    Varchar(boolean keepSource) {
       super(Types.VARCHAR, keepSource);
     }
   }
 
-  public static class Blob extends ScalarTypeJsonMap {
-    public Blob(boolean keepSource) {
+  private static final class Blob extends ScalarTypeJsonMap {
+    Blob(boolean keepSource) {
       super(Types.BLOB, keepSource);
     }
 
@@ -75,23 +67,23 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
     public Map read(DataReader reader) throws SQLException {
       InputStream is = reader.getBinaryStream();
       if (is == null) {
-        if (isJsonMapper()) {
+        if (keepSource) {
           reader.pushJson(null);
         }
         return null;
       }
       try {
-        if (isJsonMapper()) {
-          StringWriter rawJson = new StringWriter();
-           try (InputStreamReader inputStreamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
-             inputStreamReader.transferTo(rawJson);
+        if (keepSource) {
+          StringWriter jsonBuffer = new StringWriter();
+          try (InputStreamReader streamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+            transferTo(streamReader, jsonBuffer);
           }
-           reader.pushJson(rawJson.toString());
-           return parse(rawJson.toString());
-          
+          String rawJson = jsonBuffer.toString();
+          reader.pushJson(rawJson);
+          return parse(rawJson);
         } else {
-          try (InputStreamReader inputStreamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
-            return parse(inputStreamReader);
+          try (InputStreamReader streamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+            return parse(streamReader);
           }
         }
       } catch (IOException e) {
@@ -99,21 +91,29 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
       }
     }
 
+    private static void transferTo(Reader reader, Writer out) throws IOException {
+      char[] buffer = new char[2048];
+      int nRead;
+      while ((nRead = reader.read(buffer, 0, 2048)) >= 0) {
+        out.write(buffer, 0, nRead);
+      }
+    }
+
     @Override
     protected void bindNull(DataBinder binder) throws SQLException {
       binder.setNull(Types.BLOB);
     }
-    
+
     @Override
     protected void bindJson(DataBinder binder, String rawJson) throws SQLException {
       binder.setBytes(rawJson.getBytes(StandardCharsets.UTF_8));
     }
-    
+
   }
 
-  private final boolean keepSource;
-  
-  public ScalarTypeJsonMap(int jdbcType, boolean keepSource) {
+  final boolean keepSource;
+
+  ScalarTypeJsonMap(int jdbcType, boolean keepSource) {
     super(Map.class, false, jdbcType);
     this.keepSource = keepSource;
   }
@@ -122,7 +122,7 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
    * Map is a mutable type. Use the isDirty() method to check for dirty state.
    */
   @Override
-  public boolean isMutable() {
+  public final boolean isMutable() {
     return true;
   }
 
@@ -133,48 +133,41 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   public boolean isDirty(Object value) {
     return TypeJsonManager.checkIsDirty(value);
   }
-  
- 
-  
+
   @Override
-  public boolean isJsonMapper() {
+  public final boolean isJsonMapper() {
     return keepSource;
   }
-  
 
   @Override
   public Map read(DataReader reader) throws SQLException {
     String rawJson = readJson(reader);
-    if (isJsonMapper()) {
+    if (keepSource) {
       reader.pushJson(rawJson);
     }
-
     if (rawJson == null) {
       return null;
     }
-
     return parse(rawJson);
   }
 
-
   protected String readJson(DataReader reader) throws SQLException {
     return reader.getString();
   }
-  
+
   @Override
   public final void bind(DataBinder binder, Map value) throws SQLException {
-    String rawJson = isJsonMapper() ? binder.popJson() : null;
+    String rawJson = keepSource ? binder.popJson() : null;
     if (rawJson == null && value != null) {
       rawJson = formatValue(value);
     }
-
     if (value == null) {
       bindNull(binder);
     } else {
       bindJson(binder, rawJson);
     }
   }
-  
+
   protected void bindNull(DataBinder binder) throws SQLException {
     binder.setNull(Types.VARCHAR);
   }
@@ -182,19 +175,19 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   protected void bindJson(DataBinder binder, String rawJson) throws SQLException {
     binder.setString(rawJson);
   }
-  
+
   @Override
-  public Object toJdbcType(Object value) {
+  public final Object toJdbcType(Object value) {
     return value;
   }
 
   @Override
-  public Map toBeanType(Object value) {
+  public final Map toBeanType(Object value) {
     return (Map) value;
   }
 
   @Override
-  public String formatValue(Map v) {
+  public final String formatValue(Map v) {
     try {
       return EJson.write(v);
     } catch (IOException e) {
@@ -203,7 +196,7 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public Map parse(String value) {
+  public final Map parse(String value) {
     try {
       // return a modify aware map
       return EJson.parseObject(value, true);
@@ -212,7 +205,7 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
     }
   }
 
-  public Map parse(Reader reader) {
+  public final Map parse(Reader reader) {
     try {
       // return a modify aware map
       return EJson.parseObject(reader, true);
@@ -222,17 +215,17 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public Map convertFromMillis(long dateTime) {
+  public final Map convertFromMillis(long dateTime) {
     throw new RuntimeException("Should never be called");
   }
 
   @Override
-  public boolean isDateTimeCapable() {
+  public final boolean isDateTimeCapable() {
     return false;
   }
 
   @Override
-  public Map readData(DataInput dataInput) throws IOException {
+  public final Map readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
       return null;
     } else {
@@ -241,7 +234,7 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public void writeData(DataOutput dataOutput, Map map) throws IOException {
+  public final void writeData(DataOutput dataOutput, Map map) throws IOException {
     if (map == null) {
       dataOutput.writeBoolean(false);
     } else {
@@ -250,17 +243,17 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public void jsonWrite(JsonGenerator writer, Map value) throws IOException {
+  public final void jsonWrite(JsonGenerator writer, Map value) throws IOException {
     EJson.write(value, writer);
   }
 
   @Override
-  public Map jsonRead(JsonParser parser) throws IOException {
+  public final Map jsonRead(JsonParser parser) throws IOException {
     return EJson.parseObject(parser, parser.getCurrentToken());
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public final DocPropertyType getDocType() {
     return DocPropertyType.OBJECT;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
index 46a585ebc..ae33fa0e4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
@@ -8,9 +8,9 @@ import java.sql.SQLException;
 /**
  * Support for the Postgres DB types JSON and JSONB.
  */
-public abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
+abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
 
-  final String postgresType;
+  private final String postgresType;
 
   ScalarTypeJsonMapPostgres(int jdbcType, String postgresType, boolean keepSource) {
     super(jdbcType, keepSource);
@@ -18,21 +18,21 @@ public abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
   }
 
   @Override
-  protected void bindNull(DataBinder binder) throws SQLException {
+  protected final void bindNull(DataBinder binder) throws SQLException {
     binder.setObject(PostgresHelper.asObject(postgresType, null));
   }
-  
+
   @Override
-  protected void bindJson(DataBinder binder, String rawJson) throws SQLException {
+  protected final void bindJson(DataBinder binder, String rawJson) throws SQLException {
     binder.setObject(PostgresHelper.asObject(postgresType, rawJson));
   }
 
   /**
    * ScalarType mapping java Map type to Postgres JSON database type.
    */
-  public static class JSON extends ScalarTypeJsonMapPostgres {
+  static final class JSON extends ScalarTypeJsonMapPostgres {
 
-    public JSON(boolean keepSource) {
+    JSON(boolean keepSource) {
       super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, keepSource);
     }
   }
@@ -40,9 +40,9 @@ public abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
   /**
    * ScalarType mapping java Map type to Postgres JSONB database type.
    */
-  public static class JSONB extends ScalarTypeJsonMapPostgres {
+  static final class JSONB extends ScalarTypeJsonMapPostgres {
 
-    public JSONB(boolean keepSource) {
+    JSONB(boolean keepSource) {
       super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, keepSource);
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 41cb28d49..65cb88cdc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -46,7 +46,7 @@ class ScalarTypeJsonObjectMapper {
   /**
    * No mutation detection on this json property.
    */
-  private static class NoMutationDetection extends Base<Object> {
+  private static final class NoMutationDetection extends Base<Object> {
 
     NoMutationDetection(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
       super(Object.class, jsonManager, field, dbType, docType);
@@ -66,7 +66,7 @@ class ScalarTypeJsonObjectMapper {
   /**
    * Supports HASH and SOURCE dirty detection modes.
    */
-  private static class GenericObject extends Base<Object> {
+  private static final class GenericObject extends Base<Object> {
 
     GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
       super(Object.class, jsonManager, field, dbType, docType);
@@ -167,20 +167,20 @@ class ScalarTypeJsonObjectMapper {
     }
 
     @Override
-    public Object toJdbcType(Object value) {
+    public final Object toJdbcType(Object value) {
       // no type conversion supported
       return value;
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public T toBeanType(Object value) {
+    public final T toBeanType(Object value) {
       // no type conversion supported
       return (T) value;
     }
 
     @Override
-    public String formatValue(T value) {
+    public final String formatValue(T value) {
       try {
         return objectWriter.writeValueAsString(value);
       } catch (JsonProcessingException e) {
@@ -189,7 +189,7 @@ class ScalarTypeJsonObjectMapper {
     }
 
     @Override
-    public T parse(String value) {
+    public final T parse(String value) {
       try {
         return objectReader.readValue(value, deserType);
       } catch (IOException e) {
@@ -198,32 +198,32 @@ class ScalarTypeJsonObjectMapper {
     }
 
     @Override
-    public DocPropertyType getDocType() {
+    public final DocPropertyType getDocType() {
       return docType;
     }
 
     @Override
-    public boolean isDateTimeCapable() {
+    public final boolean isDateTimeCapable() {
       return false;
     }
 
     @Override
-    public T convertFromMillis(long dateTime) {
+    public final T convertFromMillis(long dateTime) {
       throw new IllegalStateException("Not supported");
     }
 
     @Override
-    public T jsonRead(JsonParser parser) throws IOException {
+    public final T jsonRead(JsonParser parser) throws IOException {
       return objectReader.readValue(parser, deserType);
     }
 
     @Override
-    public void jsonWrite(JsonGenerator writer, T value) throws IOException {
+    public final void jsonWrite(JsonGenerator writer, T value) throws IOException {
       objectWriter.writeValue(writer, value);
     }
 
     @Override
-    public T readData(DataInput dataInput) throws IOException {
+    public final T readData(DataInput dataInput) throws IOException {
       if (!dataInput.readBoolean()) {
         return null;
       } else {
@@ -232,7 +232,7 @@ class ScalarTypeJsonObjectMapper {
     }
 
     @Override
-    public void writeData(DataOutput dataOutput, T value) throws IOException {
+    public final void writeData(DataOutput dataOutput, T value) throws IOException {
       if (value == null) {
         dataOutput.writeBoolean(false);
       } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index 7e728b0d3..86a39443e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -21,12 +21,12 @@ import java.util.Set;
 /**
  * Types for mapping List in JSON format to DB types VARCHAR, JSON and JSONB.
  */
-public class ScalarTypeJsonSet {
+final class ScalarTypeJsonSet {
 
   /**
    * Return the appropriate ScalarType for the requested dbType and Postgres.
    */
-  public static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+  static ScalarType<?> typeFor(boolean postgres, int dbType, DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
     if (postgres) {
       switch (dbType) {
         case DbPlatformType.JSONB:
@@ -41,7 +41,7 @@ public class ScalarTypeJsonSet {
   /**
    * List mapped to DB VARCHAR.
    */
-  public static class Varchar extends ScalarTypeJsonSet.Base {
+  static final class Varchar extends ScalarTypeJsonSet.Base {
     public Varchar(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
       super(Types.VARCHAR, docPropertyType, nullable, keepSource);
     }
@@ -50,8 +50,8 @@ public class ScalarTypeJsonSet {
   /**
    * List mapped to Postgres JSON.
    */
-  private static class Json extends ScalarTypeJsonSet.PgBase {
-    public Json(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+  private static final class Json extends ScalarTypeJsonSet.PgBase {
+    private Json(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
       super(DbPlatformType.JSON, PostgresHelper.JSON_TYPE, docPropertyType, nullable, keepSource);
     }
   }
@@ -59,35 +59,31 @@ public class ScalarTypeJsonSet {
   /**
    * List mapped to Postgres JSONB.
    */
-  private static class JsonB extends ScalarTypeJsonSet.PgBase {
-    public JsonB(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+  private static final class JsonB extends ScalarTypeJsonSet.PgBase {
+    private JsonB(DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
       super(DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE, docPropertyType, nullable, keepSource);
     }
   }
 
-  /**
-   * Base class for List handling.
-   */
   @SuppressWarnings("rawtypes")
   private abstract static class Base extends ScalarTypeJsonCollection<Set> {
 
-    private boolean keepSource;
-    
-    public Base(int dbType, DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
+    final boolean keepSource;
+
+    private Base(int dbType, DocPropertyType docPropertyType, boolean nullable, boolean keepSource) {
       super(Set.class, dbType, docPropertyType, nullable);
       this.keepSource = keepSource;
     }
 
-    
     @Override
-    public boolean isJsonMapper() {
+    public final boolean isJsonMapper() {
       return keepSource;
     }
-    
+
     @Override
-    public Set read(DataReader reader) throws SQLException {
+    public final Set read(DataReader reader) throws SQLException {
       String json = reader.getString();
-      if (isJsonMapper()) {
+      if (keepSource) {
         reader.pushJson(json);
       }
       try {
@@ -100,7 +96,7 @@ public class ScalarTypeJsonSet {
 
     @Override
     public final void bind(DataBinder binder, Set value) throws SQLException {
-      String rawJson = isJsonMapper() ? binder.popJson() : null;
+      String rawJson = keepSource ? binder.popJson() : null;
       if (rawJson == null && value != null) {
         rawJson = formatValue(value);
       }
@@ -125,7 +121,7 @@ public class ScalarTypeJsonSet {
     }
 
     @Override
-    public String formatValue(Set value) {
+    public final String formatValue(Set value) {
       if (value.isEmpty()) {
         return "[]";
       }
@@ -137,7 +133,7 @@ public class ScalarTypeJsonSet {
     }
 
     @Override
-    public Set parse(String value) {
+    public final Set parse(String value) {
       try {
         return convertList(EJson.parseList(value));
       } catch (IOException e) {
@@ -146,12 +142,12 @@ public class ScalarTypeJsonSet {
     }
 
     @Override
-    public Set jsonRead(JsonParser parser) throws IOException {
+    public final Set jsonRead(JsonParser parser) throws IOException {
       return convertList(EJson.parseList(parser, parser.getCurrentToken()));
     }
 
     @Override
-    public void jsonWrite(JsonGenerator writer, Set value) throws IOException {
+    public final void jsonWrite(JsonGenerator writer, Set value) throws IOException {
       EJson.write(value, writer);
     }
 
@@ -174,12 +170,12 @@ public class ScalarTypeJsonSet {
     }
 
     @Override
-    protected void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
+    protected final void bindRawJson(DataBinder binder, String rawJson) throws SQLException {
       binder.setObject(PostgresHelper.asObject(pgType, rawJson));
     }
 
     @Override
-    protected void bindNull(DataBinder binder) throws SQLException {
+    protected final void bindNull(DataBinder binder) throws SQLException {
       binder.setObject(PostgresHelper.asObject(pgType, nullable ? null : "[]"));
     }
   }

From 587b2e3075f359941d72fa67eb2e3676b5eba23c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Aug 2021 14:09:44 +1200
Subject: [PATCH 382/447] #2310 Tidy to only cast once

---
 .../server/deploy/BeanPropertyJsonMapper.java            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
index f1b77f4bd..bb234664f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java
@@ -19,7 +19,7 @@ import java.util.Objects;
 /**
  * Handle json property with MutationDetection of SOURCE or HASH only.
  */
-public class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
+public final class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
 
   private final boolean sourceDetection;
 
@@ -105,14 +105,15 @@ public class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
       throw new PersistenceException("Error readSet on " + descriptor + "." + name, e);
     }
   }
-  
+
   @Override
   public void setCacheDataValue(EntityBean bean, Object cacheData, PersistenceContext context) {
     if (cacheData instanceof String) {
       // parse back from string to support optimisation of java object serialisation
-      final MutableValueInfo hash = createMutableInfo((String)cacheData);
+      final String jsonContent = (String) cacheData;
+      final MutableValueInfo hash = createMutableInfo(jsonContent);
       bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
-      cacheData = scalarType.parse((String) cacheData);
+      cacheData = scalarType.parse(jsonContent);
     }
     setValue(bean, cacheData);
   }

From ebc0fabbdb05fff1db1e05e1d883cbedc4ed8fcf Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Aug 2021 14:15:03 +1200
Subject: [PATCH 383/447] #2311 - Fix BindPadding for empty list

---
 .../src/main/java/io/ebeaninternal/server/core/BindPadding.java | 2 +-
 .../test/java/io/ebeaninternal/server/core/BindPaddingTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BindPadding.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BindPadding.java
index 75963723e..8659fabfd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BindPadding.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BindPadding.java
@@ -33,7 +33,7 @@ public final class BindPadding {
    * 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) {
+    if (size <= 1) {
       return 0;
     }
     if (size <= 5) {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java
index d0363d2c6..483963fcc 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java
@@ -29,7 +29,7 @@ public class BindPaddingTest {
 
   @Test
   public void padding() {
-
+    assertEquals(0, BindPadding.padding(0));
     assertEquals(0, BindPadding.padding(1));
     assertEquals(3, BindPadding.padding(2));
     assertEquals(2, BindPadding.padding(3));

From 82c12b1565adde4339602a5a37e1025b11424a25 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Aug 2021 14:50:43 +1200
Subject: [PATCH 384/447] #2312 - Refactor internals - make more classes final
 in persist packages

---
 .../server/persist/BatchDepthComparator.java       |  2 +-
 .../server/persist/BatchDepthOrder.java            |  4 ++--
 .../server/persist/BatchedBeanHolder.java          |  2 +-
 .../ebeaninternal/server/persist/BatchedPstmt.java |  2 +-
 .../server/persist/BatchedPstmtHolder.java         |  2 +-
 .../io/ebeaninternal/server/persist/Binder.java    |  2 +-
 .../server/persist/DeleteIdRequest.java            |  2 +-
 .../server/persist/DeleteUnloadedForeignKeys.java  |  2 +-
 .../io/ebeaninternal/server/persist/DmlUtil.java   |  2 +-
 .../server/persist/ExeCallableSql.java             | 10 +---------
 .../ebeaninternal/server/persist/ExeOrmUpdate.java | 10 +---------
 .../ebeaninternal/server/persist/ExeUpdateSql.java | 14 +-------------
 .../ebeaninternal/server/persist/MergeContext.java |  2 +-
 .../ebeaninternal/server/persist/MergeHandler.java | 10 +---------
 .../io/ebeaninternal/server/persist/MergeNode.java | 13 +++++--------
 .../server/persist/MergeNodeAssocManyToMany.java   |  8 +-------
 .../server/persist/MergeNodeAssocOne.java          |  3 +--
 .../server/persist/MergeNodeAssocOneToMany.java    |  5 +----
 .../ebeaninternal/server/persist/MergeRequest.java |  3 +--
 .../server/persist/MultiValueWrapper.java          |  2 +-
 .../ebeaninternal/server/persist/PstmtFactory.java |  5 +----
 .../ebeaninternal/server/persist/SaveManyBase.java |  8 ++++----
 .../server/persist/SaveManyBeans.java              |  2 +-
 .../server/persist/SaveManyElementCollection.java  |  2 +-
 .../persist/SaveManyElementCollectionMap.java      |  2 +-
 .../ebeaninternal/server/persist/TrimLogSql.java   |  2 +-
 .../ebeaninternal/server/persist/dml/BaseMeta.java |  4 +---
 .../server/persist/dml/DeleteHandler.java          |  2 +-
 .../server/persist/dml/DeleteMeta.java             |  1 -
 .../server/persist/dml/DmlBeanPersister.java       |  2 +-
 .../persist/dml/DmlBeanPersisterFactory.java       |  2 +-
 .../server/persist/dml/DocStoreBeanPersister.java  |  2 +-
 .../server/persist/dml/GenerateDmlRequest.java     | 12 ++----------
 .../server/persist/dml/GeneratedProperties.java    |  2 +-
 .../persist/dml/GeneratedPropertyCollector.java    |  2 +-
 .../server/persist/dml/InsertHandler.java          |  2 +-
 .../server/persist/dml/MetaFactory.java            |  2 +-
 .../server/persist/dml/UpdateHandler.java          |  2 +-
 .../server/persist/dml/UpdatePlan.java             |  2 +-
 .../server/persist/dmlbind/BindableAssocOne.java   |  9 ++++-----
 .../persist/dmlbind/BindableAssocTenant.java       |  3 +--
 .../persist/dmlbind/BindableDiscriminator.java     |  2 +-
 .../server/persist/dmlbind/BindableEmbedded.java   |  6 +++---
 .../persist/dmlbind/BindableEncryptedProperty.java |  4 ++--
 .../server/persist/dmlbind/BindableIdEmpty.java    |  2 +-
 .../server/persist/dmlbind/BindableIdScalar.java   |  4 ++--
 .../server/persist/dmlbind/BindableList.java       |  2 +-
 .../persist/dmlbind/BindableOrderColumn.java       |  3 +--
 .../server/persist/dmlbind/BindableProperty.java   | 11 +++++------
 .../dmlbind/BindablePropertyJsonInsert.java        |  2 +-
 .../dmlbind/BindablePropertyJsonUpdate.java        |  2 +-
 .../persist/dmlbind/BindablePropertyVersion.java   |  4 ++--
 .../persist/dmlbind/BindableUnidirectional.java    |  9 +--------
 .../server/persist/dmlbind/FactoryAssocOnes.java   |  6 +-----
 .../persist/dmlbind/FactoryBaseProperties.java     |  4 +---
 .../server/persist/dmlbind/FactoryEmbedded.java    |  3 +--
 .../server/persist/dmlbind/FactoryId.java          |  7 +------
 .../server/persist/dmlbind/FactoryProperty.java    |  2 +-
 .../server/persist/dmlbind/FactoryVersion.java     |  9 +--------
 .../persist/dmlbind/MatchedImportedEmbedded.java   |  4 +---
 .../persist/dmlbind/MatchedImportedFactory.java    | 14 +++-----------
 .../persist/dmlbind/MatchedImportedScalar.java     |  4 +---
 .../server/persist/platform/MultiValueBind.java    |  1 -
 .../persist/platform/PostgresMultiValueBind.java   |  2 +-
 64 files changed, 85 insertions(+), 192 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java
index 7606599d9..66756b4a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java
@@ -12,7 +12,7 @@ import java.util.Comparator;
  * keys from inserts. These values are required to persist the 'detail' beans.
  * </p>
  */
-class BatchDepthComparator implements Comparator<BatchedBeanHolder>, Serializable {
+final class BatchDepthComparator implements Comparator<BatchedBeanHolder>, Serializable {
 
   private static final long serialVersionUID = 264611821665757991L;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
index 3817f43bd..bb0b4bcfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchDepthOrder.java
@@ -6,7 +6,7 @@ import java.util.Map;
 /**
  * Helper to determine batch execution order for BatchedBeanHolders.
  */
-class BatchDepthOrder {
+final class BatchDepthOrder {
 
   private final Map<Integer, Counter> map = new HashMap<>();
 
@@ -22,7 +22,7 @@ class BatchDepthOrder {
     map.clear();
   }
 
-  private static class Counter {
+  private static final class Counter {
 
     int count;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
index db43c32d0..db6d85a35 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java
+++ b/ebean-core/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>
  */
-class BatchedBeanHolder {
+final class BatchedBeanHolder {
 
   /**
    * The owning queue.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
index 0a764e35b..9afd4d6e8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
@@ -20,7 +20,7 @@ import java.util.List;
  * This can hold CallableStatements as well.
  * </p>
  */
-public class BatchedPstmt implements SpiProfileTransactionEvent {
+public final class BatchedPstmt implements SpiProfileTransactionEvent {
 
   private static final Logger log = LoggerFactory.getLogger(BatchedPstmt.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
index 4bd892bd4..50ed43900 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -15,7 +15,7 @@ import java.util.Map;
  * statements of a single 'depth' at any given time.
  * </p>
  */
-public class BatchedPstmtHolder {
+public final class BatchedPstmtHolder {
 
   /**
    * A Map of the statements using a String key. This is used so that the same
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 600a7e21a..bec0223d0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * Binds bean values to a PreparedStatement.
  */
-public class Binder {
+public final class Binder {
 
   private static final Logger logger = LoggerFactory.getLogger(Binder.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
index e086e2630..760d9eda3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java
@@ -5,7 +5,7 @@ import io.ebean.Transaction;
 import io.ebean.event.BeanDeleteIdRequest;
 import io.ebeaninternal.api.SpiEbeanServer;
 
-class DeleteIdRequest implements BeanDeleteIdRequest {
+final class DeleteIdRequest implements BeanDeleteIdRequest {
 
   private final EbeanServer server;
   private final Transaction transaction;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
index c3065b779..1c258b5bb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
@@ -21,7 +21,7 @@ import java.util.List;
  * helps fetch the foreign keys and delete the appropriate rows.
  * </p>
  */
-class DeleteUnloadedForeignKeys {
+final class DeleteUnloadedForeignKeys {
 
   private final List<BeanPropertyAssocOne<?>> propList = new ArrayList<>(4);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DmlUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DmlUtil.java
index 46ce61d33..c7693f6e8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DmlUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DmlUtil.java
@@ -4,7 +4,7 @@ package io.ebeaninternal.server.persist;
 /**
  * Utility object with helper methods for DML.
  */
-public class DmlUtil {
+public final class DmlUtil {
 
   /**
    * Return true if the value is null or a Numeric 0 (for primitive int's and long's) or Option empty.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
index 2c01fcd31..fc2c1e0e5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java
@@ -13,10 +13,9 @@ import java.sql.SQLException;
 /**
  * Handles the execution of CallableSql requests.
  */
-class ExeCallableSql {
+final class ExeCallableSql {
 
   private final Binder binder;
-
   private final PstmtFactory pstmtFactory;
 
   ExeCallableSql(Binder binder) {
@@ -28,9 +27,7 @@ class ExeCallableSql {
    * execute the CallableSql requests.
    */
   public int execute(PersistRequestCallableSql request) {
-
     boolean batchThisRequest = request.isBatchThisRequest();
-
     CallableStatement cstmt = null;
     try {
       cstmt = bindStmt(request, batchThisRequest);
@@ -58,18 +55,15 @@ class ExeCallableSql {
 
 
   private CallableStatement bindStmt(PersistRequestCallableSql request, boolean batchThisRequest) throws SQLException {
-
     request.startBind(batchThisRequest);
     SpiCallableSql callableSql = request.getCallableSql();
     SpiTransaction t = request.getTransaction();
 
     String sql = callableSql.getSql();
-
     BindParams bindParams = callableSql.getBindParams();
 
     // process named parameters if required
     sql = BindParamsParser.parse(bindParams, sql);
-
     boolean logSql = request.isLogSql();
 
     CallableStatement cstmt;
@@ -90,9 +84,7 @@ class ExeCallableSql {
     if (!bindParams.isEmpty()) {
       bindLog = binder.bind(bindParams, cstmt, t.getInternalConnection());
     }
-
     request.setBindLog(bindLog);
-
     // required to read OUT params later
     request.setBound(bindParams, cstmt);
     return cstmt;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
index d79a4d66f..ee9ffad23 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java
@@ -15,15 +15,11 @@ import java.sql.SQLException;
 /**
  * Executes the UpdateSql requests.
  */
-class ExeOrmUpdate {
+final class ExeOrmUpdate {
 
   private final Binder binder;
-
   private final PstmtFactory pstmtFactory;
 
-  /**
-   * Create with a given binder.
-   */
   ExeOrmUpdate(Binder binder) {
     this.pstmtFactory = new PstmtFactory();
     this.binder = binder;
@@ -33,9 +29,7 @@ class ExeOrmUpdate {
    * Execute the orm update request.
    */
   public int execute(PersistRequestOrmUpdate request) {
-
     boolean batchThisRequest = request.isBatchThisRequest();
-
     PreparedStatement pstmt = null;
     try {
       pstmt = bindStmt(request, batchThisRequest);
@@ -68,13 +62,11 @@ class ExeOrmUpdate {
    * Convert bean and property names to db table and columns.
    */
   private String translate(PersistRequestOrmUpdate request, String sql) {
-
     BeanDescriptor<?> descriptor = request.getBeanDescriptor();
     return descriptor.convertOrmUpdateToSql(sql);
   }
 
   private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batchThisRequest) throws SQLException {
-
     request.startBind(batchThisRequest);
     SpiUpdate<?> ormUpdate = request.getOrmUpdate();
     SpiTransaction t = request.getTransaction();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
index cea7560c9..75627671f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java
@@ -16,15 +16,11 @@ import java.sql.SQLException;
 /**
  * Executes the UpdateSql requests.
  */
-class ExeUpdateSql {
+final class ExeUpdateSql {
 
   private final Binder binder;
-
   private final PstmtFactory pstmtFactory;
 
-  /**
-   * Create with a given binder.
-   */
   ExeUpdateSql(Binder binder) {
     this.binder = binder;
     this.pstmtFactory = new PstmtFactory();
@@ -34,14 +30,10 @@ class ExeUpdateSql {
    * Execute the UpdateSql request.
    */
   public int execute(PersistRequestUpdateSql request) {
-
     boolean batchThisRequest = request.isBatchThisRequest();
-
     PreparedStatement pstmt = null;
     try {
-
       pstmt = bindStmt(request, batchThisRequest);
-
       if (batchThisRequest) {
         pstmt.addBatch();
         // return -1 to indicate batch mode
@@ -66,7 +58,6 @@ class ExeUpdateSql {
   }
 
   private void readGeneratedKeys(PreparedStatement stmt, PersistRequestUpdateSql request) {
-
     ResultSet resultSet = null;
       try {
         resultSet = stmt.getGeneratedKeys();
@@ -82,7 +73,6 @@ class ExeUpdateSql {
   }
 
   private PreparedStatement bindStmt(PersistRequestUpdateSql request, boolean batchThisRequest) throws SQLException {
-
     request.startBind(batchThisRequest);
     SpiSqlUpdate updateSql = request.getUpdateSql();
     SpiTransaction t = request.getTransaction();
@@ -121,7 +111,6 @@ class ExeUpdateSql {
 
 
   private void determineType(String word1, String word2, String word3, PersistRequestUpdateSql request) {
-
     if (word1.equalsIgnoreCase("UPDATE")) {
       request.setType(SqlType.SQL_UPDATE, word2);
 
@@ -137,7 +126,6 @@ class ExeUpdateSql {
   }
 
   private void parseUpdate(String sql, PersistRequestUpdateSql request) {
-
     int[] pos = new int[3];
     int spaceCount = 0;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
index bdd6ce855..e3cb0d5e2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeContext.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Context used for merge processing.
  */
-class MergeContext {
+final class MergeContext {
 
   private final SpiEbeanServer server;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
index b2d53ba40..3e09a44f9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
 /**
  * Drives the merge processing.
  */
-class MergeHandler {
+final class MergeHandler {
 
   private static final Pattern PATH_SPLIT = Pattern.compile("\\.");
 
@@ -33,10 +33,8 @@ class MergeHandler {
   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;
@@ -49,7 +47,6 @@ class MergeHandler {
    * 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 (desc.isIdGeneratedValue() && paths.isEmpty() && !options.isClientGeneratedIds()) {
       // just do a single insert or update based on Id value present
@@ -76,7 +73,6 @@ class MergeHandler {
     for (MergeNode value : nodes.values()) {
       value.merge(request);
     }
-
     return context.getDeletedBeans();
   }
 
@@ -86,9 +82,7 @@ class MergeHandler {
    * 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));
@@ -126,14 +120,12 @@ class MergeHandler {
   }
 
   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 instanceof BeanPropertyAssoc)) {
       throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.getFullName());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
index fa2dc398e..cc5ebeaba 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNode.java
@@ -33,7 +33,7 @@ abstract class MergeNode {
   /**
    * Add a child node given the fullPath and relative path.
    */
-  MergeNode addChild(String fullPath, String path) {
+  final MergeNode addChild(String fullPath, String path) {
     MergeNode childNode = MergeHandler.createMergeNode(fullPath, targetDescriptor, path);
     if (children == null) {
       children = new LinkedHashMap<>();
@@ -45,7 +45,7 @@ abstract class MergeNode {
   /**
    * Return the node given the relative path.
    */
-  MergeNode get(String path) {
+  final MergeNode get(String path) {
     if (children != null) {
       return children.get(path);
     }
@@ -55,8 +55,7 @@ abstract class MergeNode {
   /**
    * Return the outline beans as a map keyed by Id values.
    */
-  Map<Object, EntityBean> toMap(Collection outlines) {
-
+  final Map<Object, EntityBean> toMap(Collection outlines) {
     Map<Object, EntityBean> outlineMap = new HashMap<>();
     if (outlines != null) {
       for (Object out : outlines) {
@@ -71,8 +70,7 @@ abstract class MergeNode {
   /**
    * Add to the query to fetch the Ids values for the foreign keys basically.
    */
-  void addSelectId(Query<?> query) {
-
+  final void addSelectId(Query<?> query) {
     BeanProperty idProperty = targetDescriptor.getIdProperty();
     query.fetch(fullPath, idProperty.getName());
   }
@@ -80,8 +78,7 @@ abstract class MergeNode {
   /**
    * Cascade the merge processing if this has child nodes.
    */
-  void cascade(EntityBean entityBean, EntityBean outlineBean, MergeRequest request) {
-
+  final void cascade(EntityBean entityBean, EntityBean outlineBean, MergeRequest request) {
     if (children != null && !children.isEmpty()) {
       MergeRequest sub = request.sub(entityBean, outlineBean);
       for (MergeNode node : children.values()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
index 7fd74e8a9..02acdf3f9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * Node for processing merge on ManyToMany properties.
  */
-class MergeNodeAssocManyToMany extends MergeNode {
+final class MergeNodeAssocManyToMany extends MergeNode {
 
   private final BeanPropertyAssocMany<?> many;
 
@@ -26,14 +26,11 @@ class MergeNodeAssocManyToMany extends MergeNode {
 
   @Override
   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) {
@@ -57,7 +54,6 @@ class MergeNodeAssocManyToMany extends MergeNode {
 
     if (!deletions.isEmpty()) {
       transaction.flush();
-
       SqlUpdate delete = intersectionTable.delete(server, false);
       for (EntityBean deletion : deletions) {
         many.intersectionBind(delete, parentBean, deletion);
@@ -68,7 +64,6 @@ class MergeNodeAssocManyToMany extends MergeNode {
 
     if (!additions.isEmpty()) {
       transaction.flush();
-
       SqlUpdate insert = intersectionTable.insert(server, false);
       for (EntityBean addition : additions) {
         many.intersectionBind(insert, parentBean, addition);
@@ -76,7 +71,6 @@ class MergeNodeAssocManyToMany extends MergeNode {
       }
       insert.execute();
     }
-
     many.resetMany(parentBean);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
index 90f44e07f..68438bf40 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java
@@ -8,7 +8,7 @@ import java.util.Objects;
 /**
  * Node for processing merge on ToOne properties.
  */
-class MergeNodeAssocOne extends MergeNode {
+final class MergeNodeAssocOne extends MergeNode {
 
   private final BeanPropertyAssocOne<?> one;
 
@@ -19,7 +19,6 @@ class MergeNodeAssocOne extends MergeNode {
 
   @Override
   public void merge(MergeRequest request) {
-
     EntityBean entityBean = getEntityBean(request.getBean());
     if (entityBean == null) {
       checkOrphanRemoval(request);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
index a75ea26fb..8372c955d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java
@@ -9,7 +9,7 @@ import java.util.Map;
 /**
  * Node for processing merge on ToMany properties.
  */
-class MergeNodeAssocOneToMany extends MergeNode {
+final class MergeNodeAssocOneToMany extends MergeNode {
 
   private final BeanPropertyAssocMany<?> many;
 
@@ -20,12 +20,10 @@ class MergeNodeAssocOneToMany extends MergeNode {
 
   @Override
   public void merge(MergeRequest request) {
-
     Collection beans = many.getRawCollection(request.getBean());
     Collection outlines = many.getRawCollection(request.getOutline());
 
     Map<Object, EntityBean> outlineIds = toMap(outlines);
-
     if (beans != null) {
       for (Object bean : beans) {
         EntityBean entityBean = (EntityBean) bean;
@@ -40,7 +38,6 @@ class MergeNodeAssocOneToMany extends MergeNode {
         }
       }
     }
-
     // any remaining are considered deletes
     for (EntityBean outlineBean : outlineIds.values()) {
       request.addDelete(outlineBean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
index 1826e749e..d893fd999 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java
@@ -7,11 +7,10 @@ import io.ebeaninternal.api.SpiTransaction;
 /**
  * Request object used for processing the merge.
  */
-class MergeRequest {
+final class MergeRequest {
 
   private final EntityBean bean;
   private final EntityBean outline;
-
   private final MergeContext context;
 
   MergeRequest(MergeContext context, EntityBean bean, EntityBean outline) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java
index 36104822a..5e23a66cd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MultiValueWrapper.java
@@ -6,7 +6,7 @@ import java.util.Collection;
  * Wraps the multi values that are used for "property in (...)" queries
  * @author Roland Praml, FOCONIS AG
  */
-public class MultiValueWrapper {
+public final class MultiValueWrapper {
   private final Collection<?> values;
   private final Class<?> type;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
index 14b24dd3b..fb47147da 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java
@@ -15,10 +15,7 @@ import java.sql.Statement;
  * getGeneratedKeys.
  * </p>
  */
-class PstmtFactory {
-
-  PstmtFactory() {
-  }
+final class PstmtFactory {
 
   /**
    * Get a callable statement without any batching.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
index f305e3244..a31cee3f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -46,20 +46,20 @@ abstract class SaveManyBase implements SaveMany {
    */
   abstract void save();
 
-  void preElementCollectionUpdate() {
+  final void preElementCollectionUpdate() {
     if (!insertedParent) {
       request.preElementCollectionUpdate();
       persister.addToFlushQueue(many.deleteByParentId(request.getBeanId(), null), transaction, 1);
     }
   }
 
-  void resetModifyState() {
+  final void resetModifyState() {
     if (value instanceof BeanCollection<?>) {
       modifyListenReset((BeanCollection<?>) value);
     }
   }
 
-  void modifyListenReset(BeanCollection<?> c) {
+  final void modifyListenReset(BeanCollection<?> c) {
     if (insertedParent) {
       // after insert set the modify listening mode for private owned etc
       c.setModifyListening(many.getModifyListenMode());
@@ -67,7 +67,7 @@ abstract class SaveManyBase implements SaveMany {
     c.modifyReset();
   }
 
-  void postElementCollectionUpdate() {
+  final void postElementCollectionUpdate() {
     if (!insertedParent) {
       if (request.isNotifyCache()) {
         try {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 1f1da9fc0..33edf8dd8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -26,7 +26,7 @@ import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
 /**
  * Saves the details for a OneToMany or ManyToMany relationship (entity beans).
  */
-public class SaveManyBeans extends SaveManyBase {
+public final class SaveManyBeans extends SaveManyBase {
 
   private static final Logger log = LoggerFactory.getLogger(SaveManyBeans.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
index 53f638114..8b577da93 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollection.java
@@ -11,7 +11,7 @@ import java.util.Collection;
 /**
  * Save details for a simple scalar element collection.
  */
-class SaveManyElementCollection extends SaveManyBase {
+final class SaveManyElementCollection extends SaveManyBase {
 
   private Collection<?> collection;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
index 60dd2e01d..2941a1499 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyElementCollectionMap.java
@@ -12,7 +12,7 @@ import java.util.Set;
 /**
  * Save details for a simple scalar map element collection.
  */
-class SaveManyElementCollectionMap extends SaveManyBase {
+final class SaveManyElementCollectionMap extends SaveManyBase {
 
   private Set<Map.Entry<?, ?>> entries;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/TrimLogSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/TrimLogSql.java
index 1ab6349a0..f38490420 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/TrimLogSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/TrimLogSql.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist;
 /**
  * Utility to improve logging of raw SQL that contains new line characters.
  */
-public class TrimLogSql {
+public final class TrimLogSql {
 
   /**
    * Replace new line chars for nicer logging of multi-line sql strings.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java
index d7ed5c90c..872119060 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java
@@ -16,19 +16,17 @@ class BaseMeta {
     this.tenantId = tenantId;
   }
 
-  String appendWhere(GenerateDmlRequest request, ConcurrencyMode conMode) {
+  final 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/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
index 9320a49fa..846e88f80 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java
@@ -10,7 +10,7 @@ import java.sql.SQLException;
 /**
  * Delete bean handler.
  */
-public class DeleteHandler extends DmlHandler {
+final class DeleteHandler extends DmlHandler {
 
   private final DeleteMeta meta;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
index ccb196947..7baac04ab 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
@@ -30,7 +30,6 @@ final class DeleteMeta extends BaseMeta {
       String draftTableName = desc.getDraftTable();
       this.sqlDraftNone = genSql(ConcurrencyMode.NONE, draftTableName);
       this.sqlDraftVersion = genSql(ConcurrencyMode.VERSION, draftTableName);
-
     } else {
       this.sqlDraftNone = sqlNone;
       this.sqlDraftVersion = sqlVersion;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
index f07d207b8..f9d592cf3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
@@ -16,7 +16,7 @@ import java.sql.SQLException;
  * a flat list of Bindable objects.
  * </p>
  */
-public final class DmlBeanPersister implements BeanPersister {
+final class DmlBeanPersister implements BeanPersister {
 
   private final DatabasePlatform dbPlatform;
   private final UpdateMeta updateMeta;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java
index 6e349dee1..c9b4cadea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.persist.BeanPersisterFactory;
 /**
  * Factory for creating a DmlBeanPersister for a bean type.
  */
-public class DmlBeanPersisterFactory implements BeanPersisterFactory {
+public final class DmlBeanPersisterFactory implements BeanPersisterFactory {
 
   private final DatabasePlatform dbPlatform;
   private final MetaFactory metaFactory;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java
index 9bbe7bfcd..9b9a9c2cf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java
@@ -8,7 +8,7 @@ import javax.persistence.PersistenceException;
 /**
  * Document store based BeanPersister.
  */
-class DocStoreBeanPersister implements BeanPersister {
+final class DocStoreBeanPersister implements BeanPersister {
 
   private final GeneratedProperties generatedProperties;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
index 809115563..ab292163d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist.dml;
 /**
  * Helper to support the generation of DML statements.
  */
-public class GenerateDmlRequest {
+public final class GenerateDmlRequest {
 
   private final StringBuilder sb = new StringBuilder(100);
   private StringBuilder insertBindBuffer;
@@ -12,13 +12,7 @@ public class GenerateDmlRequest {
   private int insertMode;
   private int bindColumnCount;
 
-  /**
-   * Create from a PersistRequestBean.
-   */
-  public GenerateDmlRequest() {
-  }
-
-  public GenerateDmlRequest append(String s) {
+  GenerateDmlRequest append(String s) {
     sb.append(s);
     return this;
   }
@@ -30,7 +24,6 @@ public class GenerateDmlRequest {
 
   public void appendColumn(String column, String bind) {
     ++bindColumnCount;
-
     sb.append(prefix);
     sb.append(column);
     //sb.append(expr);
@@ -43,7 +36,6 @@ public class GenerateDmlRequest {
       sb.append("=");
       sb.append(bind);
     }
-
     if (prefix2 != null) {
       prefix = prefix2;
       prefix2 = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java
index 5f4090541..44a1d919b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Executes the generated property (like WhenCreated, WhoCreated etc) for doc store persisting.
  */
-class GeneratedProperties {
+final class GeneratedProperties {
 
   /**
    * Create the GeneratedProperties for the given bean type.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java
index 08036e143..33b804a6c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Collects the generated properties for inserts and updates for a given bean type.
  */
-class GeneratedPropertyCollector {
+final class GeneratedPropertyCollector {
 
   private final List<BeanProperty> preInsert = new ArrayList<>();
   private final List<BeanProperty> preUpdate = new ArrayList<>();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index d9fb1e8f0..113e6ff39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -18,7 +18,7 @@ import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
 /**
  * Insert bean handler.
  */
-public class InsertHandler extends DmlHandler {
+public final class InsertHandler extends DmlHandler {
 
   private final InsertMeta meta;
   private final boolean concatenatedKey;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
index de7c2bb39..7ad52d87f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
+++ b/ebean-core/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.
  */
-class MetaFactory {
+final class MetaFactory {
 
   /**
    * Include Lobs in the base statement. Generally true. Oracle9 used to require
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
index 8a3e724c8..49f6e1bfb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java
@@ -11,7 +11,7 @@ import java.sql.SQLException;
 /**
  * Update bean handler.
  */
-public class UpdateHandler extends DmlHandler {
+public final class UpdateHandler extends DmlHandler {
 
   private final UpdateMeta meta;
   private boolean emptySetClause;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
index 97811b5cf..69527de9b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java
+++ b/ebean-core/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.
  */
-class UpdatePlan implements SpiUpdatePlan {
+final class UpdatePlan implements SpiUpdatePlan {
 
   private final String key;
   private final ConcurrencyMode mode;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
index 9a9be58fc..8eaa091a0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java
@@ -24,30 +24,29 @@ class BindableAssocOne implements Bindable {
   }
 
   @Override
-  public String toString() {
+  public final String toString() {
     return "BindableAssocOne " + assocOne;
   }
 
   @Override
-  public boolean isDraftOnly() {
+  public final boolean isDraftOnly() {
     return assocOne.isDraftOnly();
   }
 
   @Override
-  public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
+  public final void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
     if (request.isAddToUpdate(assocOne)) {
       list.add(this);
     }
   }
 
   @Override
-  public void dmlAppend(GenerateDmlRequest request) {
+  public final void dmlAppend(GenerateDmlRequest request) {
     importedId.dmlAppend(request);
   }
 
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
-
     EntityBean assocBean = (EntityBean) assocOne.getValue(bean);
     registerDeferred(request, bean, assocBean);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java
index eab3678a5..f3086783c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocTenant.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
 import java.sql.SQLException;
 
-class BindableAssocTenant extends BindableAssocOne {
+final class BindableAssocTenant extends BindableAssocOne {
 
   BindableAssocTenant(BeanPropertyAssocOne<?> assocOne) {
     super(assocOne);
@@ -13,7 +13,6 @@ class BindableAssocTenant extends BindableAssocOne {
 
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
-
     EntityBean assocBean = (EntityBean) assocOne.getValue(bean);
     importedId.bind(request, assocBean);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java
index 1079df8e0..565b85d27 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * Bindable for inserting a discriminator value.
  */
-public class BindableDiscriminator implements Bindable {
+public final class BindableDiscriminator implements Bindable {
 
   private final String columnName;
   private final Object discValue;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
index 44b9a201e..cfda5ae6a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
@@ -10,15 +10,15 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * Bindable for a Embedded bean.
+ * Bindable for an Embedded bean.
  */
-public class BindableEmbedded implements Bindable {
+final class BindableEmbedded implements Bindable {
 
   private final Bindable[] items;
 
   private final BeanPropertyAssocOne<?> embProp;
 
-  public BindableEmbedded(BeanPropertyAssocOne<?> embProp, List<Bindable> bindList) {
+  BindableEmbedded(BeanPropertyAssocOne<?> embProp, List<Bindable> bindList) {
     this.embProp = embProp;
     this.items = bindList.toArray(new Bindable[0]);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java
index b855fef00..3bfd2fa41 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java
@@ -12,13 +12,13 @@ import java.util.List;
 /**
  * Bindable for a DB encrypted BeanProperty.
  */
-public class BindableEncryptedProperty implements Bindable {
+final class BindableEncryptedProperty implements Bindable {
 
   private final BeanProperty prop;
 
   private final boolean bindEncryptDataFirst;
 
-  public BindableEncryptedProperty(BeanProperty prop, boolean bindEncryptDataFirst) {
+  BindableEncryptedProperty(BeanProperty prop, boolean bindEncryptDataFirst) {
     this.prop = prop;
     this.bindEncryptDataFirst = bindEncryptDataFirst;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
index 1f970ee25..fa9c73b0b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 
 import java.util.List;
 
-public class BindableIdEmpty implements BindableId {
+final class BindableIdEmpty implements BindableId {
 
   @Override
   public boolean isEmpty() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java
index 4d0538f4a..518a236b7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java
@@ -12,11 +12,11 @@ import java.util.List;
 /**
  * Bindable for a single scalar id property.
  */
-public final class BindableIdScalar implements BindableId {
+final class BindableIdScalar implements BindableId {
 
   private final BeanProperty uidProp;
 
-  public BindableIdScalar(BeanProperty uidProp) {
+  BindableIdScalar(BeanProperty uidProp) {
     this.uidProp = uidProp;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
index de6957ad1..85894ee53 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * List of Bindable items.
  */
-public class BindableList implements Bindable {
+public final class BindableList implements Bindable {
 
   private final Bindable[] items;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java
index ef7046634..7879d192c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableOrderColumn.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Bindable for the synthetic order column.
  */
-public class BindableOrderColumn extends BindableProperty {
+public final class BindableOrderColumn extends BindableProperty {
 
   public BindableOrderColumn(BeanProperty prop) {
     super(prop);
@@ -29,7 +29,6 @@ public class BindableOrderColumn extends BindableProperty {
    */
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
-
     int sortOrder = bean._ebean_getIntercept().getSortOrder();
     request.bind(sortOrder, prop);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
index 8716ddf91..8f50fe7b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java
@@ -11,21 +11,21 @@ import java.util.List;
 /**
  * Bindable for a single BeanProperty.
  */
-public class BindableProperty implements Bindable {
+class BindableProperty implements Bindable {
 
   final BeanProperty prop;
 
-  public BindableProperty(BeanProperty prop) {
+  BindableProperty(BeanProperty prop) {
     this.prop = prop;
   }
 
   @Override
-  public String toString() {
+  public final String toString() {
     return prop.toString();
   }
 
   @Override
-  public boolean isDraftOnly() {
+  public final boolean isDraftOnly() {
     return prop.isDraftOnly();
   }
 
@@ -37,7 +37,7 @@ public class BindableProperty implements Bindable {
   }
 
   @Override
-  public void dmlAppend(GenerateDmlRequest request) {
+  public final void dmlAppend(GenerateDmlRequest request) {
     request.appendColumn(prop.getDbColumn());
   }
 
@@ -46,7 +46,6 @@ public class BindableProperty implements Bindable {
    */
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
-
     Object value = null;
     if (bean != null) {
       value = prop.getValue(bean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
index 1cbb7eeca..a6d6d6cb6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java
@@ -9,7 +9,7 @@ import java.sql.SQLException;
 /**
  * For JSON Jackson properties - dirty detection via MD5 of json content.
  */
-class BindablePropertyJsonInsert extends BindableProperty {
+final class BindablePropertyJsonInsert extends BindableProperty {
 
   private final int propertyIndex;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
index cfa056a63..7501fd92b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
@@ -8,7 +8,7 @@ import java.sql.SQLException;
 /**
  * For JSON Jackson properties - dirty detection via MD5 of json content.
  */
-class BindablePropertyJsonUpdate extends BindableProperty {
+final class BindablePropertyJsonUpdate extends BindableProperty {
 
   private final int propertyIndex;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java
index 5cdea3e8b..db28c3035 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java
@@ -11,11 +11,11 @@ import java.util.List;
 /**
  * Bindable for a Version BeanProperty. Obtains value from 'old values'.
  */
-public class BindablePropertyVersion implements Bindable {
+final class BindablePropertyVersion implements Bindable {
 
   private final BeanProperty prop;
 
-  public BindablePropertyVersion(BeanProperty prop) {
+  BindablePropertyVersion(BeanProperty prop) {
     this.prop = prop;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java
index 4e94b85d2..2ea853644 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java
@@ -18,19 +18,16 @@ import java.util.List;
  * parentBean.
  * </p>
  */
-public class BindableUnidirectional implements Bindable {
+public final class BindableUnidirectional implements Bindable {
 
   private final BeanPropertyAssocOne<?> unidirectional;
-
   private final ImportedId importedId;
-
   private final BeanDescriptor<?> desc;
 
   public BindableUnidirectional(BeanDescriptor<?> desc, BeanPropertyAssocOne<?> unidirectional) {
     this.desc = desc;
     this.unidirectional = unidirectional;
     this.importedId = unidirectional.getImportedId();
-
   }
 
   @Override
@@ -54,13 +51,10 @@ public class BindableUnidirectional implements Bindable {
     importedId.dmlAppend(request);
   }
 
-
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
-
     PersistRequestBean<?> persistRequest = request.getPersistRequest();
     Object parentBean = persistRequest.getParentBean();
-
     if (parentBean == null) {
       Class<?> localType = desc.getBeanType();
       Class<?> targetType = unidirectional.getTargetType();
@@ -69,7 +63,6 @@ public class BindableUnidirectional implements Bindable {
       msg += "For inserts you must use cascade save on the master bean [" + targetType + "].";
       throw new PersistenceException(msg);
     }
-
     importedId.bind(request, (EntityBean) parentBean);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
index bf3b0723d..7c2314bed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
@@ -9,16 +9,12 @@ import java.util.List;
 /**
  * A factory that builds Bindable for BeanPropertyAssocOne properties.
  */
-public class FactoryAssocOnes {
-
-  public FactoryAssocOnes() {
-  }
+public final class FactoryAssocOnes {
 
   /**
    * Add foreign key columns from associated one beans.
    */
   public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode) {
-
     for (BeanPropertyAssocOne<?> one : desc.propertiesOneImported()) {
       if (!one.isImportedPrimaryKey()) {
         switch (mode) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
index 43b9bec8d..209f17bbf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java
@@ -12,11 +12,10 @@ import java.util.List;
  * This excludes unique embedded and associated properties.
  * </p>
  */
-public class FactoryBaseProperties {
+public final class FactoryBaseProperties {
 
   private final FactoryProperty factoryProperty;
 
-
   public FactoryBaseProperties(boolean bindEncryptDataFirst) {
     factoryProperty = new FactoryProperty(bindEncryptDataFirst);
   }
@@ -25,7 +24,6 @@ public class FactoryBaseProperties {
    * Add Bindable for the base properties to the list.
    */
   public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode, boolean withLobs) {
-
     for (BeanProperty prop : desc.propertiesBaseScalar()) {
       if (!prop.isImportedPrimaryKey()) {
         Bindable item = factoryProperty.create(prop, mode, withLobs, false);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
index 380c7b3a9..cef891682 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * A factory that builds Bindable for embedded bean properties.
  */
-public class FactoryEmbedded {
+public final class FactoryEmbedded {
 
   private final FactoryProperty factoryProperty;
 
@@ -23,7 +23,6 @@ public class FactoryEmbedded {
    * Add bindable for the embedded properties to the list.
    */
   public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode, boolean withLobs) {
-
     for (BeanPropertyAssocOne<?> anEmbedded : desc.propertiesEmbedded()) {
       BeanProperty[] props = anEmbedded.getProperties();
       List<Bindable> bindList = new ArrayList<>(props.length);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java
index d517e051b..398f59ecf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java
@@ -7,23 +7,18 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 /**
  * Create a Bindable for the ids of a bean type.
  */
-public class FactoryId {
-
-  public FactoryId() {
-  }
+public final class FactoryId {
 
   /**
    * Add uniqueId properties.
    */
   public BindableId createId(BeanDescriptor<?> desc) {
-
     BeanProperty id = desc.getIdProperty();
     if (id == null) {
       return new BindableIdEmpty();
     }
     if (!id.isEmbedded()) {
       return new BindableIdScalar(id);
-
     } else {
       BeanPropertyAssocOne<?> embId = (BeanPropertyAssocOne<?>) id;
       MatchedImportedProperty[] matches = MatchedImportedFactory.build(embId.getProperties(), desc);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
index d5c59daf3..7de3e79ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
@@ -12,7 +12,7 @@ import io.ebeaninternal.server.persist.dml.DmlMode;
  * and BindablePropertyUpdateGenerated as required.
  * </p>
  */
-class FactoryProperty {
+final class FactoryProperty {
 
   private final boolean bindEncryptDataFirst;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java
index abb7f1a20..7c418af31 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java
@@ -7,17 +7,12 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 /**
  * Creates a Bindable to support version concurrency where clauses.
  */
-public class FactoryVersion {
-
-
-  public FactoryVersion() {
-  }
+public final class FactoryVersion {
 
   /**
    * Create a Bindable for the version property(s) for a bean type.
    */
   public Bindable create(BeanDescriptor<?> desc) {
-
     BeanProperty versionProperty = desc.getVersionProperty();
     return (versionProperty == null) ? null : new BindablePropertyVersion(versionProperty);
   }
@@ -26,7 +21,6 @@ public class FactoryVersion {
    * Create a Bindable for the version property(s) for a bean type.
    */
   public Bindable createForDelete(BeanDescriptor<?> desc) {
-
     BeanProperty versionProperty = desc.getVersionProperty();
     return (versionProperty == null) ? null : new BindableProperty(versionProperty);
   }
@@ -35,7 +29,6 @@ public class FactoryVersion {
    * Create a Bindable for TenantId If multi-tenant with partitioning is on this bean type.
    */
   public Bindable createTenantId(BeanDescriptor<?> desc) {
-
     BeanProperty tenant = desc.getTenantProperty();
     if (tenant == null) {
       return null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java
index 4ce1bb63d..60a32ea19 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedEmbedded.java
@@ -8,12 +8,10 @@ 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 {
+final class MatchedImportedEmbedded implements MatchedImportedProperty {
 
   private final BeanProperty localProp;
-
   private final BeanPropertyAssocOne<?> assocOne;
-
   private final BeanProperty foreignProp;
 
   MatchedImportedEmbedded(BeanProperty localProp, BeanPropertyAssocOne<?> assocOne, BeanProperty foreignProp) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
index 714e910dd..e4fa26284 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java
@@ -4,15 +4,13 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
-class MatchedImportedFactory {
+final class MatchedImportedFactory {
 
   /**
    * Create the array of matchedImportedProperty based on the properties and descriptor.
    */
   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);
@@ -25,12 +23,9 @@ class MatchedImportedFactory {
   }
 
   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) {
+    for (BeanPropertyAssocOne<?> assocOne1 : desc.propertiesOne()) {
       if (assocOne1.isImportedPrimaryKey()) {
         // search using the ImportedId from the assoc one
         BeanProperty foreignMatch = assocOne1.getImportedId().findMatchImport(dbColumn);
@@ -39,14 +34,11 @@ class MatchedImportedFactory {
         }
       }
     }
-
-    BeanProperty[] scalar = desc.propertiesBaseScalar();
-    for (BeanProperty beanProperty : scalar) {
+    for (BeanProperty beanProperty : desc.propertiesBaseScalar()) {
       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/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java
index 436ef69a5..de9907863 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedScalar.java
@@ -6,10 +6,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Matches local embedded id properties to 'matching' imported primary key scalar properties.
  */
-class MatchedImportedScalar implements MatchedImportedProperty {
+final class MatchedImportedScalar implements MatchedImportedProperty {
 
   private final BeanProperty localProp;
-
   private final BeanProperty foreignProp;
 
   MatchedImportedScalar(BeanProperty localProp, BeanProperty foreignProp) {
@@ -19,7 +18,6 @@ class MatchedImportedScalar implements MatchedImportedProperty {
 
   @Override
   public void populate(EntityBean sourceBean, EntityBean embeddedId) {
-
     Object value = foreignProp.getValue(sourceBean);
     localProp.setValue(embeddedId, value);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
index 3559a3a69..1a15b8438 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
@@ -11,7 +11,6 @@ import java.util.Collection;
  */
 public class MultiValueBind {
 
-
   @FunctionalInterface
   public interface BindOne {
     void bind(Object value) throws SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
index f90d5cfb8..f7d86f55e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.ScalarType;
 /**
  * Multi value binder that uses Postgres Array.
  */
-public class PostgresMultiValueBind extends AbstractMultiValueBind {
+public final class PostgresMultiValueBind extends AbstractMultiValueBind {
 
   @Override
   public String getInExpression(boolean not, ScalarType<?> type, int size) {

From 0688061f5cb2eed9b872ca2d648e9a72335cb55f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Aug 2021 15:17:19 +1200
Subject: [PATCH 385/447] Speed up TestUuidGenerator

---
 .../server/idgen/TestUuidGenerator.java       | 47 ++++++-------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java
index 0f27c5a89..3623fdd73 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java
@@ -2,39 +2,32 @@
  * Licensed Materials - Property of FOCONIS AG
  * (C) Copyright FOCONIS AG.
  */
-
 package io.ebeaninternal.server.idgen;
 
-
-import static org.assertj.core.api.Assertions.assertThat;
+import io.ebean.config.dbplatform.PlatformIdGenerator;
+import org.junit.Test;
 
 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;
-
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * 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
- *
- */
+  /**
+   * Worker to generate UUIDs
+   *
+   * @author Roland Praml, FOCONIS AG
+   */
   public static class IdTest implements Runnable {
-    private  final Map<UUID, UUID> map;
+    private final Map<UUID, UUID> map;
     private final PlatformIdGenerator idGen;
     private final int ids;
     private final AtomicBoolean failFlag;
@@ -46,12 +39,6 @@ public class TestUuidGenerator {
       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());
@@ -70,7 +57,7 @@ public class TestUuidGenerator {
    */
   @Test
   public void testUuidV1SingleThread() throws Exception {
-    testGenerator(1, 1_000_000, UuidV1IdGenerator.getInstance("ebean-test-uuid.state"));
+    testGenerator(1, 500_000, UuidV1IdGenerator.getInstance("ebean-test-uuid.state"));
   }
 
   /**
@@ -78,7 +65,7 @@ public class TestUuidGenerator {
    */
   @Test
   public void testUuidV1MultiThread() throws Exception {
-    testGenerator(10, 100_000, UuidV1IdGenerator.getInstance("ebean-test-uuid.state"));
+    testGenerator(10, 50_000, UuidV1IdGenerator.getInstance("ebean-test-uuid.state"));
   }
 
   /**
@@ -86,7 +73,7 @@ public class TestUuidGenerator {
    */
   @Test
   public void testUuidV1RndMultiThread() throws Exception {
-    testGenerator(10, 100_000, UuidV1RndIdGenerator.INSTANCE);
+    testGenerator(10, 50_000, UuidV1RndIdGenerator.INSTANCE);
   }
 
   /**
@@ -94,7 +81,7 @@ public class TestUuidGenerator {
    */
   @Test
   public void testUuidType1RndSingleThread() throws Exception {
-    testGenerator(1, 1_000_000, UuidV1RndIdGenerator.INSTANCE);
+    testGenerator(1, 500_000, UuidV1RndIdGenerator.INSTANCE);
   }
 
   /**
@@ -102,7 +89,7 @@ public class TestUuidGenerator {
    */
   @Test
   public void testUuidType4MultiThread() throws Exception {
-    testGenerator(10, 100_000, UuidV4IdGenerator.INSTANCE);
+    testGenerator(10, 50_000, UuidV4IdGenerator.INSTANCE);
   }
 
   /**
@@ -110,12 +97,9 @@ public class TestUuidGenerator {
    */
   @Test
   public void testUuidType4SingleThread() throws Exception {
-    testGenerator(1, 1_000_000, UuidV4IdGenerator.INSTANCE);
+    testGenerator(1, 500_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++) {
@@ -136,6 +120,5 @@ public class TestUuidGenerator {
     }
     assertThat(failFlag.get()).isFalse();
     assertThat(map.size()).isEqualTo(threadCount * count);
-
   }
 }

From 4109fab0d86ef1ab1b2d5af3b97573a5a02e068f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 15 Aug 2021 15:22:02 +1200
Subject: [PATCH 386/447] #2313 - Refactor internals - make more classes final
 in query packages

---
 .../server/query/BaseFuture.java              |  8 +-
 .../io/ebeaninternal/server/query/CQuery.java |  2 +-
 .../server/query/CQueryBindCapture.java       |  2 +-
 .../server/query/CQueryBuilder.java           |  2 +-
 .../server/query/CQueryBuilderRawSql.java     |  2 +-
 .../server/query/CQueryCollectionAddNoop.java |  2 +-
 .../server/query/CQueryDraftSupport.java      |  2 +-
 .../server/query/CQueryEngine.java            |  2 +-
 .../query/CQueryFetchSingleAttribute.java     |  2 +-
 .../server/query/CQueryHistorySupport.java    |  2 +-
 .../server/query/CQueryIteratorSimple.java    |  2 +-
 .../query/CQueryIteratorWithBuffer.java       |  2 +-
 .../server/query/CQueryOrderBy.java           |  2 +-
 .../server/query/CQueryPlan.java              | 48 ++++++------
 .../server/query/CQueryPlanManager.java       |  2 +-
 .../server/query/CQueryPlanRawSql.java        |  3 +-
 .../server/query/CQueryPlanRequest.java       |  4 +-
 .../server/query/CQueryPlanStats.java         |  3 -
 .../server/query/CQueryPredicates.java        | 25 +------
 .../server/query/CQueryRowCount.java          |  2 +-
 .../server/query/CQueryUpdate.java            |  2 +-
 .../server/query/CallableQuery.java           |  2 -
 .../server/query/CallableQueryCount.java      |  4 +-
 .../server/query/CallableQueryIds.java        |  4 +-
 .../server/query/CallableQueryList.java       |  3 +-
 .../server/query/DFetchGroup.java             |  2 +-
 .../server/query/DFetchGroupBuilder.java      |  2 +-
 .../server/query/DQueryPlanOutput.java        |  2 +-
 .../server/query/DbOrderByTrim.java           |  2 +-
 .../server/query/DefaultDbSqlContext.java     |  2 +-
 .../server/query/DefaultFetchGroupQuery.java  |  2 +-
 .../server/query/DefaultOrmQueryEngine.java   |  2 +-
 .../query/DefaultRelationalQueryEngine.java   |  2 +-
 .../server/query/DefaultSqlRow.java           |  2 +-
 .../server/query/DtoQueryEngine.java          |  2 +-
 .../server/query/DtoQueryIterator.java        |  2 +-
 .../ebeaninternal/server/query/ExtraJoin.java |  2 +-
 .../server/query/LimitOffsetPagedList.java    |  2 +-
 .../server/query/OrderVersionDesc.java        |  2 +-
 .../server/query/QueryFutureIds.java          |  2 +-
 .../server/query/QueryFutureList.java         |  2 +-
 .../server/query/QueryFutureRowCount.java     |  2 +-
 .../server/query/QueryPlanLogger.java         |  6 +-
 .../server/query/QueryPlanLoggerExplain.java  |  2 +-
 .../server/query/QueryPlanLoggerOracle.java   |  2 +-
 .../server/query/QueryPlanLoggerPostgres.java |  2 +-
 .../query/QueryPlanLoggerSqlServer.java       |  2 +-
 .../server/query/RawSqlQueryPlanKey.java      |  2 +-
 .../server/query/SqlBeanLoad.java             |  2 +-
 .../ebeaninternal/server/query/SqlTree.java   |  2 +-
 .../server/query/SqlTreeAlias.java            |  2 +-
 .../server/query/SqlTreeBuilder.java          | 22 +-----
 .../server/query/SqlTreeNodeBean.java         | 44 ++++-------
 .../server/query/SqlTreeNodeExtraJoin.java    |  3 +-
 .../query/SqlTreeNodeFormulaWhereJoin.java    |  3 +-
 .../query/SqlTreeNodeManyWhereJoin.java       |  8 +-
 .../server/query/SqlTreeNodeRoot.java         |  2 -
 .../server/query/SqlTreeProperties.java       | 10 +--
 .../server/querydefn/AbstractQuery.java       | 10 +--
 .../server/querydefn/DefaultDtoQuery.java     | 17 +----
 .../server/querydefn/DefaultOrmQuery.java     | 74 +------------------
 .../server/querydefn/DefaultOrmUpdate.java    | 20 -----
 .../querydefn/DefaultRelationalQuery.java     | 12 +--
 .../server/querydefn/DefaultUpdateQuery.java  |  2 +-
 .../server/querydefn/NaturalKeyBindParam.java |  3 +-
 .../server/querydefn/ONamedParam.java         |  3 +-
 .../server/querydefn/OrmQueryDetail.java      |  2 +-
 .../querydefn/OrmQueryDetailParser.java       |  5 +-
 .../querydefn/OrmQueryLimitRequest.java       |  6 +-
 .../server/querydefn/OrmQueryPlanKey.java     |  2 +-
 .../server/querydefn/OrmQueryProperties.java  |  8 +-
 .../server/querydefn/OrmQuerySecondary.java   |  3 +-
 .../server/querydefn/OrmUpdateProperties.java | 11 ++-
 .../server/querydefn/SimpleTextParser.java    |  3 +-
 74 files changed, 120 insertions(+), 343 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/BaseFuture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/BaseFuture.java
index 93c86fe7b..e71334ea6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/BaseFuture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/BaseFuture.java
@@ -26,22 +26,22 @@ abstract class BaseFuture<T> implements Future<T> {
   }
 
   @Override
-  public T get() throws InterruptedException, ExecutionException {
+  public final T get() throws InterruptedException, ExecutionException {
     return futureTask.get();
   }
 
   @Override
-  public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+  public final T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
     return futureTask.get(timeout, unit);
   }
 
   @Override
-  public boolean isCancelled() {
+  public final boolean isCancelled() {
     return futureTask.isCancelled();
   }
 
   @Override
-  public boolean isDone() {
+  public final boolean isDone() {
     return futureTask.isDone();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 7fc636af0..e9d2281d0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.ReentrantLock;
  * The tree structure is flattened into a SqlSelectChain. The SqlSelectChain is
  * the key object used in reading the flat resultSet back into Objects.
  */
-public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTransactionEvent {
+public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTransactionEvent {
 
   private static final Logger logger = LoggerFactory.getLogger(CQuery.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index e3a1a5e54..559dfa0da 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
 import java.util.concurrent.locks.ReentrantLock;
 
-class CQueryBindCapture implements SpiQueryBindCapture {
+final class CQueryBindCapture implements SpiQueryBindCapture {
 
   private static final double multiplier = 1.5d;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 9a4b1d32e..09b465893 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -40,7 +40,7 @@ import java.util.List;
  * Generates the SQL SELECT statements taking into account the physical
  * deployment properties.
  */
-class CQueryBuilder {
+final class CQueryBuilder {
 
   private final String columnAliasPrefix;
   private final SqlLimiter sqlLimiter;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
index 2bc60d208..d3b4e7ca6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
@@ -11,7 +11,7 @@ import io.ebeaninternal.server.querydefn.OrmQueryLimitRequest;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.util.BindParamsParser;
 
-class CQueryBuilderRawSql {
+final class CQueryBuilderRawSql {
 
   private final SqlLimiter sqlLimiter;
   private final DatabasePlatform dbPlatform;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java
index ac4230999..cf8adf097 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryCollectionAddNoop.java
@@ -7,7 +7,7 @@ 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> {
+final class CQueryCollectionAddNoop<T> implements CQueryCollectionAdd<T> {
 
   /**
    * Return null as we are not collecting the beans.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java
index da1e01cac..771ff8145 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java
@@ -5,7 +5,7 @@ import java.util.Map;
 /**
  * Support 'asDraft' queries.
  */
-class CQueryDraftSupport {
+final class CQueryDraftSupport {
 
   /**
    * The mapping of base tables to their matching 'draft' table.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 03074b43f..b76d0b4e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -33,7 +33,7 @@ import java.util.Map;
 /**
  * Handles the Object Relational fetching.
  */
-public class CQueryEngine {
+public final class CQueryEngine {
 
   private static final Logger logger = LoggerFactory.getLogger(CQueryEngine.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index a89cd28fa..41f9e7f4d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -24,7 +24,7 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * Base compiled query request for single attribute queries.
  */
-class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, CancelableQuery {
+final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, CancelableQuery {
 
   private static final Logger logger = LoggerFactory.getLogger(CQueryFetchSingleAttribute.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java
index 5f810c6da..e082c97eb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java
@@ -7,7 +7,7 @@ import java.util.Map;
 /**
  * Helper to support history functions.
  */
-class CQueryHistorySupport {
+final class CQueryHistorySupport {
 
   /**
    * The DB specific support.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
index 17cec9d15..d438ec747 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
@@ -9,7 +9,7 @@ import java.sql.SQLException;
 /**
  * QueryIterator that does not require a buffer for secondary queries.
  */
-class CQueryIteratorSimple<T> implements QueryIterator<T> {
+final class CQueryIteratorSimple<T> implements QueryIterator<T> {
 
   private final CQuery<T> cquery;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
index e2a9bdad2..ad1a924b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
@@ -11,7 +11,7 @@ import java.util.NoSuchElementException;
 /**
  * A QueryIterator that uses a buffer to execute secondary queries periodically.
  */
-class CQueryIteratorWithBuffer<T> implements QueryIterator<T> {
+final class CQueryIteratorWithBuffer<T> implements QueryIterator<T> {
 
   private final CQuery<T> cquery;
   private final int bufferSize;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
index c325255ef..ffb65a039 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * Creates the order by expression clause.
  */
-class CQueryOrderBy {
+final class CQueryOrderBy {
 
   private final BeanDescriptor<?> desc;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index de365f253..aef2c1164 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -164,49 +164,49 @@ public class CQueryPlan implements SpiQueryPlan {
   }
 
   @Override
-  public Class<?> getBeanType() {
+  public final Class<?> getBeanType() {
     return beanType;
   }
 
   @Override
-  public String getName() {
+  public final String getName() {
     return name;
   }
 
   @Override
-  public String getHash() {
+  public final String getHash() {
     return hash;
   }
 
   @Override
-  public String getSql() {
+  public final String getSql() {
     return sql;
   }
 
   @Override
-  public ProfileLocation getProfileLocation() {
+  public final ProfileLocation getProfileLocation() {
     return profileLocation;
   }
 
-  public String getLabel() {
+  public final String getLabel() {
     return label;
   }
 
-  public Set<String> getDependentTables() {
+  public final Set<String> getDependentTables() {
     return dependentTables;
   }
 
-  public String getLocation() {
+  public final String getLocation() {
     return location;
   }
 
   @Override
-  public void queryPlanInit(long thresholdMicros) {
+  public final void queryPlanInit(long thresholdMicros) {
     bindCapture.queryPlanInit(thresholdMicros);
   }
 
   @Override
-  public DQueryPlanOutput createMeta(String bind, String planString) {
+  public final DQueryPlanOutput createMeta(String bind, String planString) {
     return new DQueryPlanOutput(getBeanType(), name, hash, sql, profileLocation, bind, planString);
   }
 
@@ -217,7 +217,7 @@ public class CQueryPlan implements SpiQueryPlan {
   /**
    * Bind keys for encrypted properties if necessary returning the DataBind.
    */
-  DataBind bindEncryptedProperties(PreparedStatement stmt, Connection conn) throws SQLException {
+  final DataBind bindEncryptedProperties(PreparedStatement stmt, Connection conn) throws SQLException {
     DataBind dataBind = new DataBind(dataTimeZone, stmt, conn);
     if (encryptedProps != null) {
       for (STreeProperty encryptedProp : encryptedProps) {
@@ -237,14 +237,14 @@ public class CQueryPlan implements SpiQueryPlan {
     return dataBind;
   }
 
-  int getAsOfTableCount() {
+  final int getAsOfTableCount() {
     return asOfTableCount;
   }
 
   /**
    * Return a key used in audit logging to identify the query.
    */
-  String getAuditQueryKey() {
+  final String getAuditQueryKey() {
     if (auditQueryHash == null) {
       // volatile object assignment (so happy for multithreaded access)
       auditQueryHash = calcAuditQueryKey();
@@ -257,29 +257,29 @@ public class CQueryPlan implements SpiQueryPlan {
     return rawSql ? planKey.getPartialKey() + "_" + hash : planKey.getPartialKey();
   }
 
-  SqlTree getSqlTree() {
+  final SqlTree getSqlTree() {
     return sqlTree;
   }
 
-  public boolean isRawSql() {
+  public final boolean isRawSql() {
     return rawSql;
   }
 
-  String getLogWhereSql() {
+  final String getLogWhereSql() {
     return logWhereSql;
   }
 
   /**
    * Reset the query statistics.
    */
-  public void resetStatistics() {
+  public final void resetStatistics() {
     stats.reset();
   }
 
   /**
    * Register an execution time against this query plan;
    */
-  boolean executionTime(long timeMicros) {
+  final boolean executionTime(long timeMicros) {
     stats.add(timeMicros);
     return bindCapture != null && bindCapture.collectFor(timeMicros);
   }
@@ -287,33 +287,33 @@ public class CQueryPlan implements SpiQueryPlan {
   /**
    * Return a copy of the current query statistics.
    */
-  public Snapshot getSnapshot(boolean reset) {
+  public final Snapshot getSnapshot(boolean reset) {
     return stats.getSnapshot(reset);
   }
 
   /**
    * Return the time this query plan was last used.
    */
-  public long getLastQueryTime() {
+  public final long getLastQueryTime() {
     return stats.getLastQueryTime();
   }
 
-  ScalarDataReader<?> getSingleAttributeScalarType() {
+  final ScalarDataReader<?> getSingleAttributeScalarType() {
     return sqlTree.getRootNode().getSingleAttributeReader();
   }
 
   /**
    * Return true if there are no statistics collected since the last reset.
    */
-  public boolean isEmptyStats() {
+  public final boolean isEmptyStats() {
     return stats.isEmpty();
   }
 
-  TimedMetric createTimedMetric() {
+  final TimedMetric createTimedMetric() {
     return MetricFactory.get().createTimedMetric(label);
   }
 
-  void captureBindForQueryPlan(CQueryPredicates predicates, long executionTimeMicros) {
+  final void captureBindForQueryPlan(CQueryPredicates predicates, long executionTimeMicros) {
     final long startNanos = System.nanoTime();
     try {
       DataBindCapture capture = bindCapture();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
index 4ff62f44d..499e801d3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
@@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import static java.util.Collections.emptyList;
 
-public class CQueryPlanManager implements QueryPlanManager {
+public final class CQueryPlanManager implements QueryPlanManager {
 
   private static final Logger log = LoggerFactory.getLogger(CQueryPlanManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java
index bab955d84..a23114bf2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * RawSql based query plan.
  */
-class CQueryPlanRawSql extends CQueryPlan {
+final class CQueryPlanRawSql extends CQueryPlan {
 
   private final int[] rsetIndexPositions;
 
@@ -27,7 +27,6 @@ class CQueryPlanRawSql extends CQueryPlan {
   }
 
   private int[] createIndexPositions(OrmQueryRequest<?> request, SqlTree sqlTree) {
-
     List<String> chain = sqlTree.buildRawSqlSelectChain();
     ColumnMapping columnMapping = request.getQuery().getRawSql().getColumnMapping();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
index 315e7a07d..00b202d57 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * Captures database query plans.
  */
-class CQueryPlanRequest {
+final class CQueryPlanRequest {
 
   private final List<MetaQueryPlan> plans = new ArrayList<>();
 
@@ -19,7 +19,7 @@ class CQueryPlanRequest {
   private final long since;
   private final int maxCount;
   private final long maxTime;
-  private Iterator<CQueryBindCapture> iterator;
+  private final Iterator<CQueryBindCapture> iterator;
 
   CQueryPlanRequest(Connection connection, QueryPlanRequest req, Iterator<CQueryBindCapture> iterator) {
     this.connection = connection;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index ffc749eb9..05ad13173 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -10,11 +10,8 @@ import io.ebean.metric.TimedMetricStats;
 public final class CQueryPlanStats {
 
   private final CQueryPlan queryPlan;
-
   private final TimedMetric timedMetric;
-
   private boolean collected;
-
   private long lastQueryTime;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index c41f830c6..426b1ed4e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -37,74 +37,51 @@ import java.util.Set;
  * named parameters and expression values into the prepared statement.
  * </p>
  */
-public class CQueryPredicates {
+public final class CQueryPredicates {
 
   private static final Logger logger = LoggerFactory.getLogger(CQueryPredicates.class);
 
   private final Binder binder;
-
   private final OrmQueryRequest<?> request;
-
   private final SpiQuery<?> query;
-
   private final Object idValue;
-
-  /**
-   * Named bind parameters.
-   */
   private final BindParams bindParams;
-
-  /**
-   * Bind values from the where expressions.
-   */
   private DefaultExpressionRequest filterMany;
-
   /**
    * SQL generated from the where expressions.
    */
   private String filterManyExprSql;
-
   /**
    * Bind values from the where expressions.
    */
   private DefaultExpressionRequest where;
-
   /**
    * SQL generated from the where expressions.
    */
   private String whereExprSql;
-
   /**
    * Bind values for having expression.
    */
   private DefaultExpressionRequest having;
-
   /**
    * SQL generated from the having expression.
    */
   private String havingExprSql;
-
   private String dbHaving;
-
   /**
    * logicalWhere with property names converted to db columns.
    */
   private String dbWhere;
-
   /**
    * Filter than can apply to a many fetch join.
    */
   private String dbFilterMany;
-
   private String dbOrderBy;
-
   private String dbUpdateClause;
-
   /**
    * Includes from where and order by clauses.
    */
   private Set<String> predicateIncludes;
-
   private Set<String> orderByIncludes;
 
   CQueryPredicates(Binder binder, OrmQueryRequest<?> request) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index 0c1df9483..ccfbb3ce6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -19,7 +19,7 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * Executes the select row count query.
  */
-class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuery {
+final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuery {
 
   private final CQueryPlan queryPlan;
   private final OrmQueryRequest<?> request;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index 302b1bcf0..e35615a0c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -16,7 +16,7 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * Executes the update query.
  */
-class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery {
+final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery {
 
   private final CQueryPlan queryPlan;
   private final OrmQueryRequest<?> request;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQuery.java
index 2a432b732..528984d17 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQuery.java
@@ -10,9 +10,7 @@ import io.ebeaninternal.api.SpiQuery;
 abstract class CallableQuery<T> {
 
   final SpiQuery<T> query;
-
   final SpiEbeanServer server;
-
   final Transaction transaction;
 
   CallableQuery(SpiEbeanServer server, SpiQuery<T> query, Transaction t) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java
index a2076b363..959ce2abd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java
@@ -8,10 +8,8 @@ import java.util.concurrent.Callable;
 
 /**
  * Represent the findCount query as a Callable.
- *
- * @param <T> the entity bean type
  */
-public class CallableQueryCount<T> extends CallableQuery<T> implements Callable<Integer> {
+public final class CallableQueryCount<T> extends CallableQuery<T> implements Callable<Integer> {
 
   /**
    * Note that the transaction passed in is always a new transaction solely to
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java
index c8ae160f6..c236ccb6d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java
@@ -9,10 +9,8 @@ import java.util.concurrent.Callable;
 
 /**
  * Represent the fetch Id's query as a Callable.
- *
- * @param <T> the entity bean type
  */
-public class CallableQueryIds<T> extends CallableQuery<T> implements Callable<List<Object>> {
+public final class CallableQueryIds<T> extends CallableQuery<T> implements Callable<List<Object>> {
 
 
   public CallableQueryIds(SpiEbeanServer server, SpiQuery<T> query, Transaction t) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java
index b20e75a86..350cd67f0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java
@@ -12,8 +12,7 @@ import java.util.concurrent.Callable;
  *
  * @param <T> the entity bean type
  */
-public class CallableQueryList<T> extends CallableQuery<T> implements Callable<List<T>> {
-
+public final class CallableQueryList<T> extends CallableQuery<T> implements Callable<List<T>> {
 
   public CallableQueryList(SpiEbeanServer server, SpiQuery<T> query, Transaction t) {
     super(server, query, t);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
index 4b17e3461..bc2449d63 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroup.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 /**
  * Default FetchGroup implementation.
  */
-class DFetchGroup<T> implements SpiFetchGroup<T> {
+final class DFetchGroup<T> implements SpiFetchGroup<T> {
 
   private final OrmQueryDetail detail;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
index 6553b7ea4..50966a45f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DFetchGroupBuilder.java
@@ -9,7 +9,7 @@ import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 /**
  * Default implementation of the FetchGroupBuilder.
  */
-class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
+final class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
 
   private static final FetchConfig DEFAULT_FETCH = FetchConfig.ofDefault();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
index 1c1a41d07..642e163e2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.api.SpiDbQueryPlan;
 /**
  * Captured query plan details.
  */
-class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
+final class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan {
 
   private final Class<?> beanType;
   private final String label;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
index 766be909b..72eb81db4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DbOrderByTrim.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.query;
 
 import java.util.regex.Pattern;
 
-class DbOrderByTrim {
+final class DbOrderByTrim {
 
   private static final Pattern orderByTrim = Pattern.compile("(?i) asc\\b| desc\\b|\\b nulls first\\b|\\b nulls last\\b");
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index 378647818..dbd9b263e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.util.ArrayStack;
 import java.util.ArrayList;
 import java.util.HashSet;
 
-class DefaultDbSqlContext implements DbSqlContext {
+final class DefaultDbSqlContext implements DbSqlContext {
 
   private static final String COMMA = ", ";
   private static final String PERIOD = ".";
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 9f7cb9b7e..459bba998 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -44,7 +44,7 @@ import java.util.stream.Stream;
 /**
  * Implementation of FetchGroup query for use to create FetchGroup via query beans.
  */
-class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch {
+final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch {
 
   private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
index b112c7986..abab7cdf9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * Main Finder implementation.
  */
-public class DefaultOrmQueryEngine implements OrmQueryEngine {
+public final class DefaultOrmQueryEngine implements OrmQueryEngine {
 
   /**
    * Find using predicates
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index 78b9717d9..44b84a6a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -23,7 +23,7 @@ import java.util.function.Predicate;
 /**
  * Perform native sql fetches.
  */
-public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
+public final class DefaultRelationalQueryEngine implements RelationalQueryEngine {
 
   private final Binder binder;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
index 0ee1e1525..e38d9d7d7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
@@ -29,7 +29,7 @@ import java.util.UUID;
  * returning the type you expect.
  * </p>
  */
-public class DefaultSqlRow implements SqlRow {
+public final class DefaultSqlRow implements SqlRow {
 
   private static final long serialVersionUID = -3120927797041336242L;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
index 526d36dee..39588b733 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public class DtoQueryEngine {
+public final class DtoQueryEngine {
 
   private final Binder binder;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
index bdf4e2df6..47676c525 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.core.DtoQueryRequest;
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 
-class DtoQueryIterator<T> implements QueryIterator<T> {
+final class DtoQueryIterator<T> implements QueryIterator<T> {
 
   private final DtoQueryRequest<T> request;
   private boolean closed;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
index c246c651d..6fdeedd43 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.query;
 
-public class ExtraJoin {
+public final class ExtraJoin {
 
   private final STreePropertyAssoc property;
   private final boolean containsMany;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
index a6f506ef6..cb9f6f560 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
@@ -12,7 +12,7 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * PagedList implementation based on limit offset types of queries.
  */
-public class LimitOffsetPagedList<T> implements PagedList<T> {
+public final class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private final transient SpiEbeanServer server;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
index e3b99561a..52e661b10 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
@@ -9,7 +9,7 @@ import java.util.Comparator;
 /**
  * Compare Version beans in descending order with nulls last.
  */
-class OrderVersionDesc implements Comparator<Version<?>>, Serializable {
+final class OrderVersionDesc implements Comparator<Version<?>>, Serializable {
 
   static final OrderVersionDesc INSTANCE = new OrderVersionDesc();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java
index b330d7d25..ff5acb76c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java
@@ -10,7 +10,7 @@ import java.util.concurrent.FutureTask;
 /**
  * Default implementation of FutureIds.
  */
-public class QueryFutureIds<T> extends BaseFuture<List<Object>> implements FutureIds<T> {
+public final class QueryFutureIds<T> extends BaseFuture<List<Object>> implements FutureIds<T> {
 
   private final CallableQueryIds<T> call;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java
index 2d3999b61..34264ffcf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeoutException;
 /**
  * Default implementation for FutureList.
  */
-public class QueryFutureList<T> extends BaseFuture<List<T>> implements FutureList<T> {
+public final class QueryFutureList<T> extends BaseFuture<List<T>> implements FutureList<T> {
 
   private final CallableQueryList<T> call;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
index 52c7b0fca..832653f1d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
@@ -8,7 +8,7 @@ import java.util.concurrent.FutureTask;
 /**
  * Future implementation for the row count query.
  */
-public class QueryFutureRowCount<T> extends BaseFuture<Integer> implements FutureRowCount<T> {
+public final class QueryFutureRowCount<T> extends BaseFuture<Integer> implements FutureRowCount<T> {
 
   private final CallableQueryCount<T> call;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
index 53bd01f94..1ab789158 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
@@ -16,7 +16,7 @@ public abstract class QueryPlanLogger {
 
   abstract SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind);
 
-  SpiDbQueryPlan readQueryPlan(SpiQueryPlan plan, BindCapture bind, ResultSet rset) throws SQLException {
+  final SpiDbQueryPlan readQueryPlan(SpiQueryPlan 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");
@@ -27,11 +27,11 @@ public abstract class QueryPlanLogger {
     return createPlan(plan, bind.toString(), sb.toString());
   }
 
-  SpiDbQueryPlan createPlan(SpiQueryPlan plan, String bind, String planString) {
+  final SpiDbQueryPlan createPlan(SpiQueryPlan plan, String bind, String planString) {
     return plan.createMeta(bind, planString);
   }
 
-  SpiDbQueryPlan readQueryPlanBasic(SpiQueryPlan plan, BindCapture bind, ResultSet rset) throws SQLException {
+  final SpiDbQueryPlan readQueryPlanBasic(SpiQueryPlan plan, BindCapture bind, ResultSet rset) throws SQLException {
     StringBuilder sb = new StringBuilder();
     readPlanData(sb, rset);
     return createPlan(plan, bind.toString(), sb.toString().trim());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
index 6f89c138a..6319967d9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
@@ -12,7 +12,7 @@ import java.sql.SQLException;
 /**
  * A QueryPlanLogger that prefixes "EXPLAIN " to the query. This works for Postgres, H2 and MySql.
  */
-public class QueryPlanLoggerExplain extends QueryPlanLogger {
+public final class QueryPlanLoggerExplain extends QueryPlanLogger {
 
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
index 2d2f4702f..d4ccd81bb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
@@ -16,7 +16,7 @@ import java.sql.Statement;
  *
  * @author Roland Praml, FOCONIS AG
  */
-public class QueryPlanLoggerOracle extends QueryPlanLogger {
+public final class QueryPlanLoggerOracle extends QueryPlanLogger {
 
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
index 596f33bc0..f52654ba5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
@@ -12,7 +12,7 @@ import java.sql.SQLException;
 /**
  * A QueryPlanLogger for Postgres that prefixes "EXPLAIN ANALYZE" to the query.
  */
-public class QueryPlanLoggerPostgres extends QueryPlanLogger {
+public final class QueryPlanLoggerPostgres extends QueryPlanLogger {
 
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
index 6657448e2..c71072084 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
@@ -16,7 +16,7 @@ import java.sql.Statement;
  *
  * @author Roland Praml, FOCONIS AG
  */
-public class QueryPlanLoggerSqlServer extends QueryPlanLogger {
+public final class QueryPlanLoggerSqlServer extends QueryPlanLogger {
 
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
index 2a3fce499..b24a57e04 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
@@ -7,7 +7,7 @@ import java.util.Objects;
 /**
  * QueryPlanKey for RawSql queries.
  */
-class RawSqlQueryPlanKey implements CQueryPlanKey {
+final class RawSqlQueryPlanKey implements CQueryPlanKey {
 
   private final String sql;
   private final boolean rawSql;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
index 83c7b2936..cdeb345c0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java
@@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.DbReadContext;
  * partial objects.
  * </p>
  */
-public class SqlBeanLoad {
+public final class SqlBeanLoad {
 
   private final DbReadContext ctx;
   private final EntityBean bean;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index 5f548fd59..27e35c365 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -10,7 +10,7 @@ import java.util.Set;
 /**
  * Represents the SELECT clause part of the SQL query.
  */
-class SqlTree {
+final class SqlTree {
 
   private final SqlTreeNode rootNode;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
index 27ec943b4..9d46d07c3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
@@ -12,7 +12,7 @@ import java.util.TreeSet;
 /**
  * Special Map of the logical property joins to table alias.
  */
-class SqlTreeAlias {
+final class SqlTreeAlias {
 
   private final SpiQuery.TemporalMode temporalMode;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 65fa4f7f8..43e3a0215 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -30,44 +30,28 @@ public final class SqlTreeBuilder {
   private static final Logger logger = LoggerFactory.getLogger(SqlTreeBuilder.class);
 
   private final SpiQuery<?> query;
-
   private final STreeType desc;
-
   private final OrmQueryDetail queryDetail;
-
   private final CQueryPredicates predicates;
-
   private final boolean subQuery;
-
   private final boolean distinctOnPlatform;
   /**
    * Property if resultSet contains master and detail rows.
    */
   private STreePropertyAssocMany manyProperty;
-
   private final SqlTreeAlias alias;
-
   private final DefaultDbSqlContext ctx;
-
   private final HashSet<String> selectIncludes = new HashSet<>();
-
   private final ManyWhereJoins manyWhereJoins;
-
   private final TableJoin includeJoin;
-
   private final boolean rawSql;
-
   /**
    * rawNoId true if the RawSql does not include the @Id property
    */
   private final boolean rawNoId;
-
   private final boolean disableLazyLoad;
-
   private final SpiQuery.TemporalMode temporalMode;
-
   private SqlTreeNode rootNode;
-
   private boolean sqlDistinct;
 
   /**
@@ -103,9 +87,9 @@ public final class SqlTreeBuilder {
     this.temporalMode = SpiQuery.TemporalMode.of(query);
     this.disableLazyLoad = query.isDisableLazyLoading();
     this.subQuery = Type.SQ_EXISTS == query.getType()
-        || Type.SQ_IN == query.getType() 
-        || Type.ID_LIST == query.getType() 
-        || Type.DELETE == query.getType() 
+        || Type.SQ_IN == query.getType()
+        || Type.ID_LIST == query.getType()
+        || Type.DELETE == query.getType()
         || query.isCountDistinct();
     this.includeJoin = query.getM2mIncludeJoin();
     this.manyWhereJoins = query.getManyWhereJoins();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index 1c9bff694..83c8362a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -28,58 +28,40 @@ class SqlTreeNodeBean implements SqlTreeNode {
   private static final SqlTreeNode[] NO_CHILDREN = new SqlTreeNode[0];
 
   final STreeType desc;
-
   final IdBinder idBinder;
-
   /**
    * The children which will be other SelectBean or SelectProxyBean.
    */
   final SqlTreeNode[] children;
-
   /**
    * Set to true if this is a partial object fetch.
    */
   private final boolean partialObject;
-
   private final STreeProperty[] properties;
-
   /**
    * Extra where clause added by Where annotation on associated many.
    */
   private final String extraWhere;
-
   private final STreePropertyAssoc nodeBeanProp;
-
   /**
    * False if report bean and has no id property.
    */
   final boolean readId;
   private final boolean readIdNormal;
-
   private final boolean disableLazyLoad;
-
   private final InheritInfo inheritInfo;
-
   final String prefix;
-
   private final Map<String, String> pathMap;
-
   final STreePropertyAssocMany lazyLoadParent;
-
   private final SpiQuery.TemporalMode temporalMode;
-
   private final boolean temporalVersions;
-
   private final IdBinder lazyLoadParentIdBinder;
-
   String baseTableAlias;
-
   /**
    * Table alias set if this bean node includes a join to a intersection
    * table and that table has history support.
    */
   private boolean intersectionAsOfTableAlias;
-
   private final boolean aggregation;
 
   /**
@@ -131,12 +113,12 @@ class SqlTreeNodeBean implements SqlTreeNode {
   }
 
   @Override
-  public boolean isSingleProperty() {
+  public final boolean isSingleProperty() {
     return properties != null && properties.length == 1 && children.length == 0;
   }
 
   @Override
-  public ScalarDataReader<?> getSingleAttributeReader() {
+  public final 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) {
@@ -172,7 +154,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   }
 
   @Override
-  public void buildRawSqlSelectChain(List<String> selectChain) {
+  public final void buildRawSqlSelectChain(List<String> selectChain) {
     if (readId) {
       if (inheritInfo != null) {
         // discriminator column always proceeds id column
@@ -194,7 +176,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   /**
    * Load that takes into account inheritance.
    */
-  private class LoadInherit extends Load {
+  private final class LoadInherit extends Load {
 
     private LoadInherit(DbReadContext ctx, EntityBean parentBean) {
       super(ctx, parentBean);
@@ -437,7 +419,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     /**
      * Perform the load returning the loaded bean.
      */
-    EntityBean perform() throws SQLException {
+    final EntityBean perform() throws SQLException {
       initialise();
       if (isLazyLoadManyRoot()) {
         return getContextBean();
@@ -451,7 +433,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
      * Return true if this bean was already in the context. If already in the
      * context we need to check if it is already contained in the collection.
      */
-    boolean isContextBean() {
+    final boolean isContextBean() {
       return localBean == null;
     }
   }
@@ -467,12 +449,12 @@ class SqlTreeNodeBean implements SqlTreeNode {
   /**
    * Create the loader with or without inheritance.
    */
-  Load createLoad(DbReadContext ctx, EntityBean parentBean) {
+  final Load createLoad(DbReadContext ctx, EntityBean parentBean) {
     return (inheritInfo != null) ? new LoadInherit(ctx, parentBean) : new Load(ctx, parentBean);
   }
 
   @Override
-  public void appendGroupBy(DbSqlContext ctx, boolean subQuery) {
+  public final void appendGroupBy(DbSqlContext ctx, boolean subQuery) {
     ctx.pushJoin(prefix);
     ctx.pushTableAlias(prefix);
     if (lazyLoadParent != null) {
@@ -507,7 +489,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
    * Append the property columns to the buffer.
    */
   @Override
-  public void appendSelect(DbSqlContext ctx, boolean subQuery) {
+  public final void appendSelect(DbSqlContext ctx, boolean subQuery) {
     ctx.pushJoin(prefix);
     ctx.pushTableAlias(prefix);
     if (temporalVersions) {
@@ -532,7 +514,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   }
 
   @Override
-  public boolean isAggregation() {
+  public final boolean isAggregation() {
     if (aggregation) {
       return true;
     }
@@ -553,14 +535,14 @@ class SqlTreeNodeBean implements SqlTreeNode {
     }
   }
 
-  void appendSelectId(DbSqlContext ctx, STreeProperty prop) {
+  final void appendSelectId(DbSqlContext ctx, STreeProperty prop) {
     if (prop != null) {
       prop.appendSelect(ctx, false);
     }
   }
 
   @Override
-  public void appendWhere(DbSqlContext ctx) {
+  public final void appendWhere(DbSqlContext ctx) {
     // Only apply inheritance to root node as any join will already have the inheritance join include - see TableJoin
     if (inheritInfo != null && nodeBeanProp == null) {
       if (!inheritInfo.isRoot()) {
@@ -618,7 +600,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   }
 
   @Override
-  public void addSoftDeletePredicate(SpiQuery<?> query) {
+  public final void addSoftDeletePredicate(SpiQuery<?> query) {
     if (desc.isSoftDelete()) {
       query.addSoftDeletePredicate(desc.getSoftDeletePredicate(baseTableAlias));
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 1b31ee08c..ae5e5bf3f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.Version;
 import io.ebean.bean.EntityBean;
 import io.ebean.core.type.ScalarType;
 import io.ebean.util.SplitName;
@@ -22,7 +21,7 @@ import java.util.Set;
  * etc in this case we must add an extra join.
  * </p>
  */
-class SqlTreeNodeExtraJoin implements SqlTreeNode {
+final class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
   private final STreePropertyAssoc assocBeanProperty;
   private final SpiQuery.TemporalMode temporalMode;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
index 20a3037da..faf1ce4f1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.Version;
 import io.ebean.bean.EntityBean;
 import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.SpiQuery;
@@ -13,7 +12,7 @@ import java.util.Set;
 /**
  * Join to Many (or child of a many) to support where clause predicates on many properties.
  */
-class SqlTreeNodeFormulaWhereJoin implements SqlTreeNode {
+final class SqlTreeNodeFormulaWhereJoin implements SqlTreeNode {
 
   private final STreeProperty nodeBeanProp;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index c537c4bf7..c3f534a25 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.query;
 
-import io.ebean.Version;
 import io.ebean.bean.EntityBean;
 import io.ebean.core.type.ScalarType;
 import io.ebean.util.SplitName;
@@ -15,21 +14,16 @@ import java.util.Set;
 /**
  * Join to Many (or child of a many) to support where clause predicates on many properties.
  */
-class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
+final class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
 
   private final String parentPrefix;
-
   private final String prefix;
-
   private final STreePropertyAssoc nodeBeanProp;
-
   private final STreeType target;
-
   /**
    * The many where join which is either INNER or OUTER.
    */
   private final SqlJoinType manyJoinType;
-
   private final boolean softDelete;
 
   SqlTreeNodeManyWhereJoin(String prefix, STreePropertyAssoc prop, SqlJoinType manyJoinType, SpiQuery.TemporalMode temporalMode) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
index e52477cf1..a58c51cc5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java
@@ -18,9 +18,7 @@ import java.util.Set;
 final class SqlTreeNodeRoot extends SqlTreeNodeBean implements SqlTreeRoot {
 
   private final TableJoin includeJoin;
-
   private final boolean sqlDistinct;
-
   private final String baseTable;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index f46ca8088..489341789 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -10,24 +10,16 @@ import java.util.List;
 /**
  * The select properties for a node in the SqlTree.
  */
-public class SqlTreeProperties {
+public final class SqlTreeProperties {
 
-  /**
-   * The bean properties in order.
-   */
   private final List<STreeProperty> propsList = new ArrayList<>();
-
   /**
    * Maintain a list of property names to detect embedded bean additions.
    */
   private final LinkedHashSet<String> propNames = new LinkedHashSet<>();
-
   private boolean allProperties;
-
   private boolean aggregationManyToOne;
-
   private boolean aggregation;
-
   private String aggregationPath;
 
   SqlTreeProperties() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java
index 62fd3cdf0..4ad835188 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java
@@ -15,14 +15,12 @@ import io.ebeaninternal.api.SpiCancelableQuery;
  */
 public class AbstractQuery implements SpiCancelableQuery {
 
+  private final ReentrantLock lock = new ReentrantLock();
   private boolean cancelled;
-
   private CancelableQuery cancelableQuery;
 
-  private final ReentrantLock lock = new ReentrantLock();
-  
   @Override
-  public void cancel() {
+  public final void cancel() {
     lock.lock();
     try {
       if (!cancelled) {
@@ -37,14 +35,14 @@ public class AbstractQuery implements SpiCancelableQuery {
   }
 
   @Override
-  public void checkCancelled() {
+  public final void checkCancelled() {
     if (cancelled) {
       throw new PersistenceException("Query was cancelled");
     }
   }
 
   @Override
-  public void setCancelableQuery(CancelableQuery cancelableQuery) {
+  public final void setCancelableQuery(CancelableQuery cancelableQuery) {
     lock.lock();
     try {
       checkCancelled();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index c2cb02198..4a72c0057 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -21,35 +21,20 @@ import java.util.stream.Stream;
 /**
  * Default implementation of DtoQuery.
  */
-public class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQuery<T> {
+public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQuery<T> {
 
   private final SpiEbeanServer server;
-
   private final DtoBeanDescriptor<T> descriptor;
-
   private final SpiQuery<?> ormQuery;
-
   private String sql;
-
   private int firstRow;
-
   private int maxRows;
-
   private int timeout;
-
   private int bufferFetchSizeHint;
-
   private boolean relaxedMode;
-
   private String label;
-
   private ProfileLocation profileLocation;
-
-  /**
-   * Bind parameters when using the query language.
-   */
   private final BindParams bindParams = new BindParams();
-
   private Transaction transaction;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index b5aeec323..65ba6b9a3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -32,77 +32,47 @@ import java.util.stream.Stream;
 /**
  * Default implementation of an Object Relational query.
  */
-public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
+public final class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   private static final String DEFAULT_QUERY_NAME = "default";
-
   private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
-
   private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
-
   private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();
 
   private final Class<T> beanType;
-
   private final ExpressionFactory expressionFactory;
-
   private final BeanDescriptor<T> rootBeanDescriptor;
-
   private BeanDescriptor<T> beanDescriptor;
-
   private SpiEbeanServer server;
-
   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.
    */
   private TableJoin m2mIncludeJoin;
-
   private ProfilingListener profilingListener;
-
   private Type type;
-
   private String label;
-
   private Mode mode = Mode.NORMAL;
-
   private Object tenantId;
-
   /**
    * Holds query in structured form.
    */
   private OrmQueryDetail detail;
-
   private int maxRows;
-
   private int firstRow;
-
-  /**
-   * Set to true to disable lazy loading on the object graph returned.
-   */
   private boolean disableLazyLoading;
-
   /**
    * Lazy loading batch size (can override server wide default).
    */
   private int lazyLoadBatchSize;
-
   private OrderBy<T> orderBy;
-
   private String loadMode;
-
   private String loadDescription;
-
   private String generatedSql;
-
   private String lazyLoadProperty;
-
   private String lazyLoadManyPath;
-
   private boolean allowLoadErrors;
-
   /**
    * Flag set for report/DTO beans when we may choose to explicitly include the Id property.
    */
@@ -141,97 +111,55 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * Bind parameters when using the query language.
    */
   private BindParams bindParams;
-
   private DefaultExpressionList<T> textExpressions;
-
   private DefaultExpressionList<T> whereExpressions;
-
   private DefaultExpressionList<T> havingExpressions;
-
   private boolean asOfBaseTable;
-
   private int asOfTableCount;
 
   /**
    * Set for flashback style 'as of' query.
    */
   private Timestamp asOf;
-
   private TemporalMode temporalMode = TemporalMode.CURRENT;
-
   private Timestamp versionsStart;
   private Timestamp versionsEnd;
-
   private List<String> softDeletePredicates;
-
   private boolean disableReadAudit;
-
   private int bufferFetchSizeHint;
-
   private boolean usageProfiling = true;
-
   private CacheMode useBeanCache = CacheMode.AUTO;
-
   private CacheMode useQueryCache = CacheMode.OFF;
-
   private Boolean readOnly;
-
   private PersistenceContextScope persistenceContextScope;
 
   /**
    * Allow for explicit on off or null for default.
    */
   private Boolean autoTune;
-
   private LockWait forUpdate;
   private LockType lockType;
-
   private boolean singleAttribute;
-
   private CountDistinctOrder countDistinctOrder;
-
-  /**
-   * Set to true if this query has been tuned by autoTune.
-   */
   private boolean autoTuned;
-
-  /**
-   * Root table alias. For {@link Query#alias(String)} command.
-   */
   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
    * point.
    */
   private ObjectGraphNode parentNode;
-
   private BeanPropertyAssocMany<?> lazyLoadForParentsProperty;
-
-  /**
-   * Hash of final query after AutoTune tuning.
-   */
   private CQueryPlanKey queryPlanKey;
-
   private PersistenceContext persistenceContext;
-
   private ManyWhereJoins manyWhereJoins;
-
   private SpiRawSql rawSql;
-
   private boolean useDocStore;
-
   private String docIndexName;
-
   private OrmUpdateProperties updateProperties;
-
   private String nativeSql;
-
   private boolean orderById;
-
   private ProfileLocation profileLocation;
 
   public DefaultOrmQuery(BeanDescriptor<T> desc, SpiEbeanServer server, ExpressionFactory expressionFactory) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java
index 0381df322..88b84fc2f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java
@@ -14,41 +14,21 @@ public final class DefaultOrmUpdate<T> implements SpiUpdate<T>, Serializable {
 
   private static final long serialVersionUID = -8791423602246515438L;
 
-
   private transient final EbeanServer server;
-
   private final Class<?> beanType;
-
-  /**
-   * The name of the update.
-   */
   private final String name;
-
   private String label;
-
-  /**
-   * The parameters used to bind to the sql.
-   */
   private final BindParams bindParams = new BindParams();
-
-  /**
-   * The sql update or delete statement.
-   */
   private final String updateStatement;
-
   /**
    * Automatically detect the table being modified by this sql. This will
    * register this information so that eBean invalidates cached objects if
    * required.
    */
   private boolean notifyCache = true;
-
   private int timeout;
-
   private String generatedSql;
-
   private final String baseTable;
-
   private final OrmUpdateType type;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index 6afe54a1f..879d1bdaf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -17,27 +17,17 @@ import java.util.function.Predicate;
 /**
  * Default implementation of SQuery - SQL Query.
  */
-public class DefaultRelationalQuery extends AbstractQuery implements SpiSqlQuery {
+public final class DefaultRelationalQuery extends AbstractQuery implements SpiSqlQuery {
 
   private static final long serialVersionUID = -1098305779779591068L;
 
   private final transient SpiEbeanServer server;
-
   private final String query;
-
   private String label;
-
   private int firstRow;
-
   private int maxRows;
-
   private int timeout;
-
   private int bufferFetchSizeHint;
-
-  /**
-   * Bind parameters when using the query language.
-   */
   private final BindParams bindParams = new BindParams();
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
index 897424b8a..c9ed9ca11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java
@@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Default implementation of UpdateQuery.
  */
-public class DefaultUpdateQuery<T> implements UpdateQuery<T> {
+public final class DefaultUpdateQuery<T> implements UpdateQuery<T> {
 
   private final OrmUpdateProperties values = new OrmUpdateProperties();
   private final DefaultOrmQuery<T> query;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/NaturalKeyBindParam.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/NaturalKeyBindParam.java
index 3655a3ef4..301ec4ef3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/NaturalKeyBindParam.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/NaturalKeyBindParam.java
@@ -1,9 +1,8 @@
 package io.ebeaninternal.server.querydefn;
 
-public class NaturalKeyBindParam {
+public final class NaturalKeyBindParam {
 
   private final String name;
-
   private final Object value;
 
   public NaturalKeyBindParam(String name, Object value) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java
index e63526063..f2585a708 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java
@@ -7,10 +7,9 @@ import javax.persistence.PersistenceException;
 /**
  * Named parameter used as placeholder in expressions created by EQL language parsing.
  */
-class ONamedParam implements SpiNamedParam {
+final class ONamedParam implements SpiNamedParam {
 
   private final String name;
-
   private Object value;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 2fabfdd79..90f4cbac1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -21,7 +21,7 @@ import java.util.*;
  * Tuning a query is a matter of replacing an instance of this class with one that has been tuned
  * with select() and join() set.
  */
-public class OrmQueryDetail implements Serializable {
+public final class OrmQueryDetail implements Serializable {
 
   private static final long serialVersionUID = -2510486880141461807L;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
index 0314b55b6..744f70ebf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
@@ -9,10 +9,9 @@ import javax.persistence.PersistenceException;
  * replace the OrmQueryDetail leaving the attributes unchanged.
  * </p>
  */
-public class OrmQueryDetailParser {
+public final class OrmQueryDetailParser {
 
   private final OrmQueryDetail detail = new OrmQueryDetail();
-
   private final SimpleTextParser parser;
 
   public OrmQueryDetailParser(String oql) {
@@ -20,7 +19,6 @@ public class OrmQueryDetailParser {
   }
 
   public OrmQueryDetail parse() throws PersistenceException {
-
     if (parser.isEmpty()) return detail;
 
     parser.nextWord();
@@ -68,7 +66,6 @@ public class OrmQueryDetailParser {
   }
 
   private OrmQueryProperties readFindFetch() {
-
     boolean readAlias = false;
 
     String props = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java
index 99354bf71..a36889557 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java
@@ -4,16 +4,12 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.SqlLimitRequest;
 import io.ebeaninternal.api.SpiQuery;
 
-public class OrmQueryLimitRequest implements SqlLimitRequest {
+public final class OrmQueryLimitRequest implements SqlLimitRequest {
 
   private final SpiQuery<?> ormQuery;
-
   private final DatabasePlatform dbPlatform;
-
   private final String sql;
-
   private final String sqlOrderBy;
-
   private final boolean distinct;
 
   public OrmQueryLimitRequest(String sql, String sqlOrderBy, SpiQuery<?> ormQuery, DatabasePlatform dbPlatform, boolean distinct) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index 3a9ac8e33..3ce478c92 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -8,7 +8,7 @@ import java.util.Objects;
 /**
  * Query plan key for ORM queries.
  */
-class OrmQueryPlanKey implements CQueryPlanKey {
+final class OrmQueryPlanKey implements CQueryPlanKey {
 
   private final SpiRawSql.Key rawSqlKey;
   private final int maxRows;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 0a8b51465..98864e744 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -23,7 +23,7 @@ import java.util.Set;
 /**
  * Represents the Properties of an Object Relational query.
  */
-public class OrmQueryProperties implements Serializable {
+public final class OrmQueryProperties implements Serializable {
 
   private static final long serialVersionUID = -8785582703966455658L;
 
@@ -35,30 +35,24 @@ public class OrmQueryProperties implements Serializable {
   private final Set<String> included;
   private final FetchConfig fetchConfig;
   private final boolean cache;
-
   /**
    * Flag set when this fetch path needs to be a query join.
    */
   private boolean markForQueryJoin;
-
   /**
    * Included bean joins.
    */
   private Set<String> includedBeanJoin;
-
   /**
    * Add these properties to the select so that the foreign key columns are included in the query.
    */
   private Set<String> secondaryQueryJoins;
-
   private List<OrmQueryProperties> secondaryChildren;
-
   /**
    * OrderBy properties that where on the main query but moved here as they relate to this (query join).
    */
   @SuppressWarnings("rawtypes")
   private OrderBy orderBy;
-
   /**
    * A filter that can be applied to the fetch of this path in the object graph.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java
index 738566597..4d2a94b1c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java
@@ -7,10 +7,9 @@ import java.util.List;
 /**
  * The secondary query paths for 'query joins' and 'lazy loading'.
  */
-class OrmQuerySecondary implements SpiQuerySecondary {
+final class OrmQuerySecondary implements SpiQuerySecondary {
 
   private final List<OrmQueryProperties> queryJoins;
-
   private final List<OrmQueryProperties> lazyJoins;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
index 930e653f4..5a9d5b392 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
@@ -13,10 +13,9 @@ import java.util.Set;
 /**
  * Set properties for a UpdateQuery.
  */
-public class OrmUpdateProperties {
+public final class OrmUpdateProperties {
 
   private static final NullValue NULL_VALUE = new NullValue();
-
   private static final NoneValue NONE_VALUE = new NoneValue();
 
   /**
@@ -41,7 +40,7 @@ public class OrmUpdateProperties {
   /**
    * Set property to null.
    */
-  private static class NullValue extends Value {
+  private static final class NullValue extends Value {
     @Override
     public String bindClause() {
       return "=null";
@@ -51,7 +50,7 @@ public class OrmUpdateProperties {
   /**
    * Set property to a simple value.
    */
-  private static class SimpleValue extends Value {
+  private static final class SimpleValue extends Value {
 
     final Object value;
     final ScalarType<Object> scalarType;
@@ -85,7 +84,7 @@ public class OrmUpdateProperties {
   /**
    * Set using an expression with no bind value.
    */
-  private static class NoneValue extends Value {
+  private static final class NoneValue extends Value {
     @Override
     public String bindClause() {
       return "";
@@ -95,7 +94,7 @@ public class OrmUpdateProperties {
   /**
    * Set using an expression with many bind values.
    */
-  private static class RawArrayValue extends Value {
+  private static final class RawArrayValue extends Value {
 
     final Object[] bindValues;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java
index 849234e8c..0072c8eec 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java
@@ -1,11 +1,10 @@
 package io.ebeaninternal.server.querydefn;
 
-public class SimpleTextParser {
+public final class SimpleTextParser {
 
   private final String oql;
   private final char[] chars;
   private final int eof;
-
   private int pos;
   private String word;
   private String lowerWord;

From f3b0e34b673c15feb5ca0c83ea5d665f5c5e3ca1 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 09:16:31 +1200
Subject: [PATCH 387/447] #2315 - Refactor internals - make more classes final
 in transaction packages

---
 .../properties/BeanPropertiesReader.java      |   3 +-
 .../server/transaction/BeanPersistIds.java    |   4 +-
 .../transaction/BulkEventListenerMap.java     |   6 +-
 .../transaction/DefaultProfileHandler.java    |   2 +-
 .../transaction/DefaultProfileStream.java     |   2 +-
 .../DefaultTransactionScopeManager.java       |  11 +-
 .../transaction/DocStoreOnlyTransaction.java  |   2 +-
 .../DocStoreTransactionManager.java           |   2 +-
 .../ExternalTransactionScopeManager.java      |   2 +-
 .../ImplicitReadOnlyTransaction.java          |   2 +-
 .../server/transaction/JdbcTransaction.java   | 169 +++++++++---------
 .../server/transaction/JtaTransaction.java    |   2 +-
 .../transaction/JtaTransactionManager.java    |   2 +-
 .../server/transaction/NoTransaction.java     |   4 +-
 .../transaction/NoopProfileHandler.java       |   2 +-
 .../server/transaction/RemoteTableMod.java    |   2 +-
 .../transaction/RemoteTransactionEvent.java   |   2 +-
 .../transaction/SavepointTransaction.java     |   2 +-
 .../server/transaction/TChangeLogHolder.java  |   2 +-
 .../server/transaction/TableModState.java     |   2 +-
 .../transaction/TransactionFactory.java       |   5 +-
 .../transaction/TransactionFactoryBasic.java  |   3 +-
 .../TransactionFactoryBasicWithRead.java      |   5 +-
 .../TransactionFactoryBuilder.java            |   2 +-
 .../transaction/TransactionFactoryTenant.java |   3 +-
 .../TransactionFactoryTenantWithRead.java     |   5 +-
 .../transaction/TransactionManager.java       |  90 +++++-----
 .../TransactionManagerOptions.java            |   2 +-
 .../transaction/TransactionProfile.java       |   2 +-
 29 files changed, 161 insertions(+), 181 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java
index e00fdf497..a283a42ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java
@@ -8,10 +8,9 @@ import java.util.Map;
 /**
  * Determines the properties on a given bean.
  */
-public class BeanPropertiesReader {
+public final class BeanPropertiesReader {
 
   private final Map<String, Integer> propertyIndexMap = new HashMap<>();
-
   private final String[] props;
 
   public BeanPropertiesReader(Class<?> clazz) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index bb1690bfe..280f3c28f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -28,12 +28,10 @@ import java.util.List;
  * size of data sent around the network.
  * </p>
  */
-public class BeanPersistIds implements BinaryWritable {
+public final class BeanPersistIds implements BinaryWritable {
 
   private final BeanDescriptor<?> beanDescriptor;
-
   private final String descriptorId;
-
   /**
    * The ids to invalidate from the cache (updates and deletes).
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java
index 86a6428b7..bcc91909f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java
@@ -8,12 +8,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
-public class BulkEventListenerMap {
+public final class BulkEventListenerMap {
 
   private final HashMap<String, Entry> map = new HashMap<>();
 
   public BulkEventListenerMap(List<BulkTableEventListener> listeners) {
-
     if (listeners != null) {
       for (BulkTableEventListener l : listeners) {
         Set<String> tables = l.registeredTables();
@@ -29,7 +28,6 @@ public class BulkEventListenerMap {
   }
 
   public void process(BulkTableEvent event) {
-
     Entry entry = map.get(event.getTableName());
     if (entry != null) {
       entry.process(event);
@@ -42,7 +40,7 @@ public class BulkEventListenerMap {
     entry.add(l);
   }
 
-  private static class Entry {
+  private static final class Entry {
 
     final List<BulkTableEventListener> listeners = new ArrayList<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
index 38f5446d2..177e4bc15 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
@@ -38,7 +38,7 @@ import static java.time.temporal.ChronoField.YEAR;
  * <p>
  * Uses a sleep backoff on the single threaded consumer that reads the profiles and writes them to files.
  */
-public class DefaultProfileHandler implements SpiProfileHandler, Plugin {
+public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
 
   private static final Logger log = LoggerFactory.getLogger(DefaultProfileHandler.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileStream.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileStream.java
index bc2913137..38c38e3d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileStream.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileStream.java
@@ -5,7 +5,7 @@ import io.ebean.ProfileLocation;
 /**
  * Default transaction profiling event collection.
  */
-public class DefaultProfileStream implements ProfileStream {
+public final class DefaultProfileStream implements ProfileStream {
 
   private final long startNanos;
   private final StringBuilder buffer;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
index 0cabba365..2ad93d490 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java
@@ -9,7 +9,6 @@ import javax.persistence.PersistenceException;
  */
 public class DefaultTransactionScopeManager extends TransactionScopeManager {
 
-
   private final ThreadLocal<SpiTransaction> local = new ThreadLocal<>();
 
   @Override
@@ -18,7 +17,7 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
   }
 
   @Override
-  public SpiTransaction getInScope() {
+  public final SpiTransaction getInScope() {
     return local.get();
   }
 
@@ -33,7 +32,7 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
   }
 
   @Override
-  public void replace(SpiTransaction trans) {
+  public final void replace(SpiTransaction trans) {
     if (trans == null) {
       throw new IllegalStateException("Setting a null transaction?");
     }
@@ -41,7 +40,7 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
   }
 
   @Override
-  public void set(SpiTransaction trans) {
+  public final void set(SpiTransaction trans) {
     if (trans == null) {
       throw new IllegalStateException("Setting a null transaction?");
     }
@@ -50,13 +49,13 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager {
   }
 
   @Override
-  public void clear() {
+  public final void clear() {
     checkForActiveTransaction();
     local.remove();
   }
 
   @Override
-  public void clearExternal() {
+  public final void clearExternal() {
     local.remove();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
index 43fb216a5..0165fb1e8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java
@@ -5,7 +5,7 @@ import java.sql.Connection;
 /**
  * Document store only transaction.
  */
-public class DocStoreOnlyTransaction extends JdbcTransaction {
+public final class DocStoreOnlyTransaction extends JdbcTransaction {
 
   /**
    * Create a new DocStore  only Transaction.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
index 364e46841..d23476c25 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
@@ -9,7 +9,7 @@ import java.sql.Connection;
  * <p>
  * There is no underlying JDBC DataSource etc
  */
-public class DocStoreTransactionManager extends TransactionManager {
+public final class DocStoreTransactionManager extends TransactionManager {
 
   /**
    * Create the TransactionManager
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
index b033e277b..6922e2129 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiTransaction;
 /**
  * A TransactionScopeManager aware of external transaction managers.
  */
-public class ExternalTransactionScopeManager extends DefaultTransactionScopeManager {
+public final class ExternalTransactionScopeManager extends DefaultTransactionScopeManager {
 
   private final ExternalTransactionManager externalManager;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index e4e36e337..cbb4f7618 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * persisting features are attempted to be used - which is not expected).
  * </p>
  */
-class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCodes {
+final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   private static final Logger logger = LoggerFactory.getLogger(ImplicitReadOnlyTransaction.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index f61f03699..d271d1c04 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -219,56 +219,56 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setLabel(String label) {
+  public final void setLabel(String label) {
     this.label = label;
   }
 
   @Override
-  public String getLabel() {
+  public final String getLabel() {
     return label;
   }
 
   @Override
-  public long getStartNanoTime() {
+  public final long getStartNanoTime() {
     return startNanos;
   }
 
   @Override
-  public long profileOffset() {
+  public final long profileOffset() {
     return (profileStream == null) ? 0 : profileStream.offset();
   }
 
   @Override
-  public void profileEvent(SpiProfileTransactionEvent event) {
+  public final void profileEvent(SpiProfileTransactionEvent event) {
     if (profileStream != null) {
       event.profile();
     }
   }
 
   @Override
-  public void setProfileStream(ProfileStream profileStream) {
+  public final void setProfileStream(ProfileStream profileStream) {
     this.profileStream = profileStream;
   }
 
   @Override
-  public ProfileStream profileStream() {
+  public final ProfileStream profileStream() {
     return profileStream;
   }
 
   @Override
-  public void setProfileLocation(ProfileLocation profileLocation) {
+  public final void setProfileLocation(ProfileLocation profileLocation) {
     this.profileLocation = profileLocation;
   }
 
   @Override
-  public ProfileLocation getProfileLocation() {
+  public final ProfileLocation getProfileLocation() {
     return profileLocation;
   }
 
   /**
    * Overridden in AutoCommitJdbcTransaction as that expects to run/operate with autocommit true.
    */
-  void checkAutoCommit(Connection connection) throws SQLException {
+  final void checkAutoCommit(Connection connection) throws SQLException {
     if (connection != null) {
       this.autoCommit = connection.getAutoCommit();
       if (this.autoCommit) {
@@ -289,34 +289,34 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setAutoPersistUpdates(boolean autoPersistUpdates) {
+  public final void setAutoPersistUpdates(boolean autoPersistUpdates) {
     this.autoPersistUpdates = autoPersistUpdates;
     this.batchMode = true;
   }
 
   @Override
-  public boolean isAutoPersistUpdates() {
+  public final boolean isAutoPersistUpdates() {
     return autoPersistUpdates;
   }
 
   @Override
-  public boolean isSkipCacheExplicit() {
+  public final boolean isSkipCacheExplicit() {
     return (skipCache != null && !skipCache);
   }
 
   @Override
-  public boolean isSkipCache() {
+  public final boolean isSkipCache() {
     if (skipCache != null) return skipCache;
     return skipCacheAfterWrite && !queryOnly;
   }
 
   @Override
-  public void setSkipCache(boolean skipCache) {
+  public final void setSkipCache(boolean skipCache) {
     this.skipCache = skipCache;
   }
 
   @Override
-  public String getLogPrefix() {
+  public final String getLogPrefix() {
     return logPrefix;
   }
 
@@ -330,7 +330,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void addBeanChange(BeanChange beanChange) {
+  public final void addBeanChange(BeanChange beanChange) {
     if (changeLogHolder == null) {
       changeLogHolder = new TChangeLogHolder(this, 100);
     }
@@ -338,14 +338,14 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void sendChangeLog(ChangeSet changesRequest) {
+  public final void sendChangeLog(ChangeSet changesRequest) {
     if (manager != null) {
       manager.sendChangeLog(changesRequest);
     }
   }
 
   @Override
-  public void register(TransactionCallback callback) {
+  public final void register(TransactionCallback callback) {
     if (callbackList == null) {
       callbackList = new ArrayList<>(4);
     }
@@ -391,27 +391,27 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public int getDocStoreBatchSize() {
+  public final int getDocStoreBatchSize() {
     return docStoreBatchSize;
   }
 
   @Override
-  public void setDocStoreBatchSize(int docStoreBatchSize) {
+  public final void setDocStoreBatchSize(int docStoreBatchSize) {
     this.docStoreBatchSize = docStoreBatchSize;
   }
 
   @Override
-  public DocStoreMode getDocStoreMode() {
+  public final DocStoreMode getDocStoreMode() {
     return docStoreMode;
   }
 
   @Override
-  public void setDocStoreMode(DocStoreMode docStoreMode) {
+  public final void setDocStoreMode(DocStoreMode docStoreMode) {
     this.docStoreMode = docStoreMode;
   }
 
   @Override
-  public void registerDeferred(PersistDeferredRelationship derived) {
+  public final void registerDeferred(PersistDeferredRelationship derived) {
     if (deferredList == null) {
       deferredList = new ArrayList<>();
     }
@@ -425,7 +425,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * </p>
    */
   @Override
-  public void registerDeleteBean(Integer persistingBean) {
+  public final void registerDeleteBean(Integer persistingBean) {
     if (deletingBeansHash == null) {
       deletingBeansHash = new HashSet<>();
     }
@@ -436,7 +436,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return true if this is a bean that has already been saved/deleted.
    */
   @Override
-  public boolean isRegisteredDeleteBean(Integer persistingBean) {
+  public final boolean isRegisteredDeleteBean(Integer persistingBean) {
     return deletingBeansHash != null && deletingBeansHash.contains(persistingBean);
   }
 
@@ -444,7 +444,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Unregister the persisted beans (when persisting at the top level).
    */
   @Override
-  public void unregisterBeans() {
+  public final void unregisterBeans() {
     persistingBeans.clear();
   }
 
@@ -453,7 +453,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * register the bean if it is not already.
    */
   @Override
-  public boolean isRegisteredBean(Object bean) {
+  public final boolean isRegisteredBean(Object bean) {
     if (persistingBeans == null) {
       persistingBeans = new IdentityHashMap<>();
     }
@@ -465,7 +465,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * This is to stop m2m intersection management via both directions of a m2m.
    */
   @Override
-  public boolean isSaveAssocManyIntersection(String intersectionTable, String beanName) {
+  public final boolean isSaveAssocManyIntersection(String intersectionTable, String beanName) {
     if (m2mIntersectionSave == null) {
       // first attempt so yes allow this m2m intersection direction
       m2mIntersectionSave = new HashMap<>();
@@ -500,7 +500,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * @param diff the amount to add or subtract from the depth.
    */
   @Override
-  public void depth(int diff) {
+  public final void depth(int diff) {
     depth += diff;
   }
 
@@ -508,12 +508,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return the current depth.
    */
   @Override
-  public int depth() {
+  public final int depth() {
     return depth;
   }
 
   @Override
-  public void markNotQueryOnly() {
+  public final void markNotQueryOnly() {
     this.queryOnly = false;
   }
 
@@ -543,17 +543,17 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
+  public final void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) {
     this.updateAllLoadedProperties = updateAllLoadedProperties;
   }
 
   @Override
-  public Boolean isUpdateAllLoadedProperties() {
+  public final Boolean isUpdateAllLoadedProperties() {
     return updateAllLoadedProperties;
   }
 
   @Override
-  public void setBatchMode(boolean batchMode) {
+  public final void setBatchMode(boolean batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
@@ -561,12 +561,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public boolean isBatchMode() {
+  public final boolean isBatchMode() {
     return batchMode;
   }
 
   @Override
-  public void setBatchOnCascade(boolean batchMode) {
+  public final void setBatchOnCascade(boolean batchMode) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
@@ -574,17 +574,17 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public boolean isBatchOnCascade() {
+  public final boolean isBatchOnCascade() {
     return batchOnCascadeMode;
   }
 
   @Override
-  public Boolean getBatchGetGeneratedKeys() {
+  public final Boolean getBatchGetGeneratedKeys() {
     return batchGetGeneratedKeys;
   }
 
   @Override
-  public void setGetGeneratedKeys(boolean getGeneratedKeys) {
+  public final void setGetGeneratedKeys(boolean getGeneratedKeys) {
     this.batchGetGeneratedKeys = getGeneratedKeys;
     if (batchControl != null) {
       batchControl.setGetGeneratedKeys(getGeneratedKeys);
@@ -592,7 +592,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setFlushOnMixed(boolean batchFlushOnMixed) {
+  public final void setFlushOnMixed(boolean batchFlushOnMixed) {
     this.batchFlushOnMixed = batchFlushOnMixed;
     if (batchControl != null) {
       batchControl.setBatchFlushOnMixed(batchFlushOnMixed);
@@ -606,12 +606,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * </p>
    */
   @Override
-  public int getBatchSize() {
+  public final int getBatchSize() {
     return batchSize;
   }
 
   @Override
-  public void setBatchSize(int batchSize) {
+  public final void setBatchSize(int batchSize) {
     this.batchSize = batchSize;
     if (batchControl != null) {
       batchControl.setBatchSize(batchSize);
@@ -619,12 +619,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public boolean isFlushOnQuery() {
+  public final boolean isFlushOnQuery() {
     return batchFlushOnQuery;
   }
 
   @Override
-  public void setFlushOnQuery(boolean batchFlushOnQuery) {
+  public final void setFlushOnQuery(boolean batchFlushOnQuery) {
     this.batchFlushOnQuery = batchFlushOnQuery;
   }
 
@@ -633,12 +633,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * this request should be executed immediately.
    */
   @Override
-  public boolean isBatchThisRequest() {
+  public final boolean isBatchThisRequest() {
     return batchMode;
   }
 
   @Override
-  public void checkBatchEscalationOnCollection() {
+  public final void checkBatchEscalationOnCollection() {
     if (!batchMode && batchOnCascadeMode) {
       batchMode = true;
       batchOnCascadeSet = true;
@@ -646,7 +646,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void flushBatchOnCollection() {
+  public final void flushBatchOnCollection() {
     if (batchOnCascadeSet) {
       batchFlushReset();
       // restore the previous batch mode of NONE
@@ -675,7 +675,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public PersistenceException translate(String message, SQLException cause) {
+  public final PersistenceException translate(String message, SQLException cause) {
     if (manager != null) {
       return manager.translate(message, cause);
     }
@@ -686,14 +686,14 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Flush after completing persist cascade.
    */
   @Override
-  public void flushBatchOnCascade() {
+  public final void flushBatchOnCascade() {
     batchFlushReset();
     // restore the previous batch mode
     batchMode = oldBatchMode;
   }
 
   @Override
-  public void flushBatchOnRollback() {
+  public final void flushBatchOnRollback() {
     internalBatchClear();
     // restore the previous batch mode
     batchMode = oldBatchMode;
@@ -709,13 +709,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public boolean checkBatchEscalationOnCascade(PersistRequestBean<?> request) {
-
+  public final boolean checkBatchEscalationOnCascade(PersistRequestBean<?> request) {
     if (batchMode) {
       // already batching (at top level)
       return false;
     }
-
     if (batchOnCascadeMode) {
       // escalate up to batch mode for this request (and cascade)
       oldBatchMode = false;
@@ -725,13 +723,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       request.setSkipBatchForTopLevel();
       return true;
     }
-
     batchFlushReset();
     return false;
   }
 
   @Override
-  public BatchControl getBatchControl() {
+  public final BatchControl getBatchControl() {
     return batchControl;
   }
 
@@ -740,7 +737,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * on the first persist request.
    */
   @Override
-  public void setBatchControl(BatchControl batchControl) {
+  public final void setBatchControl(BatchControl batchControl) {
     queryOnly = false;
     this.batchControl = batchControl;
     // in case these parameters have already been set
@@ -763,7 +760,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * </p>
    */
   @Override
-  public void flush() {
+  public final void flush() {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
@@ -771,7 +768,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void flushBatch() {
+  public final void flushBatch() {
     flush();
   }
 
@@ -797,7 +794,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return the persistence context associated with this transaction.
    */
   @Override
-  public SpiPersistenceContext getPersistenceContext() {
+  public final SpiPersistenceContext getPersistenceContext() {
     return persistenceContext;
   }
 
@@ -809,7 +806,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * then set it back later to a second transaction.
    */
   @Override
-  public void setPersistenceContext(SpiPersistenceContext context) {
+  public final void setPersistenceContext(SpiPersistenceContext context) {
     if (!isActive()) {
       throw new IllegalStateException(illegalStateMessage);
     }
@@ -820,7 +817,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return the underlying TransactionEvent.
    */
   @Override
-  public TransactionEvent getEvent() {
+  public final TransactionEvent getEvent() {
     queryOnly = false;
     if (event == null) {
       event = new TransactionEvent();
@@ -832,27 +829,27 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return true if this was an explicitly created transaction.
    */
   @Override
-  public boolean isExplicit() {
+  public final boolean isExplicit() {
     return explicit;
   }
 
   @Override
-  public boolean isLogSql() {
+  public final boolean isLogSql() {
     return logSql;
   }
 
   @Override
-  public boolean isLogSummary() {
+  public final boolean isLogSummary() {
     return logSummary;
   }
 
   @Override
-  public void logSql(String msg) {
+  public final void logSql(String msg) {
     manager.log().sql().debug(Str.add(logPrefix, msg));
   }
 
   @Override
-  public void logSummary(String msg) {
+  public final void logSummary(String msg) {
     manager.log().sum().debug(Str.add(logPrefix, msg));
   }
 
@@ -860,17 +857,17 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return the transaction id.
    */
   @Override
-  public String getId() {
+  public final String getId() {
     return id;
   }
 
   @Override
-  public void setTenantId(Object tenantId) {
+  public final void setTenantId(Object tenantId) {
     this.tenantId = tenantId;
   }
 
   @Override
-  public Object getTenantId() {
+  public final Object getTenantId() {
     return tenantId;
   }
 
@@ -926,7 +923,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Notify the transaction manager.
    */
-  void notifyCommit() {
+  final void notifyCommit() {
     if (manager != null) {
       if (queryOnly) {
         manager.notifyOfQueryOnly(this);
@@ -1000,13 +997,13 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void postCommit() {
+  public final void postCommit() {
     firePostCommit();
     notifyCommit();
   }
 
   @Override
-  public void preCommit() {
+  public final void preCommit() {
     internalBatchFlush();
     firePreCommit();
   }
@@ -1081,7 +1078,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   /**
    * Notify the transaction manager.
    */
-  void notifyRollback(Throwable cause) {
+  final void notifyRollback(Throwable cause) {
     if (manager != null) {
       if (queryOnly) {
         manager.notifyOfQueryOnly(this);
@@ -1095,7 +1092,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return true if the transaction is marked as rollback only.
    */
   @Override
-  public boolean isRollbackOnly() {
+  public final boolean isRollbackOnly() {
     return rollbackOnly;
   }
 
@@ -1103,17 +1100,17 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Mark the transaction as rollback only.
    */
   @Override
-  public void setRollbackOnly() {
+  public final void setRollbackOnly() {
     this.rollbackOnly = true;
   }
 
   @Override
-  public boolean isNestedUseSavepoint() {
+  public final boolean isNestedUseSavepoint() {
     return nestedUseSavepoint;
   }
 
   @Override
-  public void setNestedUseSavepoint() {
+  public final void setNestedUseSavepoint() {
     this.nestedUseSavepoint = true;
   }
 
@@ -1159,7 +1156,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void postRollback(Throwable cause) {
+  public final void postRollback(Throwable cause) {
     firePostRollback();
     notifyRollback(cause);
   }
@@ -1183,22 +1180,22 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public boolean isPersistCascade() {
+  public final boolean isPersistCascade() {
     return persistCascade;
   }
 
   @Override
-  public void setPersistCascade(boolean persistCascade) {
+  public final void setPersistCascade(boolean persistCascade) {
     this.persistCascade = persistCascade;
   }
 
   @Override
-  public void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
+  public final void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
     getEvent().add(tableName, inserts, updates, deletes);
   }
 
   @Override
-  public DocStoreTransaction getDocStoreTransaction() {
+  public final DocStoreTransaction getDocStoreTransaction() {
     if (docStoreTxn == null) {
       queryOnly = false;
       docStoreTxn = manager.createDocStoreTransaction(docStoreBatchSize);
@@ -1207,7 +1204,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void putUserObject(String name, Object value) {
+  public final void putUserObject(String name, Object value) {
     if (userObjects == null) {
       userObjects = new HashMap<>();
     }
@@ -1215,7 +1212,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public Object getUserObject(String name) {
+  public final Object getUserObject(String name) {
     if (userObjects == null) {
       return null;
     }
@@ -1226,7 +1223,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Alias for end(), which enables this class to be used in try-with-resources.
    */
   @Override
-  public void close() {
+  public final void close() {
     end();
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java
index e0c33a193..cfd76c581 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java
@@ -9,7 +9,7 @@ import java.sql.SQLException;
 /**
  * Jta based transaction.
  */
-public class JtaTransaction extends JdbcTransaction {
+public final class JtaTransaction extends JdbcTransaction {
 
   private final UserTransaction userTransaction;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index cc9e8cdc8..2168a287b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -18,7 +18,7 @@ import javax.transaction.UserTransaction;
 /**
  * Hook into external JTA transaction manager.
  */
-public class JtaTransactionManager implements ExternalTransactionManager {
+public final class JtaTransactionManager implements ExternalTransactionManager {
 
   private static final Logger logger = LoggerFactory.getLogger(JtaTransactionManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index d435e93fd..0ed17e94f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -19,9 +19,9 @@ import java.sql.Connection;
 import java.sql.SQLException;
 
 /**
- * Place holder for use with SUPPORTS and NEVER transactional when there really isn't a transaction.
+ * Placeholder for use with SUPPORTS and NEVER transactional when there really isn't a transaction.
  */
-class NoTransaction implements SpiTransaction {
+final class NoTransaction implements SpiTransaction {
 
   static final NoTransaction INSTANCE = new NoTransaction();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoopProfileHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoopProfileHandler.java
index 636ad7c6a..a994987c5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoopProfileHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoopProfileHandler.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiProfileHandler;
 /**
  * A do nothing SpiProfileHandler.
  */
-public class NoopProfileHandler implements SpiProfileHandler {
+public final class NoopProfileHandler implements SpiProfileHandler {
 
   @Override
   public void collectTransactionProfile(TransactionProfile transactionProfile) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
index f963aad71..a3b97ec2a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
@@ -9,7 +9,7 @@ import java.io.IOException;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-public class RemoteTableMod implements BinaryWritable {
+public final class RemoteTableMod implements BinaryWritable {
 
   private final long timestamp;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
index 50480c043..8a9041eef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java
@@ -14,7 +14,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class RemoteTransactionEvent implements Runnable, BinaryWritable {
+public final class RemoteTransactionEvent implements Runnable, BinaryWritable {
 
   private final List<BeanPersistIds> beanPersistList = new ArrayList<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index dafaa05b5..aa4bc978e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -12,7 +12,7 @@ import java.sql.Savepoint;
 /**
  * A nested transaction that represents a Savepoint.
  */
-class SavepointTransaction extends SpiTransactionProxy {
+final class SavepointTransaction extends SpiTransactionProxy {
 
   private static final int STATE_COMMITTED = 1;
   private static final int STATE_ROLLED_BACK = 2;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
index 961247bd9..b2a7269d0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
@@ -11,7 +11,7 @@ import java.util.UUID;
  * Holder of the changes handling the case when we send the changes
  * prior to commit or rollback as we hit the allowed 'batch size'.
  */
-public class TChangeLogHolder {
+public final class TChangeLogHolder {
 
   /**
    * The owning transaction.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index e16fa6d81..d3793a8e4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * This information is used to validate entries in the L2 query caches.
  * </p>
  */
-public class TableModState implements QueryCacheEntryValidate, ServerCacheNotify {
+public final class TableModState implements QueryCacheEntryValidate, ServerCacheNotify {
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.TABLEMOD");
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
index 9a8684982..687741654 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
@@ -33,8 +33,7 @@ abstract class TransactionFactory {
   /**
    * Set the Transaction Isolation level if required.
    */
-  SpiTransaction setIsolationLevel(SpiTransaction t, boolean explicit, int isolationLevel) {
-
+  final SpiTransaction setIsolationLevel(SpiTransaction t, boolean explicit, int isolationLevel) {
     if (isolationLevel > -1) {
       Connection connection = t.getConnection();
       try {
@@ -44,11 +43,9 @@ abstract class TransactionFactory {
         throw new PersistenceException(e);
       }
     }
-
     if (explicit && manager.log().txn().isTrace()) {
       manager.log().txn().trace(t.getLogPrefix() + "Begin");
     }
-
     return t;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
index 1fd2f9e69..a190cf64e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
@@ -22,7 +22,6 @@ class TransactionFactoryBasic extends TransactionFactory {
 
   @Override
   public SpiTransaction createReadOnlyTransaction(Object tenantId) {
-
     Connection connection = null;
     try {
       connection = dataSource.getConnection();
@@ -37,7 +36,7 @@ class TransactionFactoryBasic extends TransactionFactory {
   }
 
   @Override
-  public SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
+  public final SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
     Connection connection = null;
     try {
       connection = dataSource.getConnection();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
index c942ed31e..d84361480 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
@@ -16,7 +16,7 @@ import java.sql.SQLException;
  * - Skip explicit commit (as we use AutoCommit instead)
  * </p>
  */
-class TransactionFactoryBasicWithRead extends TransactionFactoryBasic {
+final class TransactionFactoryBasicWithRead extends TransactionFactoryBasic {
 
   private final DataSource readOnlyDataSource;
 
@@ -27,16 +27,13 @@ class TransactionFactoryBasicWithRead extends TransactionFactoryBasic {
 
   @Override
   public SpiTransaction createReadOnlyTransaction(Object tenantId) {
-
     Connection connection = null;
     try {
       connection = readOnlyDataSource.getConnection();
       return new ImplicitReadOnlyTransaction(manager, connection);
-
     } catch (PersistenceException ex) {
       JdbcClose.close(connection);
       throw ex;
-
     } catch (SQLException ex) {
       throw new PersistenceException(ex);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java
index 590fcec63..b2b7e875f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java
@@ -5,7 +5,7 @@ import io.ebean.config.CurrentTenantProvider;
 /**
  * Helper to build and return the appropriate TransactionFactory.
  */
-class TransactionFactoryBuilder {
+final class TransactionFactoryBuilder {
 
   /**
    * Build and return based on multi-tenancy and read only DataSource.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
index fd70cd47a..64c9c9511 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
@@ -29,8 +29,7 @@ class TransactionFactoryTenant extends TransactionFactory {
   }
 
   @Override
-  public SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
-
+  public final SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
     SpiTransaction t = create(explicit, null);
     return setIsolationLevel(t, explicit, isolationLevel);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
index 1aa190770..cb9f8c9c4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
@@ -16,7 +16,7 @@ import java.sql.SQLException;
  * - Skip explicit commit (as we use AutoCommit instead)
  * </p>
  */
-class TransactionFactoryTenantWithRead extends TransactionFactoryTenant {
+final class TransactionFactoryTenantWithRead extends TransactionFactoryTenant {
 
   TransactionFactoryTenantWithRead(TransactionManager manager, DataSourceSupplier dataSourceSupplier, CurrentTenantProvider tenantProvider) {
     super(manager, dataSourceSupplier, tenantProvider);
@@ -24,7 +24,6 @@ class TransactionFactoryTenantWithRead extends TransactionFactoryTenant {
 
   @Override
   public SpiTransaction createReadOnlyTransaction(Object tenantId) {
-
     Connection connection = null;
     try {
       if (tenantId == null) {
@@ -33,11 +32,9 @@ class TransactionFactoryTenantWithRead extends TransactionFactoryTenant {
       }
       connection = dataSourceSupplier.getReadOnlyConnection(tenantId);
       return new ImplicitReadOnlyTransaction(manager, connection, tenantId);
-
     } catch (PersistenceException ex) {
       JdbcClose.close(connection);
       throw ex;
-
     } catch (SQLException ex) {
       throw new PersistenceException(ex);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index e3fbdd425..37a53f680 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -201,14 +201,14 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return the scope manager.
    */
-  public TransactionScopeManager scope() {
+  public final TransactionScopeManager scope() {
     return scopeManager;
   }
 
   /**
    * Set the transaction onto the scope.
    */
-  public void set(SpiTransaction txn) {
+  public final void set(SpiTransaction txn) {
     scopeManager.set(txn);
   }
 
@@ -216,7 +216,7 @@ public class TransactionManager implements SpiTransactionManager {
    * Return the current active transaction.
    */
   @Override
-  public SpiTransaction getActive() {
+  public final SpiTransaction getActive() {
     return scopeManager.getActive();
   }
 
@@ -230,18 +230,18 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return the current transaction from thread local scope. Note that it may be inactive.
    */
-  public SpiTransaction getInScope() {
+  public final SpiTransaction getInScope() {
     return scopeManager.getInScope();
   }
 
   /**
    * Translate the SQLException into a specific exception if possible based on the DB platform.
    */
-  public PersistenceException translate(String message, SQLException cause) {
+  public final PersistenceException translate(String message, SQLException cause) {
     return databasePlatform.translate(message, cause);
   }
 
-  public void shutdown(boolean shutdownDataSource, boolean deregisterDriver) {
+  public final void shutdown(boolean shutdownDataSource, boolean deregisterDriver) {
     if (shutdownDataSource) {
       dataSourceSupplier.shutdown(deregisterDriver);
     }
@@ -250,39 +250,39 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return true if the DB platform supports SavepointId().
    */
-  boolean isSupportsSavepointId() {
+  final boolean isSupportsSavepointId() {
     return supportsSavepointId;
   }
 
-  boolean isDocStoreActive() {
+  final boolean isDocStoreActive() {
     return docStoreActive;
   }
 
-  DocStoreTransaction createDocStoreTransaction(int docStoreBatchSize) {
+  final DocStoreTransaction createDocStoreTransaction(int docStoreBatchSize) {
     return docStoreUpdateProcessor.createTransaction(docStoreBatchSize);
   }
 
-  boolean isSkipCacheAfterWrite() {
+  final boolean isSkipCacheAfterWrite() {
     return skipCacheAfterWrite;
   }
 
-  public BeanDescriptorManager getBeanDescriptorManager() {
+  public final BeanDescriptorManager getBeanDescriptorManager() {
     return beanDescriptorManager;
   }
 
-  BulkEventListenerMap getBulkEventListenerMap() {
+  final BulkEventListenerMap getBulkEventListenerMap() {
     return bulkEventListenerMap;
   }
 
-  boolean isAutoPersistUpdates() {
+  final boolean isAutoPersistUpdates() {
     return autoPersistUpdates;
   }
 
-  boolean isPersistBatch() {
+  final boolean isPersistBatch() {
     return persistBatch;
   }
 
-  boolean isPersistBatchOnCascade() {
+  final boolean isPersistBatchOnCascade() {
     return persistBatchOnCascade;
   }
 
@@ -296,7 +296,7 @@ public class TransactionManager implements SpiTransactionManager {
    * If the Isolation level is higher (say SERIALIZABLE) then Connections used
    * just for queries do need to be committed or rollback after the query.
    */
-  OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly) {
+  final OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly) {
     // first check for a system property 'override'
     String systemPropertyValue = System.getProperty("ebean.transaction.onqueryonly");
     if (systemPropertyValue != null) {
@@ -306,29 +306,29 @@ public class TransactionManager implements SpiTransactionManager {
     return dbPlatformOnQueryOnly == null ? OnQueryOnly.COMMIT : dbPlatformOnQueryOnly;
   }
 
-  public String getServerName() {
+  public final String getServerName() {
     return serverName;
   }
 
   @Override
-  public Connection getQueryPlanConnection() throws SQLException {
+  public final Connection getQueryPlanConnection() throws SQLException {
     return dataSourceSupplier.getConnection(null);
   }
 
   @Override
-  public DataSource getDataSource() {
+  public final DataSource getDataSource() {
     return dataSourceSupplier.getDataSource();
   }
 
   @Override
-  public DataSource getReadOnlyDataSource() {
+  public final DataSource getReadOnlyDataSource() {
     return dataSourceSupplier.getReadOnlyDataSource();
   }
 
   /**
    * Defines the type of behavior to use when closing a transaction that was used to query data only.
    */
-  OnQueryOnly getOnQueryOnly() {
+  final OnQueryOnly getOnQueryOnly() {
     return onQueryOnly;
   }
 
@@ -390,7 +390,7 @@ public class TransactionManager implements SpiTransactionManager {
    * Process a local rolled back transaction.
    */
   @Override
-  public void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
+  public final void notifyOfRollback(SpiTransaction transaction, Throwable cause) {
     try {
       if (txnLogger.isDebug()) {
         String msg = transaction.getLogPrefix() + "Rollback";
@@ -408,7 +408,7 @@ public class TransactionManager implements SpiTransactionManager {
    * Query only transaction in read committed isolation.
    */
   @Override
-  public void notifyOfQueryOnly(SpiTransaction transaction) {
+  public final void notifyOfQueryOnly(SpiTransaction transaction) {
     // Nothing that interesting here
     if (txnLogger.isTrace()) {
       txnLogger.trace(transaction.getLogPrefix() + "Commit - query only");
@@ -442,7 +442,7 @@ public class TransactionManager implements SpiTransactionManager {
    * Process a local committed transaction.
    */
   @Override
-  public void notifyOfCommit(SpiTransaction transaction) {
+  public final void notifyOfCommit(SpiTransaction transaction) {
     try {
       if (txnLogger.isDebug()) {
         txnLogger.debug(transaction.getLogPrefix() + "Commit");
@@ -455,7 +455,7 @@ public class TransactionManager implements SpiTransactionManager {
     }
   }
 
-  public void externalModification(TransactionEventTable tableEvent) {
+  public final void externalModification(TransactionEventTable tableEvent) {
     SpiTransaction t = getActive();
     if (t != null) {
       t.getEvent().add(tableEvent);
@@ -476,7 +476,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Notify local BeanPersistListeners etc of events from another server in the cluster.
    */
-  public void remoteTransactionEvent(RemoteTransactionEvent remoteEvent) {
+  public final void remoteTransactionEvent(RemoteTransactionEvent remoteEvent) {
     if (clusterLogger.isDebugEnabled()) {
       clusterLogger.debug("processing {}", remoteEvent);
     }
@@ -506,14 +506,14 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process the docstore / ElasticSearch updates.
    */
-  void processDocStoreUpdates(DocStoreUpdates docStoreUpdates, int bulkBatchSize) {
+  final void processDocStoreUpdates(DocStoreUpdates docStoreUpdates, int bulkBatchSize) {
     docStoreUpdateProcessor.process(docStoreUpdates, bulkBatchSize);
   }
 
   /**
    * Prepare and then send/log the changeSet.
    */
-  void sendChangeLog(final ChangeSet changeSet) {
+  final void sendChangeLog(final ChangeSet changeSet) {
     // can set userId, userIpAddress & userContext if desired
     if (changeLogPrepare.prepare(changeSet)) {
       if (changeLogAsync) {
@@ -528,7 +528,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Invalidate the query caches for entities based on views.
    */
-  void processTouchedTables(Set<String> touchedTables) {
+  final void processTouchedTables(Set<String> touchedTables) {
     tableModState.touch(touchedTables);
     if (viewInvalidation) {
       beanDescriptorManager.processViewInvalidation(touchedTables);
@@ -539,32 +539,32 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Process the collected transaction profiling information.
    */
-  void profileCollect(TransactionProfile transactionProfile) {
+  final void profileCollect(TransactionProfile transactionProfile) {
     profileHandler.collectTransactionProfile(transactionProfile);
   }
 
   /**
    * Collect execution time for an explicit transaction.
    */
-  void collectMetric(long exeMicros) {
+  final void collectMetric(long exeMicros) {
     txnMain.add(exeMicros);
   }
 
   /**
    * Collect execution time for implicit read only transaction.
    */
-  void collectMetricReadOnly(long exeMicros) {
+  final void collectMetricReadOnly(long exeMicros) {
     txnReadOnly.add(exeMicros);
   }
 
   /**
    * Collect execution time for a named transaction.
    */
-  void collectMetricNamed(long exeMicros, String label) {
+  final void collectMetricNamed(long exeMicros, String label) {
     txnNamed.add(label, exeMicros);
   }
 
-  public void visitMetrics(MetricVisitor visitor) {
+  public final void visitMetrics(MetricVisitor visitor) {
     txnMain.visit(visitor);
     txnReadOnly.visit(visitor);
     txnNamed.visit(visitor);
@@ -576,14 +576,14 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Clear an implicit transaction from thread local scope.
    */
-  public void clearServerTransaction() {
+  public final void clearServerTransaction() {
     scopeManager.clear();
   }
 
   /**
    * Begin an implicit transaction.
    */
-  public SpiTransaction beginServerTransaction() {
+  public final SpiTransaction beginServerTransaction() {
     SpiTransaction t = createTransaction(false, -1);
     scopeManager.set(t);
     return t;
@@ -592,7 +592,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Exit a scoped transaction (that can be inactive - already committed etc).
    */
-  public void exitScopedTransaction(Object returnOrThrowable, int opCode) {
+  public final void exitScopedTransaction(Object returnOrThrowable, int opCode) {
     SpiTransaction st = getInScope();
     if (st instanceof ScopedTransaction) {
       // can be null for Supports as that can start as a 'No Transaction' and then
@@ -602,7 +602,7 @@ public class TransactionManager implements SpiTransactionManager {
   }
 
   @Override
-  public void externalRemoveTransaction() {
+  public final void externalRemoveTransaction() {
     scopeManager.clearExternal();
   }
 
@@ -611,7 +611,7 @@ public class TransactionManager implements SpiTransactionManager {
    * (e.g. Spring managed transaction).
    */
   @Override
-  public ScopedTransaction externalBeginTransaction(SpiTransaction transaction, TxScope txScope) {
+  public final ScopedTransaction externalBeginTransaction(SpiTransaction transaction, TxScope txScope) {
     ScopedTransaction scopedTxn = new ScopedTransaction(scopeManager);
     scopedTxn.push(new ScopeTrans(rollbackOnChecked, false, transaction, txScope));
     scopeManager.replace(scopedTxn);
@@ -621,7 +621,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Begin a scoped transaction.
    */
-  public ScopedTransaction beginScopedTransaction(TxScope txScope) {
+  public final ScopedTransaction beginScopedTransaction(TxScope txScope) {
     txScope = initTxScope(txScope);
     ScopedTransaction txnContainer = getActiveScoped();
 
@@ -742,26 +742,26 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return true if Transaction debug is on.
    */
-  public boolean isTxnDebug() {
+  public final boolean isTxnDebug() {
     return txnDebug;
   }
 
-  public SpiLogManager log() {
+  public final SpiLogManager log() {
     return logManager;
   }
 
-  public boolean isLogSql() {
+  public final boolean isLogSql() {
     return logManager.sql().isDebug();
   }
 
-  public boolean isLogSummary() {
+  public final boolean isLogSummary() {
     return logManager.sum().isDebug();
   }
 
   /**
    * Experimental - find dirty beans in the persistence context and persist them.
    */
-  public void flushTransparent(SpiPersistenceContext persistenceContext, SpiTransaction transaction) {
+  public final void flushTransparent(SpiPersistenceContext persistenceContext, SpiTransaction transaction) {
     List<Object> dirtyBeans = persistenceContext.dirtyBeans(beanDescriptorManager);
     if (!dirtyBeans.isEmpty()) {
       server.updateAll(dirtyBeans, transaction);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
index 5d0c87794..b7d54b37e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java
@@ -14,7 +14,7 @@ import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 /**
  * Objects supplied for constructing the TransactionManager.
  */
-public class TransactionManagerOptions {
+public final class TransactionManagerOptions {
 
   final SpiServer server;
   final boolean notifyL2CacheInForeground;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionProfile.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionProfile.java
index 2c7006eba..cb749cd54 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionProfile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionProfile.java
@@ -5,7 +5,7 @@ import io.ebean.ProfileLocation;
 /**
  * Profiling information for a single transaction that has completed.
  */
-public class TransactionProfile {
+public final class TransactionProfile {
 
   private final ProfileLocation location;
   private final String label;

From 885ba0fdd2f4b19d628587a7380c491154a15358 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 09:18:31 +1200
Subject: [PATCH 388/447] Set autoReleaseAfterClose true

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

diff --git a/pom.xml b/pom.xml
index dc3426809..1cebb8daa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
   </developers>
 
   <properties>
-    <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
+    <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <ebean-datasource.version>7.0</ebean-datasource.version>
     <jackson.version>2.12.1</jackson.version>
   </properties>

From 3c6d17c9a5fe6aeae200bf5784d9a75dbc80bd9e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 09:23:11 +1200
Subject: [PATCH 389/447] [maven-release-plugin] prepare release
 ebean-parent-12.11.1

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 72fbfe3ae..0e84c71c9 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index c47f7fe08..5bedfbd89 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index fff064c90..9b651c8a2 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.11.1-SNAPSHOT</version>
+        <version>12.11.1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index d8eab3e25..e0d543cfc 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 5324aec82..cface4b9e 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.1</tag>
   </scm>
 
   <profiles>
@@ -78,19 +78,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index f83a8b02e..2e9b2347b 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index e506a6841..23962062a 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index d0226a553..821436b6b 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 98b44522d..eb6d6fb4c 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 059976afa..87c0c3cdf 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 943ab6985..eb22bf8b8 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 4b9b05272..1d6ee0b9b 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index db01d91a1..892b73af6 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 1b3f9d848..304a5e3e0 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1-SNAPSHOT</version>
+      <version>12.11.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 1cebb8daa..8374733c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.11.1-SNAPSHOT</version>
+  <version>12.11.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index a240e3b8b..238a37f1f 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1-SNAPSHOT</version>
+    <version>12.11.1</version>
   </parent>
 
   <name>querybean generator</name>

From f7a0ae8b4a3c28067789ace17bfadfd4f8dab5cb Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 09:23:18 +1200
Subject: [PATCH 390/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 0e84c71c9..b6adad05d 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 5bedfbd89..c244053d2 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 9b651c8a2..cb50c064c 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,88 +81,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.11.1</version>
+        <version>12.11.2-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index e0d543cfc..10c45ea74 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index cface4b9e..bff1574de 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -78,19 +78,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 2e9b2347b..cbc716413 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 23962062a..c2ea63651 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 821436b6b..b62c33793 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index eb6d6fb4c..42b18f4f1 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 87c0c3cdf..a91cdb4ef 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index eb22bf8b8..835a05812 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 1d6ee0b9b..894f7f1b9 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 892b73af6..b17e93449 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 304a5e3e0..7f76d5e09 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 8374733c8..bec194354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.11.1</version>
+  <version>12.11.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.1</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 238a37f1f..1cf09f8be 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.11.2-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From f3ec4a78c9d05494c8a035efc8967144090416ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler=20=28JPo=29?= <jonas.poehler@foconis.de>
Date: Mon, 29 Mar 2021 13:23:56 +0200
Subject: [PATCH 391/447] FIX: setting json values to null was throwing a NPE
 when persisting

---
 .../server/type/ScalarTypeJsonList.java       |  3 --
 .../server/type/ScalarTypeJsonSet.java        |  3 --
 .../org/tests/json/TestJsonNullValues.java    | 42 +++++++++++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index 699c7ad0f..d3c700443 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -122,9 +122,6 @@ class ScalarTypeJsonList {
 
     @Override
     public final String formatValue(List value) {
-      if (value.isEmpty()) {
-        return "[]";
-      }
       try {
         return EJson.write(value);
       } catch (IOException e) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index 86a39443e..50cc7f0b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -122,9 +122,6 @@ final class ScalarTypeJsonSet {
 
     @Override
     public final String formatValue(Set value) {
-      if (value.isEmpty()) {
-        return "[]";
-      }
       try {
         return EJson.write(value);
       } catch (IOException e) {
diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java
new file mode 100644
index 000000000..533116fd1
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java
@@ -0,0 +1,42 @@
+package org.tests.json;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+import org.tests.model.json.EBasicOldValue;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestJsonNullValues extends BaseTestCase {
+
+  @Test
+  public void testSetToNull() {
+    EBasicOldValue bean = new EBasicOldValue();
+    DB.save(bean);
+    bean = DB.find(EBasicOldValue.class, bean.getId());
+
+    bean.setStringList(null);
+    bean.setStringSet(null);
+    bean.setObjectMap(null);
+    bean.setLongList(null);
+    bean.setLongSet(null);
+    bean.setLongMap(null);
+    bean.setIntList(null);
+    bean.setIntSet(null);
+    bean.setIntMap(null);
+
+    DB.save(bean);
+    bean = DB.find(EBasicOldValue.class, bean.getId());
+
+    assertThat(bean.getStringList()).isEmpty();
+    assertThat(bean.getStringSet()).isEmpty();
+    assertThat(bean.getObjectMap()).isEmpty();
+    assertThat(bean.getLongList()).isEmpty();
+    assertThat(bean.getLongSet()).isEmpty();
+    assertThat(bean.getLongMap()).isEmpty();
+    assertThat(bean.getIntList()).isEmpty();
+    assertThat(bean.getIntSet()).isEmpty();
+    assertThat(bean.getIntMap()).isEmpty();
+  }
+
+}

From 14262d4c2553a69cc6ff20388f7994f9494b06ff Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 22:19:15 +1200
Subject: [PATCH 392/447] #2317 - Incorrect SQL generated for @IdClass with
 fetch() on ToMany path

---
 .../java/org/tests/model/bridge/BDManyId.java | 32 ++++++++++
 .../org/tests/model/bridge/BSiteUserD.java    | 18 ++++--
 .../tests/model/bridge/BSiteUserDMany.java    | 64 +++++++++++++++++++
 .../tests/model/bridge/TestIdClassScalar.java | 18 ++++++
 4 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java
 create mode 100644 ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java

diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java b/ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java
new file mode 100644
index 000000000..32e5e3af8
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java
@@ -0,0 +1,32 @@
+package org.tests.model.bridge;
+
+import javax.persistence.Embeddable;
+import java.util.Objects;
+import java.util.UUID;
+
+@Embeddable
+public class BDManyId {
+
+  private final UUID siteId;
+  private final UUID userId;
+  private final String name;
+
+  public BDManyId(UUID siteId, UUID userId, String name) {
+    this.siteId = siteId;
+    this.userId = userId;
+    this.name = name;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    BDManyId bdManyId = (BDManyId) o;
+    return siteId.equals(bdManyId.siteId) && userId.equals(bdManyId.userId) && name.equals(bdManyId.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(siteId, userId, name);
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java b/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java
index 4ff4513f4..220990cad 100644
--- a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java
+++ b/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java
@@ -1,9 +1,7 @@
 package org.tests.model.bridge;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Version;
+import javax.persistence.*;
+import java.util.List;
 import java.util.UUID;
 
 @Entity
@@ -18,6 +16,10 @@ public class BSiteUserD {
 
   private BAccessLevel accessLevel;
 
+  @OneToMany(cascade = CascadeType.PERSIST)
+  @JoinColumns({@JoinColumn(name="site_id", referencedColumnName = "site_id"), @JoinColumn(name="user_id", referencedColumnName = "user_id")})
+  private List<BSiteUserDMany> children;
+
   @Version
   private long version;
 
@@ -58,4 +60,12 @@ public class BSiteUserD {
   public void setVersion(long version) {
     this.version = version;
   }
+
+  public List<BSiteUserDMany> children() {
+    return children;
+  }
+
+  public void setChildren(List<BSiteUserDMany> children) {
+    this.children = children;
+  }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java
new file mode 100644
index 000000000..4d7a84f95
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java
@@ -0,0 +1,64 @@
+package org.tests.model.bridge;
+
+import javax.persistence.*;
+import java.util.UUID;
+
+@Entity
+@IdClass(BDManyId.class)
+public class BSiteUserDMany {
+
+  @Id
+  private UUID siteId;
+  @Id
+  private UUID userId;
+  @Id
+  String name;
+
+  String many;
+
+  @Version
+  long version;
+
+  public UUID siteId() {
+    return siteId;
+  }
+
+  public BSiteUserDMany siteId(UUID siteId) {
+    this.siteId = siteId;
+    return this;
+  }
+
+  public UUID userId() {
+    return userId;
+  }
+
+  public BSiteUserDMany userId(UUID userId) {
+    this.userId = userId;
+    return this;
+  }
+
+  public String name() {
+    return name;
+  }
+
+  public BSiteUserDMany name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public long version() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+  public String many() {
+    return many;
+  }
+
+  public void setMany(String many) {
+    this.many = many;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
index a06c7e173..f378dbd29 100644
--- a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
+++ b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
@@ -41,6 +41,24 @@ public class TestIdClassScalar extends BaseTestCase {
 
   }
 
+  @Test
+  public void fetchMany() {
+    UUID siteId = UUID.randomUUID();
+    UUID userId = UUID.randomUUID();
+
+    BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, siteId, userId);
+    DB.save(access);
+
+    final List<BSiteUserD> found = DB.find(BSiteUserD.class)
+      .fetch("children")
+      .where().eq("siteId", siteId)
+      .findList();
+
+    assertThat(found).hasSize(1);
+
+    DB.delete(BSiteUserD.class, new BEmbId(siteId, userId));
+  }
+
   @Test
   public void insertBatch() {
     UUID siteId = UUID.randomUUID();

From 12220d43222463e3745a03cca7ff92435b12518f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 22:21:49 +1200
Subject: [PATCH 393/447] #2317 - Incorrect SQL generated for @IdClass with
 fetch() on ToMany path

---
 .../server/deploy/id/IdBinderEmbedded.java    | 66 +++++++++----------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index cf2085fa6..2edc359fc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -26,18 +26,16 @@ import java.util.Map;
 public final class IdBinderEmbedded implements IdBinder {
 
   private final BeanPropertyAssocOne<?> embIdProperty;
-
   private final boolean idInExpandedForm;
-
+  private final boolean idClass;
   private BeanProperty[] props;
-
   private BeanDescriptor<?> idDesc;
-
   private String idInValueSql;
 
   public IdBinderEmbedded(boolean idInExpandedForm, BeanPropertyAssocOne<?> embIdProperty) {
     this.idInExpandedForm = idInExpandedForm;
     this.embIdProperty = embIdProperty;
+    this.idClass = "_idClass".equals(embIdProperty.getName());
   }
 
   @Override
@@ -59,10 +57,7 @@ public final class IdBinderEmbedded implements IdBinder {
       if (i > 0) {
         sb.append(" and ");
       }
-      sb.append(idDesc.getBaseTableAlias());
-      sb.append(".");
-      sb.append(props[i].getDbColumn());
-      sb.append("=?");
+      sb.append(idDesc.getBaseTableAlias()).append(".").append(props[i].getDbColumn()).append("=?");
     }
     sb.append(")");
     return sb.toString();
@@ -95,7 +90,9 @@ public final class IdBinderEmbedded implements IdBinder {
       if (pathPrefix != null) {
         sb.append(pathPrefix).append(".");
       }
-      sb.append(embIdProperty.getName()).append(".");
+      if (!idClass) {
+        sb.append(embIdProperty.getName()).append(".");
+      }
       sb.append(props[i].getName());
       if (!ascending) {
         sb.append(" desc");
@@ -115,7 +112,9 @@ public final class IdBinderEmbedded implements IdBinder {
 
   @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
-    prefix = SplitName.add(prefix, embIdProperty.getName());
+    if (!idClass) {
+      prefix = SplitName.add(prefix, embIdProperty.getName());
+    }
     for (BeanProperty prop : props) {
       prop.buildRawSqlSelectChain(prefix, selectChain);
     }
@@ -141,10 +140,11 @@ public final class IdBinderEmbedded implements IdBinder {
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < props.length; i++) {
       if (i > 0) {
-        sb.append(",");
+        sb.append(", ");
+      }
+      if (!idClass) {
+        sb.append(embIdProperty.getName()).append(".");
       }
-      sb.append(embIdProperty.getName());
-      sb.append(".");
       sb.append(props[i].getName());
     }
     return sb.toString();
@@ -173,8 +173,7 @@ public final class IdBinderEmbedded implements IdBinder {
         if (i > 0) {
           sb.append(" and ");
         }
-        sb.append(props[i].getDbColumn());
-        sb.append("=?");
+        sb.append(props[i].getDbColumn()).append("=?");
       }
       sb.append(")");
     }
@@ -200,7 +199,7 @@ public final class IdBinderEmbedded implements IdBinder {
         if (idInExpandedForm) {
           sb.append(" or ");
         } else {
-          sb.append(",");
+          sb.append(", ");
         }
       }
       sb.append(idInValueSql);
@@ -212,11 +211,11 @@ public final class IdBinderEmbedded implements IdBinder {
   @Override
   public Object[] getIdValues(EntityBean bean) {
     Object val = embIdProperty.getValue(bean);
-    Object[] bindvalues = new Object[props.length];
+    Object[] bindValues = new Object[props.length];
     for (int i = 0; i < props.length; i++) {
-      bindvalues[i] = props[i].getValue((EntityBean) val);
+      bindValues[i] = props[i].getValue((EntityBean) val);
     }
-    return bindvalues;
+    return bindValues;
   }
 
   @Override
@@ -354,11 +353,10 @@ public final class IdBinderEmbedded implements IdBinder {
     sb.append("(");
     for (int i = 0; i < props.length; i++) {
       if (i > 0) {
-        sb.append(",");
+        sb.append(", ");
       }
       if (prefix != null) {
-        sb.append(prefix);
-        sb.append(".");
+        sb.append(prefix).append(".");
       }
       sb.append(props[i].getName());
     }
@@ -374,13 +372,12 @@ public final class IdBinderEmbedded implements IdBinder {
         sb.append(" and ");
       }
       if (prefix != null) {
-        sb.append(prefix);
-        sb.append(".");
+        sb.append(prefix).append(".");
       }
-      sb.append(embIdProperty.getName());
-      sb.append(".");
-      sb.append(props[i].getName());
-      sb.append(operator);
+      if (!idClass) {
+        sb.append(embIdProperty.getName()).append(".");
+      }
+      sb.append(props[i].getName()).append(operator);
     }
     return sb.toString();
   }
@@ -393,11 +390,9 @@ public final class IdBinderEmbedded implements IdBinder {
         sb.append(" and ");
       }
       if (baseTableAlias != null) {
-        sb.append(baseTableAlias);
-        sb.append(".");
+        sb.append(baseTableAlias).append(".");
       }
-      sb.append(props[i].getDbColumn());
-      sb.append(" = ? ");
+      sb.append(props[i].getDbColumn()).append("=?");
     }
     return sb.toString();
   }
@@ -414,8 +409,7 @@ public final class IdBinderEmbedded implements IdBinder {
         sb.append(",");
       }
       if (baseTableAlias != null) {
-        sb.append(baseTableAlias);
-        sb.append(".");
+        sb.append(baseTableAlias).append(".");
       }
       sb.append(props[i].getDbColumn());
     }
@@ -427,9 +421,9 @@ public final class IdBinderEmbedded implements IdBinder {
   public Object convertId(Object idValue) {
     if (idValue instanceof String) {
       final EntityBean embId = idDesc.createEntityBean();
-      final String[] rawVals = ((String)idValue).split("\\|");
+      final String[] rawValues = ((String)idValue).split("\\|");
       for (int i = 0; i < props.length; i++) {
-        props[i].setValue(embId, props[i].parse(rawVals[i]));
+        props[i].setValue(embId, props[i].parse(rawValues[i]));
       }
       return embId;
     }

From 4163b4dc251139b43b2d65044161bea5d72acc6a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 22:23:58 +1200
Subject: [PATCH 394/447] #2317 - Plus test changes due to tidy whitespace on
 sql generation

---
 .../test/java/org/tests/model/bridge/TestIdClassScalar.java   | 4 ++--
 .../java/org/tests/model/history/TestHistoryEmbeddedId.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
index f378dbd29..2e00493fe 100644
--- a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
+++ b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
@@ -132,7 +132,7 @@ public class TestIdClassScalar extends BaseTestCase {
     sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(2);
-    assertSql(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 = ?");
+    assertSql(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=?");
     assertSql(sql.get(1)).contains("update bsite_user_d set access_level=?, version=? where site_id=? and user_id=? and version=?");
   }
 
@@ -178,7 +178,7 @@ public class TestIdClassScalar extends BaseTestCase {
     sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(2);
-    assertSql(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 = ?");
+    assertSql(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=?");
     assertSql(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?");
 
   }
diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java
index 0bd8ddef3..ffe82ac75 100644
--- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java
+++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java
@@ -48,7 +48,7 @@ public class TestHistoryEmbeddedId extends BaseTestCase {
     assertThat(namePair.getOldValue()).isEqualTo("ten");
 
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("from hembi_bean_with_history t0 where t0.part = ?  and t0.brand = ?");
+    assertThat(sql.get(0)).contains("from hembi_bean_with_history t0 where t0.part=? and t0.brand=?");
     if (isH2()) {
       assertThat(sql.get(0)).contains("order by t0.sys_period_start desc");
     } else if (isPostgres()) {

From f33e54d8bac2465791e7ccaa91ad736bc09bb8e7 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 22:53:38 +1200
Subject: [PATCH 395/447] #2318 - Refactor internals - final classes in id and
 generated property packages

---
 .../deploy/generatedproperty/CounterFactory.java     |  7 ++-----
 .../deploy/generatedproperty/GeneratedCounter.java   |  2 +-
 .../generatedproperty/GeneratedCounterInteger.java   |  6 +-----
 .../generatedproperty/GeneratedCounterLong.java      |  6 +-----
 .../generatedproperty/GeneratedInsertDate.java       |  2 +-
 .../generatedproperty/GeneratedInsertJavaTime.java   | 12 ++++++------
 .../generatedproperty/GeneratedInsertJodaTime.java   |  8 ++++----
 .../generatedproperty/GeneratedInsertLong.java       |  2 +-
 .../generatedproperty/GeneratedInsertTimestamp.java  |  2 +-
 .../generatedproperty/GeneratedPropertyFactory.java  | 10 +---------
 .../generatedproperty/GeneratedUpdateDate.java       |  2 +-
 .../generatedproperty/GeneratedUpdateJavaTime.java   | 12 ++++++------
 .../generatedproperty/GeneratedUpdateJodaTime.java   |  8 ++++----
 .../generatedproperty/GeneratedUpdateLong.java       |  2 +-
 .../generatedproperty/GeneratedUpdateTimestamp.java  |  2 +-
 .../generatedproperty/GeneratedWhoCreated.java       |  2 +-
 .../generatedproperty/GeneratedWhoModified.java      |  2 +-
 .../generatedproperty/InsertTimestampFactory.java    |  2 +-
 .../deploy/generatedproperty/JavaTimeUtils.java      |  2 +-
 .../generatedproperty/UpdateTimestampFactory.java    |  2 +-
 .../generatedproperty/UuidGeneratedProperty.java     |  2 +-
 .../server/deploy/id/IdBinderFactory.java            |  3 +--
 .../server/deploy/id/IdBinderSimple.java             |  4 ----
 .../server/deploy/id/ImportedIdEmbedded.java         |  4 +---
 .../server/deploy/id/ImportedIdSimple.java           | 12 ------------
 25 files changed, 40 insertions(+), 78 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
index 1bfd2542e..999deb121 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
@@ -13,14 +13,13 @@ import java.sql.Types;
  * Aka, Integer, Long, Short etc.
  * </p>
  */
-class CounterFactory {
+final class CounterFactory {
 
   private final GeneratedCounterInteger integerCounter = new GeneratedCounterInteger();
 
   private final GeneratedCounterLong longCounter = new GeneratedCounterLong();
 
-  public void setCounter(DeployBeanProperty property) {
-
+   void setCounter(DeployBeanProperty property) {
     property.setGeneratedProperty(createCounter(property));
   }
 
@@ -28,7 +27,6 @@ class CounterFactory {
    * Create the GeneratedProperty based on the property type.
    */
   private GeneratedProperty createCounter(DeployBeanProperty property) {
-
     Class<?> propType = property.getPropertyType();
     if (propType.equals(Integer.class) || propType.equals(int.class)) {
       return integerCounter;
@@ -36,7 +34,6 @@ class CounterFactory {
     if (propType.equals(Long.class) || propType.equals(long.class)) {
       return longCounter;
     }
-
     int type = getType(propType);
     return new GeneratedCounter(type);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
index 319e6e40a..38f0085fb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * A general number counter for various number types.
  */
-public class GeneratedCounter implements GeneratedProperty {
+final class GeneratedCounter implements GeneratedProperty {
 
   private final int numberType;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java
index 88cd3a866..4031465e8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java
@@ -6,11 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to create a counter version column for Integer.
  */
-public class GeneratedCounterInteger implements GeneratedProperty {
-
-  public GeneratedCounterInteger() {
-
-  }
+final class GeneratedCounterInteger implements GeneratedProperty {
 
   /**
    * Always returns a 1.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java
index 310242465..5282bec11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java
@@ -6,11 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to create a counter version column for Long.
  */
-public class GeneratedCounterLong implements GeneratedProperty {
-
-  public GeneratedCounterLong() {
-
-  }
+final class GeneratedCounterLong implements GeneratedProperty {
 
   /**
    * Always returns a 1.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java
index 2bb206e3d..57ff0c9bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java
@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * Used to generate a (java.util.Date) timestamp when a bean is inserted.
  */
-public class GeneratedInsertDate implements GeneratedProperty, GeneratedWhenCreated {
+final class GeneratedInsertDate implements GeneratedProperty, GeneratedWhenCreated {
 
   /**
    * Return the current time as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java
index 3b95b4e0d..f71aaccfd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java
@@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Support java.time types as GeneratedProperty.
  */
-public class GeneratedInsertJavaTime {
+final class GeneratedInsertJavaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
 
     @Override
     public boolean includeInUpdate() {
@@ -39,7 +39,7 @@ public class GeneratedInsertJavaTime {
   /**
    * Instant support.
    */
-  public static class InstantDT extends Base {
+  static final class InstantDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -50,7 +50,7 @@ public class GeneratedInsertJavaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -61,7 +61,7 @@ public class GeneratedInsertJavaTime {
   /**
    * OffsetDateTime support.
    */
-  public static class OffsetDT extends Base {
+  static final class OffsetDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -73,7 +73,7 @@ public class GeneratedInsertJavaTime {
   /**
    * ZonedDateTime support.
    */
-  public static class ZonedDT extends Base {
+  static final class ZonedDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
index f346be035..5a4c11550 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
@@ -8,9 +8,9 @@ import org.joda.time.LocalDateTime;
 /**
  * Support joda time types as GeneratedProperty.
  */
-public class GeneratedInsertJodaTime {
+final class GeneratedInsertJodaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
 
     @Override
     public boolean includeInUpdate() {
@@ -41,7 +41,7 @@ public class GeneratedInsertJodaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -52,7 +52,7 @@ public class GeneratedInsertJodaTime {
   /**
    * DateTime support.
    */
-  public static class DateTimeDT extends Base {
+  static final class DateTimeDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java
index f56f97490..5e3e0d2f1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to generate a (Long) timestamp when a bean is inserted.
  */
-public class GeneratedInsertLong implements GeneratedProperty {
+final class GeneratedInsertLong implements GeneratedProperty {
 
   /**
    * Return the current time as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java
index abc7f963c..028f71a10 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 /**
  * Used to generate a timestamp when a bean is inserted.
  */
-public class GeneratedInsertTimestamp implements GeneratedProperty, GeneratedWhenCreated {
+final class GeneratedInsertTimestamp implements GeneratedProperty, GeneratedWhenCreated {
 
   /**
    * Return the current time as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
index b395732b0..e876fb379 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
@@ -17,24 +17,16 @@ import java.util.Map;
 /**
  * Default implementation of GeneratedPropertyFactory.
  */
-public class GeneratedPropertyFactory {
+public final class GeneratedPropertyFactory {
 
   private final CounterFactory counterFactory = new CounterFactory();
-
   private final InsertTimestampFactory insertFactory;
-
   private final UpdateTimestampFactory updateFactory;
-
   private final HashSet<String> numberTypes = new HashSet<>();
-
   private final UuidGeneratedProperty generatedUuid = new UuidGeneratedProperty();
-
   private final GeneratedWhoModified generatedWhoModified;
-
   private final GeneratedWhoCreated generatedWhoCreated;
-
   private final ClassLoadConfig classLoadConfig;
-
   private final Map<String, PlatformIdGenerator> idGeneratorMap = new HashMap<>();
 
   public GeneratedPropertyFactory(boolean offlineMode, DatabaseConfig config, List<IdGenerator> idGenerators) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java
index f9cd94659..f8ec8effe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java
@@ -9,7 +9,7 @@ import java.util.Date;
  * Generate a (java.util.Date) Timestamp whenever the bean is inserted or
  * updated.
  */
-public class GeneratedUpdateDate implements GeneratedProperty {
+final class GeneratedUpdateDate implements GeneratedProperty {
 
   /**
    * Return now as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java
index 8592425df..6abbf2c6b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java
@@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Support java.time DateTime types as GeneratedProperty.
  */
-public class GeneratedUpdateJavaTime {
+final class GeneratedUpdateJavaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
 
     @Override
     public boolean includeInUpdate() {
@@ -34,7 +34,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * Instant support.
    */
-  public static class InstantDT extends Base {
+  static final class InstantDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -50,7 +50,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -66,7 +66,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * OffsetDateTime support.
    */
-  public static class OffsetDT extends Base {
+  static final class OffsetDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -82,7 +82,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * ZonedDateTime support.
    */
-  public static class ZonedDT extends Base {
+  static final class ZonedDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java
index de4cc1878..ab95ce24a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java
@@ -8,9 +8,9 @@ import org.joda.time.LocalDateTime;
 /**
  * Support java.time DateTime types as GeneratedProperty.
  */
-public class GeneratedUpdateJodaTime {
+final class GeneratedUpdateJodaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
 
     @Override
     public boolean includeInUpdate() {
@@ -36,7 +36,7 @@ public class GeneratedUpdateJodaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -52,7 +52,7 @@ public class GeneratedUpdateJodaTime {
   /**
    * OffsetDateTime support.
    */
-  public static class DateTimeDT extends Base {
+  static final class DateTimeDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java
index 2d4c85192..72c2b9079 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Generate a (Long) Timestamp whenever the bean is inserted or updated.
  */
-public class GeneratedUpdateLong implements GeneratedProperty {
+final class GeneratedUpdateLong implements GeneratedProperty {
 
   /**
    * Return now as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java
index f493401d8..3ee658eb2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 /**
  * Generate a Timestamp whenever the bean is inserted or updated.
  */
-public class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhenModified {
+final class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhenModified {
 
   /**
    * Return now as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
index cdb719014..404f31049 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to populate @WhoCreated bean properties.
  */
-public class GeneratedWhoCreated implements GeneratedProperty {
+final class GeneratedWhoCreated implements GeneratedProperty {
 
   private final CurrentUserProvider currentUserProvider;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
index e4e68a373..c9aa65537 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to populate @WhoModified bean properties.
  */
-public class GeneratedWhoModified implements GeneratedProperty {
+final class GeneratedWhoModified implements GeneratedProperty {
 
   private final CurrentUserProvider currentUserProvider;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
index ee2c88a66..f5083c632 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * Helper for creating Insert timestamp GeneratedProperty objects.
  */
-class InsertTimestampFactory {
+final class InsertTimestampFactory {
 
   private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
index bf3f6db12..cea0a6e86 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
@@ -9,7 +9,7 @@ import java.time.ZonedDateTime;
 /**
  * Helper methods for Java time conversion.
  */
-class JavaTimeUtils {
+final class JavaTimeUtils {
 
   /**
    * Return the system millis time as a LocalDateTime.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
index d405f2ec7..d08b75cc6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * Helper for creating Update timestamp GeneratedProperty objects.
  */
-class UpdateTimestampFactory {
+final class UpdateTimestampFactory {
 
   private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java
index 2090fac13..6eff4c21a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 
 import java.util.UUID;
 
-public class UuidGeneratedProperty implements GeneratedProperty {
+final class UuidGeneratedProperty implements GeneratedProperty {
 
   @Override
   public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
index 70f8a1175..b9bf6f6e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
@@ -7,12 +7,11 @@ import io.ebeaninternal.server.persist.platform.MultiValueBind;
 /**
  * Creates the appropriate IdConvertSet depending on the type of Id property(s).
  */
-public class IdBinderFactory {
+public final class IdBinderFactory {
 
   private static final IdBinderEmpty EMPTY = new IdBinderEmpty();
 
   private final boolean idInExpandedForm;
-
   private final MultiValueBind multiValueBind;
 
   public IdBinderFactory(boolean idInExpandedForm, MultiValueBind multiValueBind) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index cb9e6f9aa..6541b3fa5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -26,13 +26,9 @@ import java.util.List;
 public final class IdBinderSimple implements IdBinder {
 
   private final BeanProperty idProperty;
-
   private final String bindIdSql;
-
   private final Class<?> expectedType;
-
   private final MultiValueBind multiValueBind;
-
   @SuppressWarnings("rawtypes")
   private final ScalarType scalarType;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
index 537575ae8..d0f888582 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
@@ -18,12 +18,10 @@ import java.sql.SQLException;
 /**
  * Imported Embedded id.
  */
-public class ImportedIdEmbedded implements ImportedId {
+public final class ImportedIdEmbedded implements ImportedId {
 
   private final BeanPropertyAssoc<?> owner;
-
   private final BeanPropertyAssocOne<?> foreignAssocOne;
-
   private final ImportedIdSimple[] imported;
 
   public ImportedIdEmbedded(BeanPropertyAssoc<?> owner, BeanPropertyAssocOne<?> foreignAssocOne, ImportedIdSimple[] imported) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index ea9844ec1..83f615994 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -36,23 +36,11 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
   private static final EntryComparator COMPARATOR = new EntryComparator();
 
   final BeanPropertyAssoc<?> owner;
-
   final String localDbColumn;
-
   private final String localSqlFormula;
-
   final BeanProperty foreignProperty;
-
   private final 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,

From 0413d89a9e8cf7a86b0acedd00578d860b8f40ce Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 23:19:02 +1200
Subject: [PATCH 396/447] #2318 - Refactor internals - final classes in
 expression packages

---
 .../server/expression/AbstractExpression.java   |  4 +---
 .../expression/AbstractTextExpression.java      |  2 +-
 .../expression/AbstractValueExpression.java     |  2 +-
 .../server/expression/AllEqualsExpression.java  | 17 ++---------------
 .../expression/ArrayContainsExpression.java     |  4 +---
 .../expression/ArrayIsEmptyExpression.java      |  2 +-
 .../server/expression/BetweenExpression.java    |  3 +--
 .../expression/BetweenPropertyExpression.java   |  6 ++----
 .../server/expression/BitwiseExpression.java    |  9 +++------
 .../CaseInsensitiveEqualExpression.java         |  4 +---
 .../expression/DefaultExampleExpression.java    |  4 ++--
 .../expression/DefaultExpressionList.java       |  5 -----
 .../expression/DefaultExpressionRequest.java    | 11 +----------
 .../expression/ExistsQueryExpression.java       | 16 +++++-----------
 .../server/expression/FilterExprPath.java       |  2 +-
 .../server/expression/FilterExpressionList.java |  4 +---
 .../server/expression/IdExpression.java         |  2 +-
 .../server/expression/IdInExpression.java       |  3 +--
 .../server/expression/InExpression.java         |  2 +-
 .../server/expression/InPairsExpression.java    |  8 +-------
 .../server/expression/InQueryExpression.java    |  5 +----
 .../server/expression/InRangeExpression.java    |  3 +--
 .../server/expression/IsEmptyExpression.java    |  4 +---
 .../server/expression/JsonPathExpression.java   | 10 +++++-----
 .../server/expression/JunctionExpression.java   |  7 +++----
 .../server/expression/LikeExpression.java       |  6 +-----
 .../server/expression/LogicExpression.java      |  6 ++----
 .../server/expression/NamedParamHelp.java       |  2 +-
 .../expression/NativeILikeExpression.java       |  2 +-
 .../expression/NestedPathWrapperExpression.java |  7 +++----
 .../server/expression/NoopExpression.java       |  4 ++--
 .../server/expression/NullExpression.java       |  5 +----
 .../server/expression/PrepareDocNested.java     |  2 +-
 .../server/expression/RawExpression.java        |  3 +--
 .../server/expression/RawExpressionBuilder.java |  2 +-
 .../ebeaninternal/server/expression/Same.java   | 11 +++++------
 .../server/expression/SimpleExpression.java     |  2 +-
 .../expression/TextCommonTermsExpression.java   |  3 +--
 .../server/expression/TextMatchExpression.java  |  5 ++---
 .../expression/TextMultiMatchExpression.java    |  5 ++---
 .../expression/TextQueryStringExpression.java   |  5 ++---
 .../server/expression/TextSimpleExpression.java |  5 ++---
 .../expression/platform/BaseDbExpression.java   |  2 --
 .../expression/platform/BasicDbExpression.java  |  2 +-
 .../platform/DbExpressionHandlerFactory.java    |  3 +--
 .../expression/platform/H2DbExpression.java     |  2 +-
 .../expression/platform/HanaDbExpression.java   |  2 +-
 .../expression/platform/MariaDbExpression.java  |  2 +-
 .../expression/platform/MySqlDbExpression.java  |  2 +-
 .../expression/platform/OracleDbExpression.java |  3 +--
 .../expression/platform/PostgresCast.java       |  7 +++----
 .../platform/PostgresDbExpression.java          |  5 +----
 .../platform/SqlServerDbExpression.java         |  2 +-
 53 files changed, 80 insertions(+), 166 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
index c3090e38f..f3c9d5aae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java
@@ -14,7 +14,7 @@ import io.ebeaninternal.api.NaturalKeyQueryData;
 /**
  * Base class for simple expressions.
  */
-public abstract class AbstractExpression implements SpiExpression {
+abstract class AbstractExpression implements SpiExpression {
 
   protected String propName;
 
@@ -66,7 +66,6 @@ public abstract class AbstractExpression implements SpiExpression {
 
   @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
-
     propertyContainsMany(propName, desc, manyWhereJoin);
   }
 
@@ -103,7 +102,6 @@ public abstract class AbstractExpression implements SpiExpression {
   }
 
   protected final ElPropertyValue getElProp(SpiExpressionRequest request) {
-
     return request.getBeanDescriptor().getElGetValue(propName);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
index 363bcb08d..272e557d7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java
@@ -10,7 +10,7 @@ import io.ebeaninternal.api.SpiExpressionRequest;
  * This means they can not be part of a SQL query nor do they use the built in query plan cache etc.
  * </p>
  */
-public abstract class AbstractTextExpression extends AbstractExpression {
+abstract class AbstractTextExpression extends AbstractExpression {
 
   AbstractTextExpression(String propName) {
     super(propName);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractValueExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractValueExpression.java
index 7adb2729b..a758dcd10 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractValueExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AbstractValueExpression.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression;
 /**
  * Abstract expression that helps with named parameter use.
  */
-public abstract class AbstractValueExpression extends AbstractExpression {
+abstract class AbstractValueExpression extends AbstractExpression {
 
   protected final Object bindValue;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
index 56761dcf2..fafb3bc96 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java
@@ -13,7 +13,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-class AllEqualsExpression extends NonPrepareExpression {
+final class AllEqualsExpression extends NonPrepareExpression {
 
   private final Map<String, Object> propMap;
 
@@ -21,7 +21,7 @@ class AllEqualsExpression extends NonPrepareExpression {
     this.propMap = propMap;
   }
 
-  protected String name(String propName) {
+  String name(String propName) {
     return propName;
   }
 
@@ -56,7 +56,6 @@ class AllEqualsExpression extends NonPrepareExpression {
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
     if (propMap.isEmpty()) {
       return;
     }
@@ -70,23 +69,17 @@ class AllEqualsExpression extends NonPrepareExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     if (propMap.isEmpty()) {
       return;
     }
-
     request.append("(");
-
     int count = 0;
     for (Map.Entry<String, Object> entry : propMap.entrySet()) {
-
       Object value = entry.getValue();
       String propName = entry.getKey();
-
       if (count > 0) {
         request.append("and ");
       }
-
       request.append(name(propName));
       if (value == null) {
         request.append(" is null ");
@@ -106,7 +99,6 @@ class AllEqualsExpression extends NonPrepareExpression {
    */
   @Override
   public void queryPlanHash(StringBuilder builder) {
-
     builder.append("AllEquals[");
     for (Entry<String, Object> entry : propMap.entrySet()) {
       Object value = entry.getValue();
@@ -135,20 +127,16 @@ class AllEqualsExpression extends NonPrepareExpression {
     if (!(other instanceof AllEqualsExpression)) {
       return false;
     }
-
     AllEqualsExpression that = (AllEqualsExpression) other;
     return isSameByValue(that, true);
   }
 
   private boolean isSameByValue(AllEqualsExpression that, boolean byValue) {
-
     if (propMap.size() != that.propMap.size()) {
       return false;
     }
-
     Iterator<Entry<String, Object>> thisIt = propMap.entrySet().iterator();
     Iterator<Entry<String, Object>> thatIt = that.propMap.entrySet().iterator();
-
     while (thisIt.hasNext() && thatIt.hasNext()) {
       Entry<String, Object> thisNext = thisIt.next();
       Entry<String, Object> thatNext = thatIt.next();
@@ -160,7 +148,6 @@ class AllEqualsExpression extends NonPrepareExpression {
         return false;
       }
     }
-
     return true;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
index 7a9e903f6..34fec6037 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java
@@ -9,10 +9,9 @@ import java.io.IOException;
 /**
  * Contains expression for ARRAY type.
  */
-public class ArrayContainsExpression extends AbstractExpression {
+final class ArrayContainsExpression extends AbstractExpression {
 
   private final boolean contains;
-
   private final Object[] values;
 
   ArrayContainsExpression(String propName, boolean contains, Object... values) {
@@ -26,7 +25,6 @@ public class ArrayContainsExpression extends AbstractExpression {
 
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-
     if (values.length == 1) {
       context.writeEqualTo(propName, values[0]);
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
index f9cd530c8..2234f9500 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
@@ -9,7 +9,7 @@ import java.io.IOException;
 /**
  * IsEmpty expression for ARRAY type.
  */
-public class ArrayIsEmptyExpression extends AbstractExpression {
+final class ArrayIsEmptyExpression extends AbstractExpression {
 
   private final boolean empty;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
index ed3d58d8b..be113e7a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java
@@ -6,12 +6,11 @@ import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.io.IOException;
 
-class BetweenExpression extends AbstractExpression {
+final class BetweenExpression extends AbstractExpression {
 
   private static final String _BETWEEN = " between ? and ?";
 
   private final Object valueHigh;
-
   private final Object valueLow;
 
   BetweenExpression(String propertyName, Object valueLow, Object valueHigh) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
index 55b08380d..74129849d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java
@@ -14,7 +14,7 @@ import java.io.IOException;
 /**
  * Between expression where a value is between two properties.
  */
-class BetweenPropertyExpression extends NonPrepareExpression {
+final class BetweenPropertyExpression extends NonPrepareExpression {
 
   private static final String BETWEEN = " between ";
 
@@ -34,7 +34,7 @@ class BetweenPropertyExpression extends NonPrepareExpression {
     this.highProperty = path + "." + highProperty;
   }
 
-  protected String name(String propName) {
+  String name(String propName) {
     return propName;
   }
 
@@ -62,12 +62,10 @@ class BetweenPropertyExpression extends NonPrepareExpression {
 
   @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
-
     ElPropertyDeploy elProp = desc.getElPropertyDeploy(name(lowProperty));
     if (elProp != null && elProp.containsMany()) {
       manyWhereJoin.add(elProp);
     }
-
     elProp = desc.getElPropertyDeploy(name(highProperty));
     if (elProp != null && elProp.containsMany()) {
       manyWhereJoin.add(elProp);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
index 460af37ec..aa68f2662 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BitwiseExpression.java
@@ -9,14 +9,11 @@ import java.io.IOException;
 /**
  * Bitwise expression.
  */
-class BitwiseExpression extends AbstractExpression {
-
-  protected final BitwiseOp operator;
+final class BitwiseExpression extends AbstractExpression {
 
+  private final BitwiseOp operator;
   private final String compare;
-
-  protected final long flags;
-
+  private final long flags;
   private final long match;
 
   BitwiseExpression(String propertyName, BitwiseOp operator, long flags, String compare, long match) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index 3a6224d9c..a8075090a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
 
-class CaseInsensitiveEqualExpression extends AbstractValueExpression {
+final class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
   private final boolean not;
 
@@ -34,7 +34,6 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
       // bind the key as well as the value
@@ -47,7 +46,6 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     String pname = propName;
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
index cd8a59857..ca97b5408 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -39,7 +39,7 @@ import java.util.ArrayList;
  *
  * }</pre>
  */
-public class DefaultExampleExpression implements SpiExpression, ExampleExpression {
+final class DefaultExampleExpression implements SpiExpression, ExampleExpression {
 
   /**
    * The example bean containing the properties.
@@ -75,7 +75,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
    * @param caseInsensitive if true use case insensitive expressions
    * @param likeType        the type of Like wild card used
    */
-  public DefaultExampleExpression(EntityBean entity, boolean caseInsensitive, LikeType likeType) {
+  DefaultExampleExpression(EntityBean entity, boolean caseInsensitive, LikeType likeType) {
     this.entity = entity;
     this.caseInsensitive = caseInsensitive;
     this.likeType = likeType;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index ed3f57e14..b9693df6d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -56,15 +56,10 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   private static final String AND = " and ";
 
   protected List<SpiExpression> list;
-
   protected final Query<T> query;
-
   private final ExpressionList<T> parentExprList;
-
   protected final ExpressionFactory expr;
-
   String allDocNestedPath;
-
   /**
    * Set to true for the "Text" root expression list.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
index 557c53996..09ff401af 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
@@ -13,26 +13,17 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DefaultExpressionRequest implements SpiExpressionRequest {
+public final class DefaultExpressionRequest implements SpiExpressionRequest {
 
   private final SpiOrmQueryRequest<?> queryRequest;
-
   private final BeanDescriptor<?> beanDescriptor;
-
   private final StringBuilder sql = new StringBuilder();
-
   private final List<Object> bindValues = new ArrayList<>();
-
   private final DeployParser deployParser;
-
   private final Binder binder;
-
   private final SpiExpressionList<?> expressionList;
-
   private int paramIndex;
-
   private final boolean enableBindLog;
-
   private StringBuilder bindLog;
 
   public DefaultExpressionRequest(SpiOrmQueryRequest<?> queryRequest, DeployParser deployParser, Binder binder, SpiExpressionList<?> expressionList) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 71ca665fe..438f1a2d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -16,15 +16,12 @@ import io.ebeaninternal.server.query.CQuery;
 import java.io.IOException;
 import java.util.List;
 
-class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpression {
+final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpression {
 
-  protected final boolean not;
-
-  protected final SpiQuery<?> subQuery;
-
-  protected List<Object> bindParams;
-
-  protected String sql;
+  private final boolean not;
+  private final SpiQuery<?> subQuery;
+  private List<Object> bindParams;
+  private String sql;
 
   ExistsQueryExpression(SpiQuery<?> subQuery, boolean not) {
     this.subQuery = subQuery;
@@ -67,7 +64,6 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
 
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
-
     CQuery<?> subQuery = compileSubQuery(request);
     this.bindParams = subQuery.getPredicates().getWhereExprBindValues();
     this.sql = subQuery.getGeneratedSql().replace('\n', ' ');
@@ -99,7 +95,6 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     if (not) {
       request.append(" not");
     }
@@ -110,7 +105,6 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
     for (Object bindParam : bindParams) {
       request.addBindValue(bindParam);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExprPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExprPath.java
index d7b04de44..5765c7e43 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExprPath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExprPath.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * query that includes the filterMany.
  * </p>
  */
-public class FilterExprPath implements Serializable {
+public final class FilterExprPath implements Serializable {
 
   private static final long serialVersionUID = -6420905565372842018L;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
index b6b1874a8..0e8d4ba0b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
@@ -18,14 +18,12 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-public class FilterExpressionList<T> extends DefaultExpressionList<T> {
+public final class FilterExpressionList<T> extends DefaultExpressionList<T> {
 
   private static final String notAllowedMessage = "This method is not allowed on a filter";
 
   private final Query<T> rootQuery;
-
   private final FilterExprPath pathPrefix;
-
   private int firstRow;
   private int maxRows;
   private String orderByClause;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
index 94cab6de7..c61f884a4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdExpression.java
@@ -12,7 +12,7 @@ import java.io.IOException;
 /**
  * Slightly redundant as Query.setId() ultimately also does the same job.
  */
-class IdExpression extends NonPrepareExpression implements SpiExpression {
+final class IdExpression extends NonPrepareExpression implements SpiExpression {
 
   private final Object value;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
index edf56b443..c1bd76db0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
@@ -20,10 +20,9 @@ import java.util.Set;
 /**
  * In a collection of Id values.
  */
-public class IdInExpression extends NonPrepareExpression {
+public final class IdInExpression extends NonPrepareExpression {
 
   private final List<Object> idCollection;
-
   private boolean multiValueIdSupported;
 
   public IdInExpression(Collection<?> idCollection) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
index 0bc5a4588..1a84d87eb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-class InExpression extends AbstractExpression {
+final class InExpression extends AbstractExpression {
 
   private final boolean not;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
index e5bd27413..b5533b7ad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
@@ -13,20 +13,14 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-class InPairsExpression extends AbstractExpression {
+final class InPairsExpression extends AbstractExpression {
 
   private final boolean not;
-
   private final String property0, property1;
-
   private List<Pairs.Entry> entries;
-
   private boolean multiValueSupported;
-
   private final String separator;
-
   private final String suffix;
-
   private List<Object> concatBindValues;
 
   InPairsExpression(Pairs pairs, boolean not) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index a2d6d787c..e53792550 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -15,14 +15,11 @@ import java.util.List;
 /**
  * In expression using a sub query.
  */
-class InQueryExpression extends AbstractExpression implements UnsupportedDocStoreExpression {
+final class InQueryExpression extends AbstractExpression implements UnsupportedDocStoreExpression {
 
   private final boolean not;
-
   private final SpiQuery<?> subQuery;
-
   private List<Object> bindParams;
-
   private String sql;
 
   InQueryExpression(String propertyName, SpiQuery<?> subQuery, boolean not) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
index 04b242ba8..8bcdb12a8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java
@@ -6,10 +6,9 @@ import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.io.IOException;
 
-class InRangeExpression extends AbstractExpression {
+final class InRangeExpression extends AbstractExpression {
 
   private final Object valueHigh;
-
   private final Object valueLow;
 
   InRangeExpression(String propertyName, Object valueLow, Object valueHigh) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
index d6b878bfa..fc3be3e34 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java
@@ -10,12 +10,10 @@ import io.ebean.util.SplitName;
 
 import java.io.IOException;
 
-class IsEmptyExpression extends AbstractExpression {
+final class IsEmptyExpression extends AbstractExpression {
 
   private final boolean empty;
-
   private final String propertyPath;
-
   private String nestedPath;
 
   IsEmptyExpression(String propertyName, boolean empty) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
index 1d954dcc1..a6e8f128b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java
@@ -16,27 +16,27 @@ import java.util.Objects;
  * The value passed in is expected to be a valid JSON type so string, number, boolean.
  * </p>
  */
-class JsonPathExpression extends AbstractExpression {
+final class JsonPathExpression extends AbstractExpression {
 
   /**
    * The path in the JSON document in dot notation form.
    */
-  protected final String path;
+  private final String path;
 
   /**
    * The expression operator.
    */
-  protected final Op operator;
+  private final Op operator;
 
   /**
    * The bind value used to compare against the document path value.
    */
-  protected final Object value;
+  private final Object value;
 
   /**
    * For Between this is the upper bind value.
    */
-  protected final Object upperValue;
+  private final Object upperValue;
 
   /**
    * Construct for Operator (not BETWEEN though).
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 5637fba7f..a408b5e74 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -48,11 +48,10 @@ import java.util.function.Predicate;
 /**
  * Junction implementation.
  */
-class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, ExpressionList<T> {
+final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, ExpressionList<T> {
 
-  protected DefaultExpressionList<T> exprList;
-
-  protected Junction.Type type;
+  DefaultExpressionList<T> exprList;
+  Junction.Type type;
 
   JunctionExpression(Junction.Type type, Query<T> query, ExpressionList<T> parent) {
     this.type = type;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
index f40501929..bf3871c23 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java
@@ -8,10 +8,9 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
 
-class LikeExpression extends AbstractValueExpression {
+final class LikeExpression extends AbstractValueExpression {
 
   private final boolean caseInsensitive;
-
   private final LikeType type;
 
   LikeExpression(String propertyName, Object value, boolean caseInsensitive, LikeType type) {
@@ -27,7 +26,6 @@ class LikeExpression extends AbstractValueExpression {
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
       // bind the key as well as the value
@@ -40,7 +38,6 @@ class LikeExpression extends AbstractValueExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     String pname = propName;
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
@@ -98,7 +95,6 @@ class LikeExpression extends AbstractValueExpression {
         return "%" + value + "%";
       case EQUAL_TO:
         return value;
-
       default:
         throw new RuntimeException("LikeType " + type + " missed?");
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
index a66e2e88a..b0ef74f03 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java
@@ -21,7 +21,7 @@ abstract class LogicExpression implements SpiExpression {
   static final String AND = " and ";
   static final String OR = " or ";
 
-  static class And extends LogicExpression {
+  static final class And extends LogicExpression {
 
     And(Expression expOne, Expression expTwo) {
       super(true, expOne, expTwo);
@@ -34,7 +34,7 @@ abstract class LogicExpression implements SpiExpression {
 
   }
 
-  static class Or extends LogicExpression {
+  static final class Or extends LogicExpression {
 
     Or(Expression expOne, Expression expTwo) {
       super(false, expOne, expTwo);
@@ -47,9 +47,7 @@ abstract class LogicExpression implements SpiExpression {
   }
 
   SpiExpression expOne;
-
   SpiExpression expTwo;
-
   private final boolean conjunction;
 
   LogicExpression(boolean conjunction, Expression expOne, Expression expTwo) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NamedParamHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NamedParamHelp.java
index 5487cffbf..3a56ec7de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NamedParamHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NamedParamHelp.java
@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * Helper for evaluating named parameters.
  */
-class NamedParamHelp {
+final class NamedParamHelp {
 
   /**
    * Return the bind value taking into account named parameters.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
index f64933df5..110442365 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
 
-class NativeILikeExpression extends AbstractExpression {
+final class NativeILikeExpression extends AbstractExpression {
 
   private final String val;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
index b76bfef4d..0bb63f1ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java
@@ -14,11 +14,10 @@ import java.io.IOException;
 /**
  * Wraps a single expression with nestedPath for document queries.
  */
-class NestedPathWrapperExpression implements SpiExpression {
+final class NestedPathWrapperExpression implements SpiExpression {
 
-  protected final String nestedPath;
-
-  protected final SpiExpression delegate;
+  final String nestedPath;
+  final SpiExpression delegate;
 
   NestedPathWrapperExpression(String nestedPath, SpiExpression delegate) {
     this.nestedPath = nestedPath;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
index 6c8d709e7..079f26874 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
@@ -14,9 +14,9 @@ import java.io.IOException;
 /**
  * Effectively an expression that has no effect.
  */
-class NoopExpression implements SpiExpression {
+final class NoopExpression implements SpiExpression {
 
-  protected static final NoopExpression INSTANCE = new NoopExpression();
+  static final NoopExpression INSTANCE = new NoopExpression();
 
   @Override
   public void prefixProperty(String path) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
index 2808acce7..4a4a81201 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java
@@ -17,14 +17,11 @@ import java.io.IOException;
  * Note that for OneToMany/ManyToMany this effectively gets translated into isEmpty()/isNotEmpty().
  * </p>
  */
-class NullExpression extends AbstractExpression {
+final class NullExpression extends AbstractExpression {
 
   private final boolean notNull;
-
   private ElPropertyValue elProperty;
-
   private boolean assocMany;
-
   private String propertyPath;
 
   NullExpression(String propertyName, boolean notNull) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java
index ebc2d794b..8f1f48d38 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * Prepare nested path expressions for
  */
-class PrepareDocNested {
+final class PrepareDocNested {
 
   /**
    * Prepare the top level expressions for nested path handling.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
index 9e1c3e8dc..53571cad7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
@@ -11,10 +11,9 @@ import io.ebeaninternal.server.persist.MultiValueWrapper;
 import java.io.IOException;
 import java.util.Collection;
 
-class RawExpression extends NonPrepareExpression {
+final class RawExpression extends NonPrepareExpression {
 
   final String sql;
-
   final Object[] values;
 
   RawExpression(String sql, Object[] values) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java
index 73a4da911..40aa47271 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-class RawExpressionBuilder {
+final class RawExpressionBuilder {
 
   private static final String BP_1 = "?1";
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/Same.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/Same.java
index 931e3e3e3..104d27969 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/Same.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/Same.java
@@ -7,26 +7,26 @@ import java.util.Objects;
 /**
  * Utility to help isSame methods.
  */
-public class Same {
+final class Same {
 
   /**
    * Return true if both values are null or both an not null.
    */
-  public static boolean sameByNull(Object v1, Object v2) {
+  static boolean sameByNull(Object v1, Object v2) {
     return (v1 == null) == (v2 == null);
   }
 
   /**
    * Null safe equals check.
    */
-  public static boolean sameByValue(Object v1, Object v2) {
+  static boolean sameByValue(Object v1, Object v2) {
     return Objects.equals(v1, v2);
   }
 
   /**
    * Return true if both collections are the same by value and order is taken into account.
    */
-  public static boolean sameByValue(Collection<?> v1, Collection<?> v2) {
+  static boolean sameByValue(Collection<?> v1, Collection<?> v2) {
     if (v1 == null) {
       return v2 == null;
     }
@@ -46,8 +46,7 @@ public class Same {
   /**
    * Null safe check by sameByValue or sameByNull based on byValue.
    */
-  public static boolean sameBy(boolean byValue, Object value, Object value1) {
-
+  static boolean sameBy(boolean byValue, Object value, Object value1) {
     if (byValue) {
       return sameByValue(value, value1);
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
index bc23b84f2..87b0ed3bf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java
@@ -11,7 +11,7 @@ import io.ebeaninternal.api.NaturalKeyQueryData;
 import java.io.IOException;
 import java.util.Arrays;
 
-public class SimpleExpression extends AbstractValueExpression {
+public final class SimpleExpression extends AbstractValueExpression {
 
   private final Op type;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextCommonTermsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextCommonTermsExpression.java
index 8cc5fb5bb..3f289edb5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextCommonTermsExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextCommonTermsExpression.java
@@ -7,10 +7,9 @@ import java.io.IOException;
 /**
  * Full text common terms expression.
  */
-class TextCommonTermsExpression extends AbstractTextExpression {
+final class TextCommonTermsExpression extends AbstractTextExpression {
 
   private final String search;
-
   private final TextCommonTerms options;
 
   public TextCommonTermsExpression(String search, TextCommonTerms options) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMatchExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMatchExpression.java
index d36f491b7..f7cb06e6a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMatchExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMatchExpression.java
@@ -7,13 +7,12 @@ import java.io.IOException;
 /**
  * Full text MATCH expression.
  */
-public class TextMatchExpression extends AbstractTextExpression {
+final class TextMatchExpression extends AbstractTextExpression {
 
   private final String search;
-
   private final Match options;
 
-  public TextMatchExpression(String propertyName, String search, Match options) {
+  TextMatchExpression(String propertyName, String search, Match options) {
     super(propertyName);
     this.search = search;
     this.options = options;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMultiMatchExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMultiMatchExpression.java
index e51538e9f..f9fe1e909 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMultiMatchExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextMultiMatchExpression.java
@@ -7,13 +7,12 @@ import java.io.IOException;
 /**
  * Full text Multi-Match expression.
  */
-public class TextMultiMatchExpression extends AbstractTextExpression {
+final class TextMultiMatchExpression extends AbstractTextExpression {
 
   private final String search;
-
   private final MultiMatch options;
 
-  public TextMultiMatchExpression(String search, MultiMatch options) {
+  TextMultiMatchExpression(String search, MultiMatch options) {
     super(null);
     this.search = search;
     this.options = options;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextQueryStringExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextQueryStringExpression.java
index 2a44e39d5..dcd46a240 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextQueryStringExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextQueryStringExpression.java
@@ -7,13 +7,12 @@ import java.io.IOException;
 /**
  * Full text query string expression.
  */
-class TextQueryStringExpression extends AbstractTextExpression {
+final class TextQueryStringExpression extends AbstractTextExpression {
 
   private final String search;
-
   private final TextQueryString options;
 
-  public TextQueryStringExpression(String search, TextQueryString options) {
+  TextQueryStringExpression(String search, TextQueryString options) {
     super(null);
     this.search = search;
     this.options = options;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextSimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextSimpleExpression.java
index 9faa7d1a7..ec6702c2a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextSimpleExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/TextSimpleExpression.java
@@ -7,13 +7,12 @@ import java.io.IOException;
 /**
  * Full text Multi-Match expression.
  */
-class TextSimpleExpression extends AbstractTextExpression {
+final class TextSimpleExpression extends AbstractTextExpression {
 
   private final String search;
-
   private final TextSimple options;
 
-  public TextSimpleExpression(String search, TextSimple options) {
+  TextSimpleExpression(String search, TextSimple options) {
     super(null);
     this.search = search;
     this.options = options;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
index 2c85e7963..a8d4d6adc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java
@@ -10,7 +10,6 @@ abstract class BaseDbExpression implements DbExpressionHandler {
 
   @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(" ?)");
   }
@@ -30,7 +29,6 @@ abstract class BaseDbExpression implements DbExpressionHandler {
    * 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(" ?");
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
index 8b5ab8d70..edecf8230 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.expression.Op;
 /**
  * Not supported JSON or ARRAY expression handler.
  */
-public class BasicDbExpression extends BaseDbExpression {
+class BasicDbExpression extends BaseDbExpression {
 
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
index c4b24fc84..6f773b270 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
@@ -4,13 +4,12 @@ import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
 
-public class DbExpressionHandlerFactory {
+public final class DbExpressionHandlerFactory {
 
   /**
    * Create and return the appropriate platform specific handing of expressions.
    */
   public static DbExpressionHandler from(DatabasePlatform databasePlatform) {
-
     Platform platform = databasePlatform.getPlatform();
     switch (platform) {
       case H2:
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
index 0c7e43b65..5eddb5d11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.expression.BitwiseOp;
 /**
  * H2 handling of platform specific expressions.
  */
-class H2DbExpression extends BasicDbExpression {
+final class H2DbExpression extends BasicDbExpression {
 
   @Override
   public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
index a6633edfa..43919c1a0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.expression.Op;
 /**
  * HANA handling of platform specific expressions.
  */
-public class HanaDbExpression extends BaseDbExpression {
+final class HanaDbExpression extends BaseDbExpression {
 
   @Override
   public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java
index 8e4c0be1d..8116b2c4e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.expression.Op;
 /**
  * MariaDB specific handling of platform specific expressions.
  */
-class MariaDbExpression extends BasicDbExpression {
+final class MariaDbExpression extends BasicDbExpression {
 
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
index 8ea2595fe..b0721a44e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.expression.Op;
 /**
  * MySql specific handling of platform specific expressions.
  */
-class MySqlDbExpression extends BasicDbExpression {
+final class MySqlDbExpression extends BasicDbExpression {
 
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
index 3ec4b4071..f1fbaef7a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.expression.Op;
 /**
  * Oracle handling of platform specific expressions. ARRAY expressions not supported.
  */
-public class OracleDbExpression extends BaseDbExpression {
+final class OracleDbExpression extends BaseDbExpression {
 
   @Override
   public String concat(String property0, String separator, String property1, String suffix) {
@@ -16,7 +16,6 @@ public class OracleDbExpression extends BaseDbExpression {
 
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
-
     if (operator == Op.EXISTS) {
       request.append("json_exists(").append(propName).append(", '$.").append(path).append("')");
     } else if (operator == Op.NOT_EXISTS) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresCast.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresCast.java
index 3e833cb12..595acb6cd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresCast.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresCast.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression.platform;
 /**
  * Helper for determining type casting for JSON and ARRAY expressions.
  */
-public class PostgresCast {
+final class PostgresCast {
 
   /**
    * Postgres CAST the type if necessary.
@@ -11,15 +11,14 @@ public class PostgresCast {
    * This is generally necessary for JSON expressions as text values always returned from the json operators used.
    * </p>
    */
-  protected static String cast(Object value) {
+  static String cast(Object value) {
     return cast(value, false);
   }
 
   /**
    * Postgres CAST the type if necessary additionally specify if DB ARRAY is used.
    */
-  protected static String cast(Object value, boolean asArray) {
-
+  static String cast(Object value, boolean asArray) {
     if (value == null) {
       // for exists and not-exists expressions
       return "";
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
index 54270ee5c..a3f044072 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.expression.Op;
 /**
  * Postgres JSON and ARRAY expression handler
  */
-public class PostgresDbExpression extends BaseDbExpression {
+final class PostgresDbExpression extends BaseDbExpression {
 
   @Override
   public String concat(String property0, String separator, String property1, String suffix) {
@@ -15,7 +15,6 @@ public class PostgresDbExpression extends BaseDbExpression {
 
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
-
     StringBuilder sb = new StringBuilder(50);
     String[] paths = path.split("\\.");
     if (paths.length == 1) {
@@ -41,7 +40,6 @@ public class PostgresDbExpression extends BaseDbExpression {
 
   @Override
   public void arrayContains(SpiExpressionRequest request, String propName, boolean contains, Object... values) {
-
     if (!contains) {
       request.append("not (");
     }
@@ -58,7 +56,6 @@ public class PostgresDbExpression extends BaseDbExpression {
 
   @Override
   public void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty) {
-
     request.append("coalesce(cardinality(").append(propName).append("),0)");
     if (empty) {
       request.append(" = 0");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
index 98d76ec43..78838a81e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.expression.Op;
 /**
  * Microsoft SQL Server JSON. ARRAY expressions not supported.
  */
-public class SqlServerDbExpression extends BaseDbExpression {
+final class SqlServerDbExpression extends BaseDbExpression {
 
   @Override
   public void json(final SpiExpressionRequest request, final String propName,

From 9ee63144e57721ec49a9cd3c54c5de88f99678e6 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 23:32:05 +1200
Subject: [PATCH 397/447] #2318 - Refactor internals - final classes in core
 packages

---
 .../server/core/DScriptRunner.java            |   2 +-
 .../server/core/DefaultBeanLoader.java        |  19 +-
 .../server/core/DefaultBeanState.java         |   2 +-
 .../server/core/DefaultCallOriginFactory.java |   2 +-
 .../server/core/DefaultCallableSql.java       |   2 +-
 .../server/core/DefaultContainer.java         |   2 +-
 .../server/core/DefaultMetaInfoManager.java   |   2 +-
 .../server/core/DefaultQueryPlanListener.java |   2 +-
 .../server/core/DefaultSlowQueryListener.java |   3 +-
 .../ebeaninternal/server/core/DiffHelp.java   |   6 +-
 .../server/core/DumpMetrics.java              |   4 +-
 .../server/core/DumpMetricsData.java          |   4 +-
 .../server/core/DumpMetricsJson.java          |   7 +-
 .../server/core/InitDataSource.java           |   3 +-
 .../server/core/InternalConfigXmlMap.java     |   2 +-
 .../server/core/InternalConfiguration.java    |   2 +-
 .../server/core/JndiDataSourceLookup.java     |   6 +-
 .../core/MultiTenantDbCatalogSupplier.java    |   3 +-
 .../core/MultiTenantDbSchemaSupplier.java     |   3 +-
 .../server/core/MultiTenantDbSupplier.java    |   3 +-
 .../server/core/NoopCallOriginFactory.java    |   2 +-
 .../core/PersistDeferredRelationship.java     |   2 +-
 .../server/core/RefreshHelp.java              | 215 ------------------
 .../server/core/SimpleDataSourceProvider.java |   3 +-
 .../server/core/SpiResultSet.java             |   2 +-
 25 files changed, 24 insertions(+), 279 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/core/RefreshHelp.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
index 8bf649438..cb78076bc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
@@ -17,7 +17,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Map;
 
-class DScriptRunner implements ScriptRunner {
+final class DScriptRunner implements ScriptRunner {
 
   private static final String NEWLINE = "\n";
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 34417ed14..4d0409d4c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -26,12 +26,11 @@ import java.util.List;
 /**
  * Helper to handle lazy loading and refreshing of beans.
  */
-class DefaultBeanLoader {
+final class DefaultBeanLoader {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultBeanLoader.class);
 
   private final DefaultServer server;
-
   private final boolean onIterateUseExtraTxn;
 
   DefaultBeanLoader(DefaultServer server) {
@@ -40,17 +39,14 @@ class DefaultBeanLoader {
   }
 
   void loadMany(LoadManyRequest loadRequest) {
-
     SpiQuery<?> query = loadRequest.createQuery(server);
     executeQuery(loadRequest, query);
     loadRequest.postLoad();
   }
 
   void loadMany(BeanCollection<?> bc, boolean onlyIds) {
-
     EntityBean parentBean = bc.getOwnerBean();
     String propertyName = bc.getPropertyName();
-
     loadManyInternal(parentBean, propertyName, null, false, onlyIds);
   }
 
@@ -59,13 +55,10 @@ class DefaultBeanLoader {
   }
 
   private void loadManyInternal(EntityBean parentBean, String propertyName, Transaction t, boolean refresh, boolean onlyIds) {
-
     EntityBeanIntercept ebi = parentBean._ebean_getIntercept();
     PersistenceContext pc = ebi.getPersistenceContext();
-
     BeanDescriptor<?> parentDesc = server.getBeanDescriptor(parentBean.getClass());
     BeanPropertyAssocMany<?> many = (BeanPropertyAssocMany<?>) parentDesc.getBeanProperty(propertyName);
-
     BeanCollection<?> beanCollection = null;
     ExpressionList<?> filterMany = null;
 
@@ -126,7 +119,6 @@ class DefaultBeanLoader {
     }
 
     server.findOne(query, t);
-
     if (beanCollection != null) {
       if (beanCollection.checkEmptyLazyLoad()) {
         if (logger.isDebugEnabled()) {
@@ -142,7 +134,6 @@ class DefaultBeanLoader {
    * Load a batch of beans for +query or +lazy loading.
    */
   void loadBean(LoadBeanRequest loadRequest) {
-
     List<EntityBeanIntercept> batch = loadRequest.getBatch();
     if (batch.isEmpty()) {
       throw new RuntimeException("Nothing in batch?");
@@ -190,7 +181,6 @@ class DefaultBeanLoader {
   }
 
   private void refreshBeanInternal(EntityBean bean, SpiQuery.Mode mode, int embeddedOwnerIndex) {
-
     EntityBeanIntercept ebi = bean._ebean_getIntercept();
     PersistenceContext pc = ebi.getPersistenceContext();
     if (Mode.REFRESH_BEAN == mode) {
@@ -203,12 +193,10 @@ class DefaultBeanLoader {
       // lazy loading on an embedded bean property
       EntityBean embeddedOwner = (EntityBean) ebi.getEmbeddedOwner();
       int ownerIndex = ebi.getEmbeddedOwnerIndex();
-
       refreshBeanInternal(embeddedOwner, mode, ownerIndex);
     }
 
     Object id = desc.getId(bean);
-
     if (pc == null) {
       // a reference with no existing persistenceContext
       pc = new DefaultPersistenceContext();
@@ -216,7 +204,6 @@ class DefaultBeanLoader {
       ebi.setPersistenceContext(pc);
     }
     boolean draft = desc.isDraftInstance(bean);
-
     if (embeddedOwnerIndex == -1) {
       if (desc.lazyLoadMany(ebi)) {
         return;
@@ -246,16 +233,13 @@ class DefaultBeanLoader {
     query.setPersistenceContext(pc);
     query.setMode(mode);
     query.setId(id);
-
     if (embeddedOwnerIndex > -1 || mode == Mode.REFRESH_BEAN) {
       // make sure the query doesn't use the cache
       query.setUseCache(false);
     }
-
     if (ebi.isReadOnly()) {
       query.setReadOnly(true);
     }
-
     if (Mode.REFRESH_BEAN == mode) {
       // explicitly state to load all properties on REFRESH.
       // Lobs default to fetch lazy so this forces lobs to be
@@ -268,7 +252,6 @@ class DefaultBeanLoader {
       String msg = "Bean not found during lazy load or refresh." + " id[" + id + "] type[" + desc.getBeanType() + "]";
       throw new EntityNotFoundException(msg);
     }
-
     desc.resetManyProperties(dbBean);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
index 22f2b7ae8..332b4fc0d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
@@ -11,7 +11,7 @@ import java.util.Set;
 /**
  * Default implementation of BeanState.
  */
-public class DefaultBeanState implements BeanState {
+public final class DefaultBeanState implements BeanState {
 
   private final EntityBeanIntercept intercept;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java
index 249f4dbdb..233a2a920 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java
@@ -8,7 +8,7 @@ import java.util.Arrays;
 /**
  * Default CallStackFactory where the Hash function for StackTraceElement includes the line number.
  */
-public class DefaultCallOriginFactory implements CallOriginFactory {
+public final class DefaultCallOriginFactory implements CallOriginFactory {
 
   private static final int IGNORE_LEADING_ELEMENTS = 5;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java
index f41919ce2..fe7b18392 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java
@@ -12,7 +12,7 @@ import java.sql.CallableStatement;
 import java.sql.SQLException;
 
 
-public class DefaultCallableSql implements Serializable, SpiCallableSql {
+public final class DefaultCallableSql implements Serializable, SpiCallableSql {
 
   private static final long serialVersionUID = 8984272253185424701L;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index e912b8cbb..348fd2f32 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -32,7 +32,7 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * Default Server side implementation of ServerFactory.
  */
-public class DefaultContainer implements SpiContainer {
+public final class DefaultContainer implements SpiContainer {
 
   private static final Logger logger = LoggerFactory.getLogger("io.ebean.DB");
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
index a6a65e19d..a1775e818 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * DefaultServer based implementation of MetaInfoManager.
  */
-public class DefaultMetaInfoManager implements MetaInfoManager {
+final class DefaultMetaInfoManager implements MetaInfoManager {
 
   private final DefaultServer server;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
index 20d7ec223..ba2e99bda 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
@@ -6,7 +6,7 @@ import io.ebean.meta.MetaQueryPlan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class DefaultQueryPlanListener implements QueryPlanListener {
+final class DefaultQueryPlanListener implements QueryPlanListener {
 
   static final QueryPlanListener INSTANT = new DefaultQueryPlanListener();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
index b271a513e..64c813213 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
@@ -9,13 +9,12 @@ import org.slf4j.LoggerFactory;
 /**
  * Default slow query listener implementation that logs a warning message.
  */
-class DefaultSlowQueryListener implements SlowQueryListener {
+final class DefaultSlowQueryListener implements SlowQueryListener {
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.SlowQuery");
 
   @Override
   public void process(SlowQueryEvent event) {
-
     String firstStack = "";
     ObjectGraphNode node = event.getOriginNode();
     if (node != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DiffHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DiffHelp.java
index b879727db..9eca59e19 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DiffHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DiffHelp.java
@@ -12,7 +12,7 @@ import java.util.Map;
  * This intentionally does not include any OneToMany or ManyToMany properties.
  * </p>
  */
-public class DiffHelp {
+public final class DiffHelp {
 
   private DiffHelp() {
   }
@@ -28,11 +28,9 @@ public class DiffHelp {
    * </p>
    */
   public static Map<String, ValuePair> diff(Object newBean, Object oldBean, BeanDescriptor<?> desc) {
-
     if (!(newBean instanceof EntityBean)) {
       throw new IllegalArgumentException("First bean expected to be an enhanced EntityBean? bean:" + newBean);
     }
-
     if (oldBean != null) {
       if (!(oldBean instanceof EntityBean)) {
         throw new IllegalArgumentException("Second bean expected to be an enhanced EntityBean? bean:" + oldBean);
@@ -41,11 +39,9 @@ public class DiffHelp {
         throw new IllegalArgumentException("Second bean not assignable to the first bean?");
       }
     }
-
     if (oldBean == null) {
       return ((EntityBean) newBean)._ebean_getIntercept().getDirtyValues();
     }
-
     return desc.diff((EntityBean) newBean, (EntityBean) oldBean);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 5274b4ced..9b5a1afa7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -10,14 +10,12 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import java.util.Comparator;
 import java.util.List;
 
-class DumpMetrics {
+final 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;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
index 4bc1e5035..712521ce0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
@@ -14,10 +14,9 @@ import java.util.List;
 /**
  * Dump the metrics into a list of MetricData.
  */
-class DumpMetricsData {
+final class DumpMetricsData {
 
   private final Database database;
-
   private final List<MetricData> list = new ArrayList<>();
 
   DumpMetricsData(Database database) {
@@ -30,7 +29,6 @@ class DumpMetricsData {
   }
 
   private void collect(ServerMetrics serverMetrics) {
-
     final List<MetaTimedMetric> timedMetrics = serverMetrics.timedMetrics();
     final List<MetaCountMetric> countMetrics = serverMetrics.countMetrics();
     final List<MetaQueryMetric> queryMetrics = serverMetrics.queryMetrics();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
index 90200f79b..190af0af4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
@@ -14,23 +14,18 @@ import java.io.StringWriter;
 import java.util.Comparator;
 import java.util.List;
 
-class DumpMetricsJson implements ServerMetricsAsJson {
+final class DumpMetricsJson implements ServerMetricsAsJson {
 
   private final Database database;
-
   private Appendable writer;
-
   /**
    * By default include sql and location attributes for the initial collection only.
    */
   private int includeExtraAttributes = 1;
-
   private boolean withHeader = true;
   private boolean withHash = true;
   private String newLine = "\n";
-
   private Comparator<MetaTimedMetric> sortBy = SortMetric.NAME;
-
   private int listCounter;
   private int objKeyCounter;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
index 3a03c7361..f65cb0823 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
@@ -12,10 +12,9 @@ import javax.sql.DataSource;
 /**
  * Initialise the main DataSource and read-only DataSource.
  */
-class InitDataSource {
+final class InitDataSource {
 
   private final JndiDataSourceLookup jndiDataSourceFactory = new JndiDataSourceLookup();
-
   private final DatabaseConfig config;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
index ccfa08de3..594a9f29d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
@@ -14,7 +14,7 @@ import java.util.Map;
 /**
  * Reads the Xml deployment information.
  */
-class InternalConfigXmlMap {
+final class InternalConfigXmlMap {
 
   private static final Logger log = LoggerFactory.getLogger(InternalConfigXmlMap.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index dca8e3059..96ab21aa2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -113,7 +113,7 @@ import java.util.ServiceLoader;
  * Used to extend the DatabaseConfig with additional objects used to configure and
  * construct an Database.
  */
-public class InternalConfiguration {
+public final class InternalConfiguration {
 
   private static final Logger logger = LoggerFactory.getLogger(InternalConfiguration.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/JndiDataSourceLookup.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/JndiDataSourceLookup.java
index 0e541fadd..09b2f7a9c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/JndiDataSourceLookup.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/JndiDataSourceLookup.java
@@ -9,10 +9,7 @@ import javax.sql.DataSource;
 /**
  * Helper to lookup a DataSource from JNDI.
  */
-public class JndiDataSourceLookup {
-
-  public JndiDataSourceLookup() {
-  }
+class JndiDataSourceLookup {
 
   /**
    * Return the DataSource by JNDI lookup.
@@ -21,7 +18,6 @@ public class JndiDataSourceLookup {
    * </p>
    */
   public DataSource lookup(String jndiName) {
-
     try {
       Context ctx = new InitialContext();
       DataSource ds = (DataSource) ctx.lookup(jndiName);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
index 8b369d25a..abe20b1ca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java
@@ -15,11 +15,10 @@ import java.util.logging.Logger;
 /**
  * DataSource supplier that changes DB catalog based on current Tenant Id.
  */
-public class MultiTenantDbCatalogSupplier implements DataSourceSupplier {
+final class MultiTenantDbCatalogSupplier implements DataSourceSupplier {
 
   private final DataSource dataSource;
   private final DataSource readOnlyDataSource;
-
   private final CatalogDataSource catalogDataSource;
   private final CatalogDataSource readOnly;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
index f37ce202e..2a1af6016 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java
@@ -15,11 +15,10 @@ import java.util.logging.Logger;
 /**
  * DataSource supplier that changes DB schema based on current Tenant Id.
  */
-class MultiTenantDbSchemaSupplier implements DataSourceSupplier {
+final class MultiTenantDbSchemaSupplier implements DataSourceSupplier {
 
   private final DataSource dataSource;
   private final DataSource readOnlyDataSource;
-
   private final SchemaDataSource schemaDataSource;
   private final SchemaDataSource readOnly;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java
index b985c7864..e6237abfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java
@@ -11,10 +11,9 @@ import java.sql.SQLException;
 /**
  * DataSource supplier based on DataSource per Tenant.
  */
-class MultiTenantDbSupplier implements DataSourceSupplier {
+final class MultiTenantDbSupplier implements DataSourceSupplier {
 
   private final CurrentTenantProvider tenantProvider;
-
   private final TenantDataSourceProvider dataSourceProvider;
 
   MultiTenantDbSupplier(CurrentTenantProvider tenantProvider, TenantDataSourceProvider dataSourceProvider) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java
index eee313bc3..a95e507ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java
@@ -6,7 +6,7 @@ import io.ebean.bean.CallStack;
 /**
  * A CallOriginFactory we can use when we don't use AutoTune.
  */
-class NoopCallOriginFactory implements CallOriginFactory {
+final class NoopCallOriginFactory implements CallOriginFactory {
 
   private static final StackTraceElement E0 = new StackTraceElement("none", "none", "none", 0);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java
index ff81f49da..41bbb20ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java
@@ -11,7 +11,7 @@ import io.ebeaninternal.server.deploy.id.ImportedId;
  * Deferred update of a relationship where an Id value is not initially available
  * so instead we execute this later as a SqlUpdate statement.
  */
-public class PersistDeferredRelationship {
+public final class PersistDeferredRelationship {
 
   private final SpiEbeanServer ebeanServer;
   private final BeanDescriptor<?> beanDescriptor;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RefreshHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RefreshHelp.java
deleted file mode 100644
index 24ff1d117..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RefreshHelp.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package io.ebeaninternal.server.core;
-
-
-/**
- * Helper for performing a 'refresh' on an Entity bean.
- * <p>
- * Note that this does not 'refresh' any OnetoMany or ManyToMany properties. It
- * refreshes all the other properties though.
- * </p>
- */
-public class RefreshHelp {
-//
-//	/**
-//	 * Helper for debug of lazy loading.
-//	 */
-//	private final DebugLazyLoad debugLazyLoad;
-//
-//	private final MAdminLoggingMBean logControl;
-//
-//	public RefreshHelp(MAdminLoggingMBean logControl, boolean debugLazyLoad){
-//		this.logControl = logControl;
-//		this.debugLazyLoad = new DebugLazyLoad(debugLazyLoad);
-//	}
-//
-//	/**
-//	 * Refresh the bean from property values in dbBean.
-//	 */
-//	public void refresh(Object o, Object dbBean, BeanDescriptor<?> desc, EntityBeanIntercept ebi, Object id, boolean isLazyLoad) {
-//
-//		Object originalOldValues = null;
-//		boolean setOriginalOldValues = false;
-//
-//		// set of properties to exclude from the refresh because it is
-//		// not a refresh but rather a lazyLoading event.
-//		Set<String> excludes = null;
-//
-//		// turn off intercepting so lazy loading is
-//		// not invoked when populating the bean
-//		// with PropertyChangeSupport
-//		ebi.setIntercepting(false);
-//
-//		boolean readOnly = ebi.isReadOnly();
-//		boolean sharedInstance = ebi.isSharedInstance();
-//
-//		if (isLazyLoad){
-//			excludes = ebi.getLoadedProps();
-//			if (excludes != null){
-//				// lazy loading a "Partial Object"... which already
-//				// contains some properties and perhaps some oldValues
-//				// and these will need to be maintained...
-//				originalOldValues = ebi.getOldValues();
-//				setOriginalOldValues = originalOldValues != null;
-//			}
-//
-//			if (logControl.isDebugLazyLoad()){
-//				debug(desc, ebi, id, excludes);
-//			}
-//		}
-//
-//
-//		BeanProperty[] props = desc.propertiesBaseScalar();
-//		for (int i = 0; i < props.length; i++) {
-//			BeanProperty prop = props[i];
-//			if (excludes != null && excludes.contains(prop.getName())){
-//				// ignore this property (partial bean lazy loading)
-//
-//			} else {
-//				Object dbVal = prop.getValue(dbBean);
-//				if (isLazyLoad) {
-//					prop.setValue(o, dbVal);
-//				} else {
-//					prop.setValueIntercept(o, dbVal);
-//				}
-//				if (setOriginalOldValues){
-//					// maintain original oldValues for partially loaded bean
-//					prop.setValue(originalOldValues, dbVal);
-//				}
-//			}
-//		}
-//
-//		BeanPropertyAssocOne<?>[] ones = desc.propertiesOne();
-//		for (int i = 0; i < ones.length; i++) {
-//			BeanProperty prop = ones[i];
-//			if (excludes != null && excludes.contains(prop.getName())){
-//				 // ignore this property (partial bean lazy loading)
-//
-//			} else {
-//				Object dbVal = prop.getValue(dbBean);
-//				if (isLazyLoad){
-//					prop.setValue(o, dbVal);
-//				} else {
-//					prop.setValueIntercept(o, dbVal);
-//				}
-//				if (setOriginalOldValues){
-//					// maintain original oldValues for partially loaded bean
-//					prop.setValue(originalOldValues, dbVal);
-//				}
-//				if (dbVal != null){
-//					if (sharedInstance){
-//						// propagate sharedInstance status to associated beans
-//						((EntityBean)dbVal)._ebean_getIntercept().setSharedInstance();
-//					} else if (readOnly) {
-//						// propagate readOnly status to associated beans
-//						((EntityBean)dbVal)._ebean_getIntercept().setReadOnly(true);
-//					}
-//				}
-//
-//			}
-//		}
-//
-//		refreshEmbedded(o, dbBean, desc, excludes, readOnly);
-//
-//		// set a lazy loading many proxy if required
-//		BeanPropertyAssocMany<?>[] manys = desc.propertiesMany();
-//		for (int i = 0; i < manys.length; i++) {
-//			BeanPropertyAssocMany<?> prop = manys[i];
-//			if (excludes != null && excludes.contains(prop.getName())){
-//				// the many already existed on the bean
-//
-//			} else {
-//				// set a lazy loading proxy
-//				prop.createReference(o, null, readOnly, sharedInstance);
-//			}
-//		}
-//
-//		// the refreshed/lazy loaded bean is always fully
-//		// populated so set loadedProps to null
-//		ebi.setLoadedProps(null);
-//
-//
-//		// reset the loaded status
-//		ebi.setLoaded();
-//	}
-//
-//	/**
-//	 * Refresh the Embedded beans.
-//	 */
-//	private void refreshEmbedded(Object o, Object dbBean, BeanDescriptor<?> desc, Set<String> excludes, boolean propagateReadOnly) {
-//
-//		BeanPropertyAssocOne<?>[] embeds = desc.propertiesEmbedded();
-//		for (int i = 0; i < embeds.length; i++) {
-//			BeanPropertyAssocOne<?> prop = embeds[i];
-//			if (excludes != null && excludes.contains(prop.getName())){
-//				// ignore this property
-//			} else {
-//				// the original embedded bean
-//				Object oEmb = prop.getValue(o);
-//
-//				// the new one from the database
-//				Object dbEmb = prop.getValue(dbBean);
-//
-//				if (oEmb == null){
-//					// original embedded bean was null
-//					// so just replace the entire embedded bean
-//					prop.setValueIntercept(o, dbEmb);
-//					if (propagateReadOnly && dbEmb != null){
-//						// propagate readOnly status to embedded beans
-//						((EntityBean)dbEmb)._ebean_getIntercept().setReadOnly(true);
-//					}
-//
-//				} else {
-//					// refresh each property of the original
-//					// embedded bean
-//					if (oEmb instanceof EntityBean){
-//						// turn off interception to stop invoking lazy loading
-//						// but allow PropertyChangeSupport
-//						((EntityBean) oEmb)._ebean_getIntercept().setIntercepting(false);
-//					}
-//
-//					BeanProperty[] props = prop.getProperties();
-//					for (int j = 0; j < props.length; j++) {
-//						Object v = props[j].getValue(dbEmb);
-//						props[j].setValueIntercept(oEmb, v);
-//					}
-//
-//					// No longer calling setLoaded() on embedded bean
-//					// as the EntityBean itself
-//					// .. calls setEmbeddedLoaded() on each of
-//					// .. its embedded beans itself.
-//				}
-//			}
-//		}
-//	}
-//
-//
-//	/**
-//	 * Output some debug to describe the lazy loading event.
-//	 */
-//	private void debug(BeanDescriptor<?> desc, EntityBeanIntercept ebi, Object id, Set<String> excludes) {
-//
-//
-//		Class<?> beanType = desc.getBeanType();
-//
-//		StackTraceElement cause = debugLazyLoad.getStackTraceElement(beanType);
-//
-//		String lazyLoadProperty = ebi.getLazyLoadProperty();
-//		String msg = "debug.lazyLoad ["+desc+"] id["+id+"] lazyLoadProperty["+lazyLoadProperty+"]";
-//		if (excludes != null){
-//			msg += " partialProps"+excludes;
-//		}
-//		if (cause != null){
-//			String causeLine = cause.toString();
-//			if (causeLine.indexOf(".groovy:") > -1){
-//				// eclipse console does not like finding groovy source at the moment
-//				causeLine = StringHelper.replaceString(causeLine, ".groovy:", ".groovy :");
-//			}
-//			msg += " at: "+causeLine;
-//		}
-//		System.err.println(msg);
-//	}
-//
-//
-//
-
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
index f9a11f14d..7680dd086 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java
@@ -10,10 +10,9 @@ import java.sql.SQLException;
 /**
  * Simple DataSource supplier when no multi-tenancy used.
  */
-class SimpleDataSourceProvider implements DataSourceSupplier {
+final class SimpleDataSourceProvider implements DataSourceSupplier {
 
   private final DataSource dataSource;
-
   private final DataSource readOnlyDataSource;
 
   SimpleDataSourceProvider(DataSource dataSource, DataSource readOnlyDataSource) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
index 6c539e564..e95c0d461 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
@@ -8,7 +8,7 @@ import java.sql.ResultSet;
  *
  * These both must be closed properly when done.
  */
-public class SpiResultSet {
+public final class SpiResultSet {
 
   private final PreparedStatement statement;
 

From cd407ee467ffc18321dc517b4bae8069e1149141 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 16 Aug 2021 23:32:26 +1200
Subject: [PATCH 398/447] #2318 - Refactor internals - final classes in
 changelog packages

---
 .../server/changelog/ChangeJsonBuilder.java    | 18 ++----------------
 .../changelog/DefaultChangeLogListener.java    |  5 ++---
 .../changelog/DefaultChangeLogPrepare.java     |  2 +-
 .../changelog/DefaultChangeLogRegister.java    |  3 +--
 .../changelog/ChangeJsonBuilderTest.java       |  3 +--
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java
index 372de9589..f399b78ad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java
@@ -14,21 +14,14 @@ import java.util.Map;
 /**
  * Builds JSON document for a bean change.
  */
-class ChangeJsonBuilder {
+final class ChangeJsonBuilder {
 
-  protected final JsonFactory jsonFactory = new JsonFactory();
-
-  protected final JsonContext json;
-
-  ChangeJsonBuilder(JsonContext json) {
-    this.json = json;
-  }
+  private final JsonFactory jsonFactory = new JsonFactory();
 
   /**
    * Write the bean change as JSON.
    */
   void writeBeanJson(Writer writer, BeanChange bean, ChangeSet changeSet) throws IOException {
-
     try (JsonGenerator generator = jsonFactory.createGenerator(writer)) {
       writeBeanChange(generator, bean, changeSet);
       generator.flush();
@@ -39,9 +32,7 @@ class ChangeJsonBuilder {
    * Write the bean change as JSON document containing the transaction header details.
    */
   private void writeBeanChange(JsonGenerator gen, BeanChange bean, ChangeSet changeSet) throws IOException {
-
     gen.writeStartObject();
-
     gen.writeNumberField("ts", bean.getEventTime());
     gen.writeStringField("change", bean.getEvent().getCode());
     gen.writeStringField("type", bean.getType());
@@ -49,9 +40,7 @@ class ChangeJsonBuilder {
     if (bean.getTenantId() != null) {
       gen.writeStringField("tenantId", bean.getTenantId().toString());
     }
-
     writeBeanTransactionDetails(gen, changeSet);
-
     writeBeanValues(gen, bean);
     gen.writeEndObject();
   }
@@ -60,7 +49,6 @@ class ChangeJsonBuilder {
    * Denormalise by writing the transaction header details.
    */
   private void writeBeanTransactionDetails(JsonGenerator gen, ChangeSet changeSet) throws IOException {
-
     String source = changeSet.getSource();
     if (source != null) {
       gen.writeStringField("source", source);
@@ -87,12 +75,10 @@ class ChangeJsonBuilder {
    * For insert and update write the new/old values.
    */
   private void writeBeanValues(JsonGenerator gen, BeanChange bean) throws IOException {
-
     if (bean.getEvent() != ChangeType.DELETE) {
       gen.writeFieldName("data");
       gen.writeRaw(":");
       gen.writeRaw(bean.getData());
-
       String oldData = bean.getOldData();
       if (oldData != null) {
         gen.writeRaw(",\"oldData\":");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
index 0168fa222..ee8e75424 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
@@ -15,7 +15,7 @@ import java.util.Properties;
 /**
  * Simply logs the change sets in JSON form to logger named <code>io.ebean.ChangeLog</code>.
  */
-public class DefaultChangeLogListener implements ChangeLogListener, Plugin {
+public final class DefaultChangeLogListener implements ChangeLogListener, Plugin {
 
   /**
    * The usual application specific logger.
@@ -45,8 +45,7 @@ public class DefaultChangeLogListener implements ChangeLogListener, Plugin {
    */
   @Override
   public void configure(SpiServer server) {
-    jsonBuilder = new ChangeJsonBuilder(server.json());
-
+    jsonBuilder = new ChangeJsonBuilder();
     Properties properties = server.getServerConfig().getProperties();
     if (properties != null) {
       String bufferSize = properties.getProperty("ebean.changeLog.bufferSize");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java
index 16af27424..596d4d331 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java
@@ -11,7 +11,7 @@ import io.ebean.event.changelog.ChangeSet;
  * on the changeSet.
  * </p>
  */
-public class DefaultChangeLogPrepare implements ChangeLogPrepare {
+public final class DefaultChangeLogPrepare implements ChangeLogPrepare {
 
   /**
    * Just return true to send change set through to the logger.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java
index a6208a703..d9f962969 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java
@@ -14,10 +14,9 @@ import java.util.Set;
 /**
  * Default implementation of ChangeLogRegister.
  */
-public class DefaultChangeLogRegister implements ChangeLogRegister {
+public final class DefaultChangeLogRegister implements ChangeLogRegister {
 
   private static final BasicFilter INCLUDE_INSERTS = new BasicFilter(true);
-
   private static final BasicFilter EXCLUDE_INSERTS = new BasicFilter(false);
 
   private final boolean defaultInsertsInclude;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java
index f87405087..0e608f3e1 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java
@@ -20,8 +20,7 @@ public class ChangeJsonBuilderTest extends BaseTestCase {
   @Test
   public void testToJson() throws Exception {
 
-    JsonContext jsonContext = Ebean.getDefaultServer().json();
-    ChangeJsonBuilder builder = new ChangeJsonBuilder(jsonContext);
+    ChangeJsonBuilder builder = new ChangeJsonBuilder();
 
     ChangeSet changeSet = helper.createChangeSet("ABCD", 10);
     changeSet.getUserContext().put("altUser", "role user");

From b4f4ef3c1b307926956f8c85e58170506e96ade0 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 18:24:28 +1200
Subject: [PATCH 399/447] #2318 - Refactor internals - final classes in server
 packages

---
 .../server/DContainerFactory.java             |  2 +-
 .../server/loadcontext/DLoadBeanContext.java  |  4 +---
 .../server/loadcontext/DLoadContext.java      | 10 +---------
 .../server/loadcontext/DLoadManyContext.java  |  7 ++-----
 .../server/logger/DLogManager.java            |  2 +-
 .../server/logger/DLoggerFactory.java         |  2 +-
 .../server/logger/DSpiLogger.java             |  2 +-
 .../server/profile/DCountMetric.java          |  3 +--
 .../server/profile/DMetricFactory.java        |  2 +-
 .../server/profile/DProfileLocation.java      |  1 -
 .../profile/DProfileLocationFactory.java      |  2 +-
 .../server/profile/DQueryPlanMeta.java        |  2 +-
 .../server/profile/DQueryPlanMetric.java      |  2 +-
 .../server/profile/DTimeMetricStats.java      |  3 +--
 .../server/profile/DTimedMetric.java          |  6 +-----
 .../server/profile/DTimedProfileLocation.java |  5 +----
 .../profile/TimedProfileLocationRegistry.java |  2 +-
 .../properties/BeanPropertiesReader.java      |  1 -
 .../properties/EnhanceBeanPropertyAccess.java | 19 ++++++++----------
 .../ebeaninternal/server/rawsql/DRawSql.java  |  4 +---
 .../server/rawsql/DRawSqlBuilder.java         |  4 +---
 .../server/rawsql/DRawSqlColumnsParser.java   |  1 -
 .../server/rawsql/DRawSqlParser.java          |  7 +------
 .../server/rawsql/DRawSqlService.java         |  6 +-----
 .../server/text/json/DJsonBeanReader.java     |  3 +--
 .../server/text/json/DJsonContext.java        |  6 +-----
 .../server/text/json/DJsonScalar.java         |  3 +--
 .../server/text/json/PathStack.java           |  4 +---
 .../server/text/json/ReadJson.java            | 20 +------------------
 .../server/text/json/WriteJson.java           |  9 +--------
 .../ebeaninternal/server/util/ArrayStack.java |  4 +---
 .../server/util/BindParamsParser.java         |  6 +-----
 .../server/util/DSelectColumnsParser.java     |  2 --
 .../io/ebeaninternal/server/util/Str.java     |  2 +-
 .../ebeaninternal/util/ParamTypeHelper.java   | 11 ++--------
 .../io/ebeaninternal/util/SortByClause.java   |  6 +-----
 .../java/io/ebeaninternal/util/UrlHelper.java |  3 +--
 .../java/io/ebeaninternal/util/ValueUtil.java |  2 +-
 .../docstore/none/NoneDocStore.java           |  2 +-
 .../none/NoneDocStoreBeanAdapter.java         |  2 +-
 .../docstore/none/NoneDocStoreFactory.java    |  4 ++--
 .../none/NoneDocStoreUpdateProcessor.java     |  2 +-
 42 files changed, 48 insertions(+), 142 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/DContainerFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/DContainerFactory.java
index ea9f0b109..77d0a1f72 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/DContainerFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/DContainerFactory.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.DefaultContainer;
 /**
  * Default container factory found via service loader.
  */
-public class DContainerFactory implements SpiContainerFactory {
+public final class DContainerFactory implements SpiContainerFactory {
 
   @Override
   public SpiContainer create(ContainerConfig containerConfig) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
index 25fffe5b7..ac871e5eb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java
@@ -23,12 +23,10 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * ToOne bean load context.
  */
-class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
+final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
   private final boolean cache;
-
   private List<LoadBuffer> bufferList;
-
   private LoadBuffer currentBuffer;
 
   DLoadBeanContext(DLoadContext parent, BeanDescriptor<?> desc, String path, OrmQueryProperties queryProps) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
index 060633073..a7ec0e0c8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java
@@ -31,17 +31,13 @@ import java.util.Map;
 /**
  * Default implementation of LoadContext.
  */
-public class DLoadContext implements LoadContext {
+public final class DLoadContext implements LoadContext {
 
   private final SpiEbeanServer ebeanServer;
-
   private final BeanDescriptor<?> rootDescriptor;
-
   private final Map<String, DLoadBeanContext> beanMap = new HashMap<>();
   private final Map<String, DLoadManyContext> manyMap = new HashMap<>();
-
   private final DLoadBeanContext rootBeanContext;
-
   private final boolean asDraft;
   private final Timestamp asOf;
   private final Boolean readOnly;
@@ -60,13 +56,9 @@ public class DLoadContext implements LoadContext {
   private final String planLabel;
   private final ProfileLocation profileLocation;
   private final ProfilingListener profilingListener;
-
   private final Map<String, ObjectGraphNode> nodePathMap = new HashMap<>();
-
   private PersistenceContext persistenceContext;
-
   private List<OrmQueryProperties> secQuery;
-
   private Object tenantId;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
index 5d2b781c7..b830dc96d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java
@@ -21,14 +21,11 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * ToMany bean load context.
  */
-class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
-
-  protected final BeanPropertyAssocMany<?> property;
+final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
 
+  private final BeanPropertyAssocMany<?> property;
   private final boolean docStoreMapped;
-
   private List<LoadBuffer> bufferList;
-
   private LoadBuffer currentBuffer;
 
   DLoadManyContext(DLoadContext parent, BeanPropertyAssocMany<?> property, String path, OrmQueryProperties queryProps) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLogManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLogManager.java
index 79ece19fc..31c42f2fd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLogManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLogManager.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.logger;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.api.SpiLogger;
 
-public class DLogManager implements SpiLogManager {
+public final class DLogManager implements SpiLogManager {
 
   private final SpiLogger sql;
   private final SpiLogger summary;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
index 65dbef013..90f6cbafa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Default SpiLoggerFactory implementation.
  */
-public class DLoggerFactory implements SpiLoggerFactory {
+public final class DLoggerFactory implements SpiLoggerFactory {
 
   /**
    * Just use a standard slf4j Logger.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
index 87b78052f..e921d5aa3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.logger;
 import io.ebeaninternal.api.SpiLogger;
 import org.slf4j.Logger;
 
-public class DSpiLogger implements SpiLogger {
+public final class DSpiLogger implements SpiLogger {
 
   private final Logger logger;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
index d93e0dbdb..693aa5de8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
@@ -9,10 +9,9 @@ import java.util.concurrent.atomic.LongAdder;
 /**
  * Used to collect counter metrics.
  */
-class DCountMetric implements CountMetric {
+final class DCountMetric implements CountMetric {
 
   private final String name;
-
   private final LongAdder count = new LongAdder();
 
   DCountMetric(String name) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
index 633c4c505..d51ff2198 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
@@ -10,7 +10,7 @@ import io.ebean.metric.TimedMetricMap;
 /**
  * Default metric factory implementation.
  */
-public class DMetricFactory implements MetricFactory {
+public final class DMetricFactory implements MetricFactory {
 
   @Override
   public TimedMetricMap createTimedMetricMap(String name) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
index 63fa0e11a..df4c44c56 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
@@ -13,7 +13,6 @@ class DProfileLocation implements ProfileLocation {
   private String fullLocation;
   private String location;
   private String label;
-
   private final int lineNumber;
   private int traceCount;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
index ebf5e78c0..cc6e19bd3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
@@ -8,7 +8,7 @@ import io.ebean.service.SpiProfileLocationFactory;
 /**
  * Default implementation of the profile location factory.
  */
-public class DProfileLocationFactory implements SpiProfileLocationFactory {
+public final class DProfileLocationFactory implements SpiProfileLocationFactory {
 
   @Override
   public ProfileLocation create() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
index 67f724051..879d2ee6c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.profile;
 import io.ebean.ProfileLocation;
 import io.ebeaninternal.server.util.Md5;
 
-class DQueryPlanMeta {
+final class DQueryPlanMeta {
 
   private final Class<?> type;
   private final String label;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index e24da73c7..723c24511 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -6,7 +6,7 @@ import io.ebean.metric.QueryPlanMetric;
 import io.ebean.metric.TimedMetric;
 import io.ebean.metric.TimedMetricStats;
 
-class DQueryPlanMetric implements QueryPlanMetric {
+final class DQueryPlanMetric implements QueryPlanMetric {
 
   private final DQueryPlanMeta meta;
   private final DTimedMetric metric;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index a4243e31a..900f47aae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -5,13 +5,12 @@ import io.ebean.metric.TimedMetricStats;
 /**
  * Snapshot of the current statistics for a Counter or TimeCounter.
  */
-class DTimeMetricStats implements TimedMetricStats {
+final class DTimeMetricStats implements TimedMetricStats {
 
   private final boolean collected;
   private final long count;
   private final long total;
   private final long max;
-
   private String name;
   private String location;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index cc344c3e6..a62fef911 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -12,16 +12,12 @@ import java.util.concurrent.atomic.LongAdder;
  * It is intended for high concurrent updates to the statistics and relatively infrequent reads.
  * </p>
  */
-class DTimedMetric implements TimedMetric {
+final class DTimedMetric implements TimedMetric {
 
   private final String name;
-
   private final LongAdder count = new LongAdder();
-
   private final LongAdder total = new LongAdder();
-
   private final LongAccumulator max = new LongAccumulator(Math::max, Long.MIN_VALUE);
-
   private boolean collected;
 
   DTimedMetric(String name) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
index 27537737f..2164f86c7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
@@ -7,14 +7,11 @@ import io.ebean.metric.TimedMetricStats;
 /**
  * Default profile location that uses stack trace.
  */
-class DTimedProfileLocation extends DProfileLocation implements TimedProfileLocation {
+final class DTimedProfileLocation extends DProfileLocation implements TimedProfileLocation {
 
   private final String label;
-
   private final TimedMetric timedMetric;
-
   private final boolean overrideMetricName;
-
   private String fullName;
 
   DTimedProfileLocation(int lineNumber, String label, TimedMetric timedMetric) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java
index 1a5f8ff07..350dd6688 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocationRegistry.java
@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * Global registry of the TimedProfileLocation instances created.
  */
-public class TimedProfileLocationRegistry {
+public final class TimedProfileLocationRegistry {
 
   private static final List<TimedProfileLocation> list = Collections.synchronizedList(new ArrayList<>());
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java
index a283a42ea..ec56da19d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java
@@ -37,7 +37,6 @@ public final class BeanPropertiesReader {
     try {
       Field field = clazz.getField("_ebean_props");
       return (String[]) field.get(null);
-
     } catch (Exception e) {
       throw new IllegalStateException("Error getting _ebean_props field on type " + clazz, e);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java b/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java
index e4d9e9839..e7e48b6f0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java
@@ -9,23 +9,20 @@ public final class EnhanceBeanPropertyAccess implements BeanPropertyAccess {
 
   private static final int CACHE_SIZE = 30;
 
-  private final BeanPropertyGetter[] getters = initGetters(CACHE_SIZE);
-  private final BeanPropertySetter[] setters = initSetters(CACHE_SIZE);
+  private final BeanPropertyGetter[] getters = initGetters();
+  private final BeanPropertySetter[] setters = initSetters();
 
-  public EnhanceBeanPropertyAccess() {
-  }
-
-  private BeanPropertyGetter[] initGetters(int count) {
-    BeanPropertyGetter[] getters = new BeanPropertyGetter[count];
-    for (int i = 0; i < count; i++) {
+  private BeanPropertyGetter[] initGetters() {
+    BeanPropertyGetter[] getters = new BeanPropertyGetter[CACHE_SIZE];
+    for (int i = 0; i < CACHE_SIZE; i++) {
       getters[i] = new Getter(i);
     }
     return getters;
   }
 
-  private BeanPropertySetter[] initSetters(int count) {
-    BeanPropertySetter[] setters = new BeanPropertySetter[count];
-    for (int i = 0; i < count; i++) {
+  private BeanPropertySetter[] initSetters() {
+    BeanPropertySetter[] setters = new BeanPropertySetter[CACHE_SIZE];
+    for (int i = 0; i < CACHE_SIZE; i++) {
       setters[i] = new Setter(i);
     }
     return setters;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSql.java
index 9f7e6627d..c58b8bc11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSql.java
@@ -8,9 +8,7 @@ import java.sql.ResultSet;
 public final class DRawSql implements SpiRawSql {
 
   private final ResultSet resultSet;
-
   private final Sql sql;
-
   private final ColumnMapping columnMapping;
 
   /**
@@ -22,7 +20,7 @@ public final class DRawSql implements SpiRawSql {
     this.columnMapping = new ColumnMapping(propertyNames);
   }
 
-  protected DRawSql(ResultSet resultSet, Sql sql, ColumnMapping columnMapping) {
+  DRawSql(ResultSet resultSet, Sql sql, ColumnMapping columnMapping) {
     this.resultSet = resultSet;
     this.sql = sql;
     this.columnMapping = columnMapping;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlBuilder.java
index 40160e873..a42c8035d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlBuilder.java
@@ -5,12 +5,10 @@ import io.ebean.RawSqlBuilder;
 
 import java.sql.ResultSet;
 
-public class DRawSqlBuilder implements RawSqlBuilder {
+public final class DRawSqlBuilder implements RawSqlBuilder {
 
   private final ResultSet resultSet;
-
   private final SpiRawSql.Sql sql;
-
   private final SpiRawSql.ColumnMapping columnMapping;
 
   DRawSqlBuilder(SpiRawSql.Sql sql, SpiRawSql.ColumnMapping columnMapping) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
index 74c02badd..48e61789b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
@@ -17,7 +17,6 @@ final class DRawSqlColumnsParser {
   private static final Pattern COLINFO_SPLIT = Pattern.compile("\\s(?=[^\\)]*(?:\\(|$))");
 
   private final String sqlSelect;
-
   private int indexPos;
 
   public static ColumnMapping parse(String sqlSelect) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
index 0e46cbe10..033aa0755 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java
@@ -7,20 +7,15 @@ import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
  * Parses sql-select queries to try and determine the location where WHERE and
  * HAVING clauses can be added dynamically to the sql.
  */
-class DRawSqlParser {
+final class DRawSqlParser {
 
   private static final String $_AND_HAVING = "${andHaving}";
-
   private static final String $_HAVING = "${having}";
-
   private static final String $_AND_WHERE = "${andWhere}";
-
   private static final String $_WHERE = "${where}";
 
   private final SimpleTextParser textParser;
-
   private String sql;
-
   private int placeHolderWhere;
   private int placeHolderAndWhere;
   private int placeHolderHaving;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index 5a405dbc4..11b80da38 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -11,7 +11,7 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 
-public class DRawSqlService implements SpiRawSqlService {
+final class DRawSqlService implements SpiRawSqlService {
 
   @Override
   public RawSql resultSet(ResultSet resultSet, String... propertyNames) {
@@ -20,10 +20,8 @@ public class DRawSqlService implements SpiRawSqlService {
 
   @Override
   public RawSqlBuilder parsed(String sql) {
-
     SpiRawSql.Sql sql2 = DRawSqlParser.parse(sql);
     String select = sql2.getPreFrom();
-
     SpiRawSql.ColumnMapping mapping = DRawSqlColumnsParser.parse(select);
     return new DRawSqlBuilder(sql2, mapping);
   }
@@ -36,7 +34,6 @@ public class DRawSqlService implements SpiRawSqlService {
 
   @Override
   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, binaryOptimizedUUID);
@@ -77,7 +74,6 @@ public class DRawSqlService implements SpiRawSqlService {
    * 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(".");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
index ecfa3af8c..8193d397c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
@@ -15,10 +15,9 @@ import java.io.IOException;
  * This is used such that a load context and persistence context can be used to span multiple marshalling requests.
  * </p>
  */
-public class DJsonBeanReader<T> implements JsonBeanReader<T> {
+public final class DJsonBeanReader<T> implements JsonBeanReader<T> {
 
   private final BeanDescriptor<T> desc;
-
   private final SpiJsonReader readJson;
 
   public DJsonBeanReader(BeanDescriptor<T> desc, SpiJsonReader readJson) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
index 6a94bd31d..b0706173c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
@@ -43,18 +43,14 @@ import java.util.Set;
 /**
  * Default implementation of JsonContext.
  */
-public class DJsonContext implements SpiJsonContext {
+public final class DJsonContext implements SpiJsonContext {
 
   private static final PrettyPrinter PRETTY_PRINTER = new Pretty();
 
   private final SpiEbeanServer server;
-
   private final JsonFactory jsonFactory;
-
   private final Object defaultObjectMapper;
-
   private final JsonConfig.Include defaultInclude;
-
   private final DJsonScalar jsonScalar;
 
   private static class Pretty extends DefaultPrettyPrinter {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
index fed4c5945..d0ef82204 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Default implementation of JsonScalar.
  */
-public class DJsonScalar {
+public final class DJsonScalar {
 
   private final TypeManager typeManager;
 
@@ -20,7 +20,6 @@ public class DJsonScalar {
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public void write(JsonGenerator gen, Object value) throws IOException {
-
     if (value instanceof String) {
       gen.writeString((String) value);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java
index 7da49f6ad..6cb3b2b67 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java
@@ -2,10 +2,9 @@ package io.ebeaninternal.server.text.json;
 
 import io.ebeaninternal.server.util.ArrayStack;
 
-public class PathStack extends ArrayStack<String> {
+public final class PathStack extends ArrayStack<String> {
 
   public String peekFullPath(String key) {
-
     String prefix = peekWithNull();
     if (prefix != null) {
       return prefix + "." + key;
@@ -15,7 +14,6 @@ public class PathStack extends ArrayStack<String> {
   }
 
   public void pushPathKey(String key) {
-
     String prefix = peekWithNull();
     if (prefix != null) {
       key = prefix + "." + key;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
index 74c85a770..f685188b6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
@@ -20,42 +20,28 @@ import java.util.Map;
 /**
  * Context for JSON read processing.
  */
-public class ReadJson implements SpiJsonReader {
+public final class ReadJson implements SpiJsonReader {
 
   private final BeanDescriptor<?> rootDesc;
-
-  /**
-   * Jackson parser.
-   */
   private final JsonParser parser;
-
-  /**
-   * Stack of the path - used to find the appropriate JsonReadBeanVisitor.
-   */
   private final PathStack pathStack;
-
   /**
    * Map of the JsonReadBeanVisitor keyed by path.
    */
   private final Map<String, JsonReadBeanVisitor<?>> visitorMap;
-
   private final Object objectMapper;
-
   private final PersistenceContext persistenceContext;
-
   private final LoadContext loadContext;
 
   /**
    * Construct with parser and readOptions.
    */
   public ReadJson(BeanDescriptor<?> desc, JsonParser parser, JsonReadOptions readOptions, Object objectMapper) {
-
     this.rootDesc = desc;
     this.parser = parser;
     this.objectMapper = objectMapper;
     this.persistenceContext = initPersistenceContext(readOptions);
     this.loadContext = initLoadContext(desc, readOptions);
-
     // only create visitorMap, pathStack if needed ...
     this.visitorMap = (readOptions == null) ? null : readOptions.getVisitorMap();
     this.pathStack = (visitorMap == null && loadContext == null) ? null : new PathStack();
@@ -119,7 +105,6 @@ public class ReadJson implements SpiJsonReader {
    */
   @Override
   public <T> void persistenceContextPut(Object beanId, T currentBean) {
-
     persistenceContextPutIfAbsent(beanId, (EntityBean) currentBean, rootDesc);
   }
 
@@ -129,16 +114,13 @@ public class ReadJson implements SpiJsonReader {
    */
   @Override
   public Object persistenceContextPutIfAbsent(Object id, EntityBean bean, BeanDescriptor<?> beanDesc) {
-
     if (persistenceContext == null) {
       // no persistenceContext means no lazy loading either
       return null;
     }
-
     Object existing = beanDesc.contextPutIfAbsent(persistenceContext, id, bean);
     if (existing != null) {
       beanDesc.merge(bean, (EntityBean) existing);
-
     } else {
       if (loadContext != null) {
         EntityBeanIntercept ebi = bean._ebean_getIntercept();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
index d7914f587..4ae521e16 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
@@ -21,22 +21,15 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-public class WriteJson implements SpiJsonWriter {
+public final class WriteJson implements SpiJsonWriter {
 
   private final SpiEbeanServer server;
-
   private final JsonGenerator generator;
-
   private final FetchPath fetchPath;
-
   private final Map<String, JsonWriteBeanVisitor<?>> visitors;
-
   private final PathStack pathStack;
-
   private final ArrayStack<Object> parentBeans;
-
   private final Object objectMapper;
-
   private final JsonConfig.Include include;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java
index 9e1107ee5..8e824f664 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java
@@ -6,10 +6,8 @@ import java.util.List;
 
 /**
  * Stack based on ArrayList.
- *
- * @author rbygrave
  */
-public class ArrayStack<E> {
+public final class ArrayStack<E> {
 
   private final List<E> list;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
index c7ae703d5..b28f6b80f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
@@ -15,19 +15,16 @@ import java.util.Collection;
  * This is a thread safe implementation.
  * </p>
  */
-public class BindParamsParser {
+public final class BindParamsParser {
 
   private static final String ENCRYPTKEY_PREFIX = "encryptkey_";
   private static final String ENCRYPTKEY_GAP = "___";
-
   private static final int ENCRYPTKEY_PREFIX_LEN = ENCRYPTKEY_PREFIX.length();
   private static final int ENCRYPTKEY_GAP_LEN = ENCRYPTKEY_GAP.length();
-
   /**
    * Used to parse sql looking for named parameters.
    */
   private static final String quote = "'";
-
   /**
    * Used to parse sql looking for named parameters.
    */
@@ -35,7 +32,6 @@ public class BindParamsParser {
 
   private final BindParams params;
   private final String sql;
-
   private final BeanDescriptor<?> beanDescriptor;
 
   public static String parse(BindParams params, String sql) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
index b4ec33a67..9ec13815b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/DSelectColumnsParser.java
@@ -9,9 +9,7 @@ import java.util.Set;
 public final class DSelectColumnsParser {
 
   private final int end;
-
   private final String selectClause;
-
   private int pos;
 
   public static Set<String> parse(String sqlSelect) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/Str.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/Str.java
index 56788dc98..c49032c86 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/Str.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/Str.java
@@ -5,7 +5,7 @@ package io.ebeaninternal.server.util;
  * <p>
  * Predicts a decent buffer size to append the strings into.
  */
-public class Str {
+public final class Str {
 
   /**
    * Append strings together.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java b/ebean-core/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java
index 85de3d4d5..68f8de4a4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java
@@ -6,13 +6,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class ParamTypeHelper {
+public final class ParamTypeHelper {
 
   public enum ManyType {
     LIST, SET, MAP, NONE
   }
 
-  public static class TypeInfo {
+  public static final class TypeInfo {
 
     private final ManyType manyType;
     private final Class<?> beanType;
@@ -46,11 +46,9 @@ public class ParamTypeHelper {
   }
 
   public static TypeInfo getTypeInfo(Type genericType) {
-
     if (genericType instanceof ParameterizedType) {
       return getParamTypeInfo((ParameterizedType) genericType);
     }
-
     Class<?> entityType = getBeanType(genericType);
     if (entityType != null) {
       return new TypeInfo(ManyType.NONE, entityType);
@@ -62,16 +60,12 @@ public class ParamTypeHelper {
    * For Lists Sets and Maps of beans.
    */
   private static TypeInfo getParamTypeInfo(ParameterizedType paramType) {
-
     Type rawType = paramType.getRawType();
-
     ManyType manyType = getManyType(rawType);
     if (ManyType.NONE == manyType) {
       return null;
     }
-
     Type[] typeArguments = paramType.getActualTypeArguments();
-
     if (typeArguments.length == 1) {
       Type argType = typeArguments[0];
       Class<?> beanType = getBeanType(argType);
@@ -79,7 +73,6 @@ public class ParamTypeHelper {
         return new TypeInfo(manyType, beanType);
       }
     }
-
     return null;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/util/SortByClause.java b/ebean-core/src/main/java/io/ebeaninternal/util/SortByClause.java
index 02884990e..764e67b8a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/util/SortByClause.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/util/SortByClause.java
@@ -10,23 +10,19 @@ import java.util.List;
  * Primarily used to support sorting of Lists.
  * </p>
  */
-public class SortByClause {
+public final class SortByClause {
 
   static final String NULLSHIGH = "nullshigh";
-
   static final String NULLSLOW = "nullslow";
-
   /**
    * The ascending keyword.
    */
   static final String ASC = "asc";
-
   /**
    * The descending keyword.
    */
   static final String DESC = "desc";
 
-
   private final List<Property> properties = new ArrayList<>();
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/util/UrlHelper.java b/ebean-core/src/main/java/io/ebeaninternal/util/UrlHelper.java
index 443273c6b..0779908c9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/util/UrlHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/util/UrlHelper.java
@@ -8,13 +8,12 @@ import java.net.URLConnection;
 /**
  * Helper to open URL content without file descriptor caching (by underlying JDK JarURLConnection).
  */
-public class UrlHelper {
+public final 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/ebean-core/src/main/java/io/ebeaninternal/util/ValueUtil.java b/ebean-core/src/main/java/io/ebeaninternal/util/ValueUtil.java
index a93da76cf..2cf7f73ba 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/util/ValueUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/util/ValueUtil.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.util;
 import java.math.BigDecimal;
 import java.net.URL;
 
-public class ValueUtil {
+public final class ValueUtil {
 
   /**
    * Helper method to check if two objects are equal.
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java
index a7dda71d4..d4932791e 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java
@@ -16,7 +16,7 @@ import java.util.function.Predicate;
 /**
  * DocumentStore that barfs it is used.
  */
-public class NoneDocStore implements DocumentStore {
+public final class NoneDocStore implements DocumentStore {
 
   public static IllegalStateException implementationNotInClassPath() {
     throw new IllegalStateException("DocStore implementation not included in the classPath. You need to add the maven dependency for io.ebean:ebean-elastic");
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java
index d187af169..2be5d1c13 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java
@@ -12,7 +12,7 @@ import java.io.IOException;
 /**
  * DocStoreBeanBaseAdapter that barfs if it is used.
  */
-public class NoneDocStoreBeanAdapter<T> extends DocStoreBeanBaseAdapter<T> {
+public final class NoneDocStoreBeanAdapter<T> extends DocStoreBeanBaseAdapter<T> {
 
   public NoneDocStoreBeanAdapter(BeanDescriptor<T> desc, DeployBeanDescriptor<T> deploy) {
     super(desc, deploy);
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreFactory.java b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreFactory.java
index 7a9d18568..8f0244cb5 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreFactory.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreFactory.java
@@ -12,7 +12,7 @@ import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 /**
  * A stub implementation of DocStoreFactory that will barf if the docStore features are used.
  */
-public class NoneDocStoreFactory implements DocStoreFactory {
+public final class NoneDocStoreFactory implements DocStoreFactory {
 
   @Override
   public DocStoreIntegration create(SpiServer server) {
@@ -24,7 +24,7 @@ public class NoneDocStoreFactory implements DocStoreFactory {
     return new NoneDocStoreBeanAdapter<>(desc, deploy);
   }
 
-  static class NoneIntegration implements DocStoreIntegration {
+  static final class NoneIntegration implements DocStoreIntegration {
 
     @Override
     public DocStoreUpdateProcessor updateProcessor() {
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java
index c5c3d7854..b6a642718 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 /**
  * DocStoreUpdateProcessor that barfs if it is used.
  */
-class NoneDocStoreUpdateProcessor implements DocStoreUpdateProcessor {
+final class NoneDocStoreUpdateProcessor implements DocStoreUpdateProcessor {
 
   @Override
   public <T> DocStoreQueryUpdate<T> createQueryUpdate(BeanType<T> beanType, int bulkBatchSize) throws IOException {

From 16a05528b76a3e1c96d8449e2c1f40c23a062160 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 19:00:55 +1200
Subject: [PATCH 400/447] #2318 - Refactor internals - final classes in deploy
 packages etc

---
 .../deploy/AssocOneHelpRefExported.java       |  2 +-
 .../server/deploy/AssocOneHelpRefInherit.java |  2 +-
 .../server/deploy/AssocOneHelpRefSimple.java  |  2 +-
 .../server/deploy/BeanCascadeInfo.java        |  2 +-
 .../server/deploy/BeanChangeJson.java         |  5 +---
 .../deploy/BeanCollectionHelpFactory.java     |  7 ++----
 .../server/deploy/BeanCollectionUtil.java     |  3 +--
 .../server/deploy/BeanDescriptorJsonHelp.java | 14 +----------
 .../server/deploy/BeanDescriptorManager.java  |  2 +-
 .../server/deploy/BeanEmbeddedMeta.java       |  3 +--
 .../deploy/BeanEmbeddedMetaFactory.java       |  2 +-
 .../server/deploy/BeanFinderManager.java      |  2 +-
 .../server/deploy/BeanFkeyProperty.java       |  1 -
 .../server/deploy/BeanIudMetrics.java         |  3 +--
 .../deploy/BeanLifecycleAdapterFactory.java   | 16 +++++--------
 .../server/deploy/BeanListHelpElement.java    |  2 +-
 .../server/deploy/BeanManager.java            |  3 +--
 .../server/deploy/BeanManagerFactory.java     |  2 +-
 .../server/deploy/BeanMapHelpElement.java     |  2 +-
 .../server/deploy/BeanMapQueryHelp.java       |  2 +-
 .../server/deploy/BeanNaturalKey.java         |  2 +-
 .../server/deploy/BeanPropertyIdClass.java    |  2 +-
 .../deploy/BeanPropertyOrderColumn.java       |  2 +-
 .../server/deploy/BeanPropertyOverride.java   |  2 +-
 .../deploy/BeanPropertySimpleCollection.java  |  2 +-
 .../deploy/BeanQueryAdapterManager.java       |  2 +-
 .../server/deploy/BeanSetHelpElement.java     |  2 +-
 .../server/deploy/BeanTable.java              |  8 +------
 .../deploy/ChainedBeanPersistController.java  |  2 +-
 .../deploy/ChainedBeanPersistListener.java    |  3 +--
 .../ChainedBeanPostConstructListener.java     |  3 +--
 .../server/deploy/ChainedBeanPostLoad.java    |  3 +--
 .../deploy/ChainedBeanQueryAdapter.java       |  3 +--
 .../server/deploy/DCacheControl.java          |  2 +-
 .../server/deploy/DCacheControlNone.java      |  2 +-
 .../server/deploy/DCacheRegion.java           |  2 +-
 .../server/deploy/DCacheRegionNone.java       |  2 +-
 .../server/deploy/DbMigrationInfo.java        |  2 +-
 .../deploy/DeployDocPropertyOptions.java      |  5 +---
 .../server/deploy/DetermineAggPath.java       |  2 +-
 .../server/deploy/DetermineManyType.java      |  5 +---
 .../DynamicPropertyAggregationFormulaMTO.java |  2 +-
 .../server/deploy/ElementEntityBean.java      |  4 +---
 .../server/deploy/ElementHelpList.java        |  2 +-
 .../server/deploy/ElementHelpMap.java         |  2 +-
 .../server/deploy/ElementHelpSet.java         |  2 +-
 .../server/deploy/ExportedProperty.java       |  4 +---
 .../server/deploy/IdentityMode.java           |  2 +-
 .../server/deploy/IndexDefinition.java        |  2 +-
 .../server/deploy/InheritInfo.java            | 24 +------------------
 .../server/deploy/IntersectionBuilder.java    |  2 +-
 .../server/deploy/IntersectionRow.java        |  5 +---
 .../server/deploy/IntersectionTable.java      |  2 +-
 .../server/deploy/PartitionMeta.java          |  3 +--
 .../deploy/PersistControllerManager.java      |  2 +-
 .../server/deploy/PersistListenerManager.java |  2 +-
 .../server/deploy/PersistenceContextUtil.java |  2 +-
 .../server/deploy/PostConstructManager.java   |  2 +-
 .../server/deploy/PostLoadManager.java        |  2 +-
 .../server/deploy/PropertyForeignKey.java     |  2 +-
 .../server/deploy/TableJoinColumn.java        |  2 +-
 .../meta/BeanPropertyElementSetter.java       |  2 +-
 .../deploy/meta/DeployBeanEmbedded.java       |  2 +-
 .../deploy/meta/DeployBeanObtainJackson.java  |  2 +-
 .../meta/DeployBeanPropertyAssocOne.java      |  2 +-
 .../deploy/meta/DeployBeanPropertyLists.java  |  2 +-
 .../DeployBeanPropertySimpleCollection.java   |  2 +-
 .../server/deploy/meta/DeployBeanTable.java   |  2 +-
 .../deploy/meta/DeployIdentityMode.java       |  2 +-
 .../server/deploy/meta/DeployOrderColumn.java |  2 +-
 .../server/deploy/meta/DeployTableJoin.java   |  8 +++----
 .../deploy/meta/DeployTableJoinColumn.java    |  2 +-
 .../deploy/parse/AnnotationAssocManys.java    |  2 +-
 .../deploy/parse/AnnotationAssocOnes.java     |  2 +-
 .../server/deploy/parse/AnnotationClass.java  |  2 +-
 .../server/deploy/parse/AnnotationFields.java |  2 +-
 .../server/deploy/parse/AnnotationFind.java   |  2 +-
 .../server/deploy/parse/AnnotationSql.java    |  2 +-
 .../server/deploy/parse/DeployBeanInfo.java   |  2 +-
 .../deploy/parse/DeployCreateProperties.java  |  2 +-
 .../server/deploy/parse/DeployInherit.java    |  2 +-
 .../deploy/parse/DeployInheritInfo.java       |  2 +-
 .../server/deploy/parse/DeployUtil.java       |  2 +-
 .../parse/InitMetaJacksonAnnotation.java      |  2 +-
 .../deploy/parse/ReadAnnotationConfig.java    |  2 +-
 .../server/deploy/parse/ReadAnnotations.java  |  2 +-
 .../ReadValidationAnnotationsJakarta.java     |  2 +-
 .../parse/ReadValidationAnnotationsJavax.java |  2 +-
 .../deploy/parse/TransientProperties.java     |  8 +------
 .../server/rawsql/DRawSqlService.java         |  2 +-
 .../ebeaninternal/server/util/ArrayStack.java |  2 +-
 .../deploy/parse/AnnotationClassTest.java     |  9 ++++---
 .../model/visitor/VisitAllUsing.java          |  2 +-
 93 files changed, 106 insertions(+), 182 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
index 874231645..0aad172c3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.query.SqlJoinType;
 /**
  * Helper for BeanPropertyAssocOne for OneToOne exported reference - not so common.
  */
-class AssocOneHelpRefExported extends AssocOneHelp {
+final class AssocOneHelpRefExported extends AssocOneHelp {
 
   private final boolean softDelete;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index 1d619507b..7204a2cf1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -9,7 +9,7 @@ import java.sql.SQLException;
 /**
  * Helper for BeanPropertyAssocOne imported reference but with inheritance.
  */
-class AssocOneHelpRefInherit extends AssocOneHelp {
+final class AssocOneHelpRefInherit extends AssocOneHelp {
 
   private final InheritInfo inherit;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
index 967d7d492..cf6b09798 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy;
 /**
  * Helper for BeanPropertyAssocOne imported reference - this is the common case.
  */
-class AssocOneHelpRefSimple extends AssocOneHelp {
+final class AssocOneHelpRefSimple extends AssocOneHelp {
 
   AssocOneHelpRefSimple(BeanPropertyAssocOne<?> property, String embeddedPrefix) {
     super(property, embeddedPrefix);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
index 36b7b2152..c5df36975 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
@@ -8,7 +8,7 @@ import javax.persistence.CascadeType;
  * This is set to associated Beans, Table joins and List.
  * </p>
  */
-public class BeanCascadeInfo {
+public final class BeanCascadeInfo {
 
   private boolean delete;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
index e2a6938ff..2e9b9cc69 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
@@ -11,16 +11,13 @@ import java.io.StringWriter;
 /**
  * Builds the 'new values' and 'old values' in JSON form for ChangeLog.
  */
-class BeanChangeJson implements BeanDiffVisitor {
+final class BeanChangeJson implements BeanDiffVisitor {
 
   private final StringWriter newData;
   private final StringWriter oldData;
-
   private final SpiJsonWriter newJson;
   private final SpiJsonWriter oldJson;
-
   private final ArrayStack<BeanDescriptor<?>> stack = new ArrayStack<>();
-
   private BeanDescriptor<?> descriptor;
 
   BeanChangeJson(BeanDescriptor<?> descriptor, boolean statelessUpdate) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
index a3376cd2e..e46bd2908 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
@@ -9,7 +9,7 @@ import io.ebeaninternal.server.query.CQueryCollectionAdd;
 /**
  * Creates Helpers specific to the type of the property (List Set or Map).
  */
-public class BeanCollectionHelpFactory {
+public final class BeanCollectionHelpFactory {
 
   @SuppressWarnings("rawtypes")
   private static final BeanListHelp LIST_HELP = new BeanListHelp();
@@ -21,7 +21,6 @@ public class BeanCollectionHelpFactory {
    * Create the helper based on the many property.
    */
   public static <T> BeanCollectionHelp<T> create(BeanPropertyAssocMany<T> many) {
-
     boolean elementCollection = many.isElementCollection();
     ManyType manyType = many.getManyType();
     switch (manyType) {
@@ -30,7 +29,7 @@ public class BeanCollectionHelpFactory {
       case SET:
         return elementCollection ? new BeanSetHelpElement<>(many) : new BeanSetHelp<>(many);
       case MAP:
-        return elementCollection ? new BeanMapHelpElement<>(many) :new BeanMapHelp<>(many);
+        return elementCollection ? new BeanMapHelpElement<>(many) : new BeanMapHelp<>(many);
       default:
         throw new RuntimeException("Invalid type " + manyType);
     }
@@ -39,7 +38,6 @@ public class BeanCollectionHelpFactory {
 
   @SuppressWarnings("unchecked")
   public static <T> CQueryCollectionAdd<T> create(SpiQuery.Type manyType, OrmQueryRequest<T> request) {
-
     if (manyType == SpiQuery.Type.LIST) {
       return LIST_HELP;
 
@@ -56,5 +54,4 @@ public class BeanCollectionHelpFactory {
     }
   }
 
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
index e632a729c..e1a0d352c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
@@ -9,7 +9,7 @@ import java.util.Map;
 /**
  * Utility methods for BeanCollections.
  */
-public class BeanCollectionUtil {
+public final class BeanCollectionUtil {
 
   /**
    * Return true if this is a bean collection and not considered dirty.
@@ -66,7 +66,6 @@ public class BeanCollectionUtil {
       // 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();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index 059b368a0..d9b56f215 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -16,10 +16,9 @@ import java.util.Map;
 
 import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
 
-class BeanDescriptorJsonHelp<T> {
+final class BeanDescriptorJsonHelp<T> {
 
   private final BeanDescriptor<T> desc;
-
   private final InheritInfo inheritInfo;
 
   BeanDescriptorJsonHelp(BeanDescriptor<T> desc) {
@@ -28,21 +27,16 @@ class BeanDescriptorJsonHelp<T> {
   }
 
   void jsonWrite(SpiJsonWriter writeJson, EntityBean bean, String key) throws IOException {
-
     writeJson.writeStartObject(key);
-
     if (inheritInfo == null) {
       jsonWriteProperties(writeJson, bean);
-
     } else {
       InheritInfo localInheritInfo = inheritInfo.readType(bean.getClass());
       String discValue = localInheritInfo.getDiscriminatorStringValue();
       String discColumn = localInheritInfo.getDiscriminatorColumn();
       writeJson.gen().writeStringField(discColumn, discValue);
-
       localInheritInfo.desc().jsonWriteProperties(writeJson, bean);
     }
-
     writeJson.writeEndObject();
   }
 
@@ -59,7 +53,6 @@ class BeanDescriptorJsonHelp<T> {
   }
 
   void jsonWriteDirtyProperties(SpiJsonWriter writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException {
-
     writeJson.writeStartObject(null);
     // render the dirty properties
     BeanProperty[] props = desc.propertiesNonTransient();
@@ -73,7 +66,6 @@ class BeanDescriptorJsonHelp<T> {
 
   @SuppressWarnings("unchecked")
   T jsonRead(SpiJsonReader jsonRead, String path, boolean withInheritance) throws IOException {
-
     JsonParser parser = jsonRead.getParser();
     //noinspection StatementWithEmptyBody
     if (parser.getCurrentToken() == JsonToken.START_OBJECT) {
@@ -115,21 +107,17 @@ class BeanDescriptorJsonHelp<T> {
   }
 
   private T jsonReadObject(SpiJsonReader readJson, String path) throws IOException {
-
     EntityBean bean = desc.createEntityBeanForJson();
     return jsonReadProperties(readJson, bean, path);
   }
 
   @SuppressWarnings("unchecked")
   private T jsonReadProperties(SpiJsonReader readJson, EntityBean bean, String path) throws IOException {
-
     if (path != null) {
       readJson.pushPath(path);
     }
-
     // unmapped properties, send to JsonReadBeanVisitor later
     Map<String, Object> unmappedProperties = null;
-
     do {
       JsonParser parser = readJson.getParser();
       JsonToken event = parser.nextToken();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 84b412513..ef1117659 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -86,7 +86,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Creates BeanDescriptors.
  */
-public class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTypeManager {
+public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTypeManager {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanDescriptorManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java
index cac179b62..57aed6cb3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-public class BeanEmbeddedMeta {
-
+public final class BeanEmbeddedMeta {
 
   private final BeanProperty[] properties;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index 5def0dc64..d6ee56491 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -10,7 +10,7 @@ import java.util.Map;
  * Creates BeanProperties for Embedded beans that have deployment information
  * such as the actual DB column name and table alias.
  */
-class BeanEmbeddedMetaFactory {
+final class BeanEmbeddedMetaFactory {
 
   /**
    * Create BeanProperties for embedded beans using the deployment specific DB column name and table alias.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
index a1e916310..bb85c3b76 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * Default implementation for BeanFinderFactory.
  */
-class BeanFinderManager {
+final class BeanFinderManager {
 
   private final Logger logger = LoggerFactory.getLogger(BeanFinderManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
index e651e7fc2..071a0f660 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -16,7 +16,6 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   private final String name;
   private final String dbColumn;
   private final boolean containsMany;
-
   private final int deployOrder;
 
   public BeanFkeyProperty(String name, String dbColumn, int deployOrder) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java
index 889716aa3..64e4deb8f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequest;
 /**
  * Metrics for ORM Insert Update and Delete for a given bean type.
  */
-class BeanIudMetrics {
+final class BeanIudMetrics {
 
   private final TimedMetric insert;
   private final TimedMetric update;
@@ -21,7 +21,6 @@ class BeanIudMetrics {
    * Create for a given bean type.
    */
   BeanIudMetrics(String beanShortName) {
-
     MetricFactory metricFactory = MetricFactory.get();
     String prefix = "iud." + beanShortName;
     this.insert = metricFactory.createTimedMetric(prefix + ".insert");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
index 7a581e1c8..f754c9060 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
@@ -30,7 +30,7 @@ import java.util.List;
  * lifecycle events.
  * </p>
  */
-class BeanLifecycleAdapterFactory {
+final class BeanLifecycleAdapterFactory {
 
   private final boolean postConstructPresent;
 
@@ -42,20 +42,16 @@ class BeanLifecycleAdapterFactory {
    * Register a BeanPersistController for methods annotated with lifecycle events.
    */
   void addLifecycleMethods(DeployBeanDescriptor<?> deployDesc) {
-
     Method[] methods = deployDesc.getBeanType().getMethods();
-
     // look for annotated methods
     MethodsHolder methodHolder = new MethodsHolder();
     for (Method m : methods) {
       methodHolder.checkMethod(m, postConstructPresent);
     }
-
     if (methodHolder.hasPersistMethods()) {
       // has pre/post persist annotated methods
       deployDesc.addPersistController(new PersistAdapter(new PersistMethodsHolder(methodHolder)));
     }
-
     if (!methodHolder.postLoads.isEmpty()) {
       // has postLoad methods
       deployDesc.addPostLoad(new PostLoadAdapter(methodHolder.postLoads));
@@ -69,7 +65,7 @@ class BeanLifecycleAdapterFactory {
   /**
    * Holds Methods for the lifecycle events.s
    */
-  private static class MethodsHolder {
+  private static final class MethodsHolder {
 
     private boolean hasPersistMethods;
     private final List<Method> preInserts = new ArrayList<>();
@@ -162,7 +158,7 @@ class BeanLifecycleAdapterFactory {
   /**
    * Holds Methods for the lifecycle events.s
    */
-  private static class PersistMethodsHolder {
+  private static final class PersistMethodsHolder {
 
     private final Method[] preInserts;
     private final Method[] postInserts;
@@ -188,7 +184,7 @@ class BeanLifecycleAdapterFactory {
   /**
    * BeanPersistAdapter using reflection to invoke lifecycle methods.
    */
-  private static class PersistAdapter extends BeanPersistAdapter {
+  private static final class PersistAdapter extends BeanPersistAdapter {
 
     private final PersistMethodsHolder methodHolder;
 
@@ -264,7 +260,7 @@ class BeanLifecycleAdapterFactory {
   /**
    * BeanPostLoad using reflection to invoke lifecycle methods.
    */
-  private static class PostLoadAdapter implements BeanPostLoad {
+  private static final class PostLoadAdapter implements BeanPostLoad {
 
     private final Method[] postLoadMethods;
 
@@ -297,7 +293,7 @@ class BeanLifecycleAdapterFactory {
   /**
    * PostConstructAdapter using reflection to invoke lifecycle methods.
    */
-  private static class PostConstructAdapter implements BeanPostConstructListener {
+  private static final class PostConstructAdapter implements BeanPostConstructListener {
 
     private final Method[] postConstructMethods;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
index 0e473e4eb..b5f3ae432 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelpElement.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.api.json.SpiJsonWriter;
 /**
  * Helper for element collection List.
  */
-public class BeanListHelpElement<T> extends BeanListHelp<T> {
+public final class BeanListHelpElement<T> extends BeanListHelp<T> {
 
   BeanListHelpElement(BeanPropertyAssocMany<T> many) {
     super(many);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManager.java
index 630c60b4e..d6d605313 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManager.java
@@ -5,10 +5,9 @@ import io.ebeaninternal.server.persist.BeanPersister;
 /**
  * Holds the BeanDescriptor and its associated BeanPersister.
  */
-public class BeanManager<T> {
+public final class BeanManager<T> {
 
   private final BeanPersister persister;
-
   private final BeanDescriptor<T> descriptor;
 
   public BeanManager(BeanDescriptor<T> descriptor, BeanPersister persister) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java
index e80cff573..3f2f61e14 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.persist.dml.DmlBeanPersisterFactory;
 /**
  * Creates BeanManagers.
  */
-class BeanManagerFactory {
+final class BeanManagerFactory {
 
   private final BeanPersisterFactory persisterFactory;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
index 71cdfb3fa..1c6fb7931 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelpElement.java
@@ -5,7 +5,7 @@ import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanMap;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 
-public class BeanMapHelpElement<T> extends BeanMapHelp<T> {
+public final class BeanMapHelpElement<T> extends BeanMapHelp<T> {
 
   BeanMapHelpElement(BeanPropertyAssocMany<T> many) {
     super(many);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java
index e78381b0b..b2e4f0f7d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapQueryHelp.java
@@ -6,7 +6,7 @@ import io.ebean.common.BeanMap;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.query.CQueryCollectionAdd;
 
-class BeanMapQueryHelp<T> implements CQueryCollectionAdd<T> {
+final class BeanMapQueryHelp<T> implements CQueryCollectionAdd<T> {
 
   private final ElPropertyValue elGetValue;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanNaturalKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanNaturalKey.java
index 57f6c2512..3d3ed9866 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanNaturalKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanNaturalKey.java
@@ -6,7 +6,7 @@ import java.util.Set;
 /**
  * Natural key for a bean type.
  */
-public class BeanNaturalKey {
+public final class BeanNaturalKey {
 
   private final String[] naturalKey;
   private final BeanProperty[] props;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
index 45d3614c3..9e0d61684 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 /**
  * Bean property for an IdClass embeddedId.
  */
-public class BeanPropertyIdClass extends BeanPropertyAssocOne {
+public final class BeanPropertyIdClass extends BeanPropertyAssocOne {
 
   @SuppressWarnings("unchecked")
   public BeanPropertyIdClass(BeanDescriptorMap owner, BeanDescriptor descriptor, DeployBeanPropertyAssocOne deploy) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
index 319c8830b..a6ac913b9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
  *
  * The value of which is held on the entity bean intercept.
  */
-public class BeanPropertyOrderColumn extends BeanProperty {
+public final class BeanPropertyOrderColumn extends BeanProperty {
 
   public BeanPropertyOrderColumn(BeanDescriptor<?> descriptor, DeployBeanProperty deploy) {
     super(descriptor, deploy);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java
index d322c5074..fd938d0d2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java
@@ -9,7 +9,7 @@ import io.ebeaninternal.server.core.InternString;
  * Typically this is for Embedded Beans.
  * </p>
  */
-class BeanPropertyOverride {
+final class BeanPropertyOverride {
 
   private final String dbColumn;
   private final boolean dbNullable;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
index d73574379..2fbf41dcc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
 
 import java.io.IOException;
 
-public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
+public final class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
 
   public BeanPropertySimpleCollection(BeanDescriptor<?> descriptor, DeployBeanPropertySimpleCollection<T> deploy) {
     super(descriptor, deploy);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
index 7a50f2deb..2f8f05317 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-class BeanQueryAdapterManager {
+final class BeanQueryAdapterManager {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanQueryAdapterManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
index 94ac9e5a5..2201d69aa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelpElement.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.api.json.SpiJsonWriter;
 /**
  * Helper for element collection List.
  */
-public class BeanSetHelpElement<T> extends BeanSetHelp<T> {
+public final class BeanSetHelpElement<T> extends BeanSetHelp<T> {
 
   BeanSetHelpElement(BeanPropertyAssocMany<T> many) {
     super(many);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index f2cc09e78..3ccdb8218 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -17,19 +17,13 @@ import org.slf4j.LoggerFactory;
  * in a BeanDescriptor.
  * </p>
  */
-public class BeanTable {
+public final class BeanTable {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanTable.class);
 
   private final BeanDescriptorMap owner;
-
   private final Class<?> beanType;
-
-  /**
-   * The base table.
-   */
   private final String baseTable;
-
   private final BeanProperty idProperty;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
index 404336aca..dfb2c302a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
@@ -14,7 +14,7 @@ import java.util.List;
  * <p>
  * Used when multiple BeanPersistController register for the same bean type.
  */
-public class ChainedBeanPersistController implements BeanPersistController {
+public final class ChainedBeanPersistController implements BeanPersistController {
 
   private static final Sorter SORTER = new Sorter();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
index b92aa4ec7..d49380577 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
@@ -9,10 +9,9 @@ import java.util.Set;
 /**
  * Handles multiple BeanPersistListener's for a given entity type.
  */
-public class ChainedBeanPersistListener implements BeanPersistListener {
+public final class ChainedBeanPersistListener implements BeanPersistListener {
 
   private final List<BeanPersistListener> list;
-
   private final BeanPersistListener[] chain;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
index e9ba81c95..c615f8b20 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
@@ -8,10 +8,9 @@ import java.util.List;
 /**
  * Handles multiple BeanPostLoad's for a given entity type.
  */
-public class ChainedBeanPostConstructListener implements BeanPostConstructListener {
+public final class ChainedBeanPostConstructListener implements BeanPostConstructListener {
 
   private final List<BeanPostConstructListener> list;
-
   private final BeanPostConstructListener[] chain;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
index 9da1fdd66..4d7cff8ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
@@ -8,10 +8,9 @@ import java.util.List;
 /**
  * Handles multiple BeanPostLoad's for a given entity type.
  */
-public class ChainedBeanPostLoad implements BeanPostLoad {
+public final class ChainedBeanPostLoad implements BeanPostLoad {
 
   private final List<BeanPostLoad> list;
-
   private final BeanPostLoad[] chain;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
index 15501ef0e..ca67a0746 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
@@ -11,12 +11,11 @@ import java.util.List;
 /**
  * Handles multiple BeanQueryAdapter for a given entity type.
  */
-public class ChainedBeanQueryAdapter implements BeanQueryAdapter {
+public final class ChainedBeanQueryAdapter implements BeanQueryAdapter {
 
   private static final Sorter SORTER = new Sorter();
 
   private final List<BeanQueryAdapter> list;
-
   private final BeanQueryAdapter[] chain;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java
index a99dabf89..a43f9f749 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControl.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiCacheRegion;
 /**
  * Default implementation of SpiCacheControl.
  */
-class DCacheControl implements SpiCacheControl {
+final class DCacheControl implements SpiCacheControl {
 
   private final SpiCacheRegion region;
   private final boolean bean;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java
index 8f4797f47..1101c180b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheControlNone.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.api.SpiCacheControl;
 /**
  * Cache control used when no caching is on the bean type.
  */
-class DCacheControlNone implements SpiCacheControl {
+final class DCacheControlNone implements SpiCacheControl {
 
   static final SpiCacheControl INSTANCE = new DCacheControlNone();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
index 2056833b7..9f1bd5d59 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebeaninternal.api.SpiCacheRegion;
 
-public class DCacheRegion implements SpiCacheRegion {
+public final class DCacheRegion implements SpiCacheRegion {
 
   private boolean enabled = true;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
index ff8dfeb17..c7b20095a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebeaninternal.api.SpiCacheRegion;
 
-class DCacheRegionNone implements SpiCacheRegion {
+final class DCacheRegionNone implements SpiCacheRegion {
 
   static final SpiCacheRegion INSTANCE = new DCacheRegionNone();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
index 630ea953b..e6e4a3eef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
@@ -10,7 +10,7 @@ import io.ebean.annotation.Platform;
  *
  * @author Roland Praml, FOCONIS AG
  */
-public class DbMigrationInfo {
+public final class DbMigrationInfo {
 
   private final List<String> preAdd;
   private final List<String> postAdd;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
index 81d8ea3f8..e6e00b2e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
@@ -8,7 +8,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;
 /**
  * The options for document property collected when reading deployment mapping.
  */
-public class DeployDocPropertyOptions {
+public final class DeployDocPropertyOptions {
 
   private static final DocPropertyOptions EMPTY = new DocPropertyOptions();
 
@@ -24,7 +24,6 @@ public class DeployDocPropertyOptions {
    * Read the DocProperty deployment options.
    */
   public void setDocProperty(DocProperty doc) {
-
     createOptions();
     mapping.apply(doc);
   }
@@ -33,7 +32,6 @@ public class DeployDocPropertyOptions {
    * Read the DocSortable deployment options.
    */
   public void setDocSortable(DocSortable doc) {
-
     createOptions();
     mapping.setSortable(true);
     setStore(doc.store());
@@ -45,7 +43,6 @@ public class DeployDocPropertyOptions {
    * Read the DocCode deployment options.
    */
   public void setDocCode(DocCode doc) {
-
     createOptions();
     mapping.setCode(true);
     setStore(doc.store());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
index c2e576b0c..5790377db 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
-class DetermineAggPath {
+final class DetermineAggPath {
 
   /**
    * Return the many path for the given aggregation formula.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineManyType.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineManyType.java
index cfa560310..fc1859074 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineManyType.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineManyType.java
@@ -7,10 +7,7 @@ import java.util.Set;
 /**
  * Determine the Many Type for a property.
  */
-public class DetermineManyType {
-
-  public DetermineManyType() {
-  }
+public final class DetermineManyType {
 
   public ManyType getManyType(Class<?> type) {
     if (type.equals(List.class)) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
index eb8ba9997..0021d9636 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebeaninternal.server.query.SqlBeanLoad;
 
-public class DynamicPropertyAggregationFormulaMTO extends DynamicPropertyAggregationFormula {
+public final class DynamicPropertyAggregationFormulaMTO extends DynamicPropertyAggregationFormula {
 
   private final BeanPropertyAssocOne prop;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
index 49dfccdc8..2f6566bff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java
@@ -3,14 +3,12 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 
-class ElementEntityBean implements EntityBean {
+final class ElementEntityBean implements EntityBean {
 
   private static final long serialVersionUID = 8742536671024715601L;
 
   private final String[] properties;
-
   private Object[] data;
-
   private final EntityBeanIntercept intercept;
 
   ElementEntityBean(String[] properties) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
index 5c48b4f19..a9e38699e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpList.java
@@ -6,7 +6,7 @@ import io.ebean.common.BeanList;
 import java.util.ArrayList;
 import java.util.List;
 
-class ElementHelpList implements ElementHelp {
+final class ElementHelpList implements ElementHelp {
 
   @Override
   public ElementCollector createCollector() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
index 985ab4248..e00d2ef2f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpMap.java
@@ -6,7 +6,7 @@ import io.ebean.common.BeanMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-class ElementHelpMap implements ElementHelp {
+final class ElementHelpMap implements ElementHelp {
 
   @Override
   public ElementCollector createCollector() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
index 71c15aee3..e15e74e28 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ElementHelpSet.java
@@ -6,7 +6,7 @@ import io.ebean.common.BeanSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-class ElementHelpSet implements ElementHelp {
+final class ElementHelpSet implements ElementHelp {
 
   @Override
   public ElementCollector createCollector() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
index 8c4b789ab..b8ec305a4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
@@ -9,12 +9,10 @@ import io.ebeaninternal.server.core.InternString;
  * Used to for Assoc Manys to create references etc.
  * </p>
  */
-class ExportedProperty {
+final class ExportedProperty {
 
   private final String foreignDbColumn;
-
   private final BeanProperty property;
-
   private final boolean embedded;
 
   ExportedProperty(boolean embedded, String foreignDbColumn, BeanProperty property) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IdentityMode.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IdentityMode.java
index 0bea99393..9ffd2c2e5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IdentityMode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IdentityMode.java
@@ -4,7 +4,7 @@ import io.ebean.annotation.IdentityGenerated;
 import io.ebean.config.dbplatform.IdType;
 import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
 
-public class IdentityMode {
+public final class IdentityMode {
 
   public static IdentityMode NONE = new IdentityMode();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
index 3fec7ecf4..032452574 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
@@ -5,7 +5,7 @@ import io.ebean.annotation.Platform;
 /**
  * Holds multiple column unique constraints defined for an entity.
  */
-public class IndexDefinition {
+public final class IndexDefinition {
 
   private final String[] columns;
   private final String name;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index a8a733a41..1f3e33797 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -17,43 +17,30 @@ import java.util.Set;
 /**
  * Represents a node in the Inheritance tree. Holds information regarding Super Subclass support.
  */
-public class InheritInfo {
+public final class InheritInfo {
 
   private final String discriminatorStringValue;
   private final Object discriminatorValue;
-
   private final String discriminatorColumn;
-
   private final int discriminatorType;
-
   private final int discriminatorLength;
-
   private final String columnDefn;
-
   private final String where;
-
   private final Class<?> type;
-
   private final List<InheritInfo> children = new ArrayList<>();
-
   /**
    * Map of discriminator values to InheritInfo.
    */
   private final HashMap<String, InheritInfo> discMap;
-
   /**
    * Map of class types to InheritInfo (taking into account subclass proxy classes).
    */
   private final HashMap<String, InheritInfo> typeMap;
-
   private final InheritInfo parent;
-
   private final InheritInfo root;
-
   private BeanDescriptor<?> descriptor;
 
   public InheritInfo(InheritInfo r, InheritInfo parent, DeployInheritInfo deploy) {
-
     this.parent = parent;
     this.type = deploy.getType();
     this.discriminatorColumn = InternString.intern(deploy.getColumnName(parent));
@@ -85,7 +72,6 @@ public class InheritInfo {
    * Visit all the children in the inheritance tree.
    */
   public void visitChildren(InheritInfoVisitor visitor) {
-
     for (InheritInfo child : children) {
       visitor.visit(child);
       child.visitChildren(visitor);
@@ -96,7 +82,6 @@ public class InheritInfo {
    * Append check constraint values for the entire inheritance hierarchy.
    */
   public void appendCheckConstraintValues(final String propertyName, final Set<String> checkConstraintValues) {
-
     visitChildren(inheritInfo -> {
       BeanProperty prop = inheritInfo.desc().getBeanProperty(propertyName);
       if (prop != null) {
@@ -190,9 +175,7 @@ public class InheritInfo {
    * Get the bean property additionally looking in the sub types.
    */
   BeanProperty findSubTypeProperty(String propertyName) {
-
     BeanProperty prop;
-
     for (InheritInfo childInfo : children) {
       // recursively search this child bean descriptor
       prop = childInfo.desc().findProperty(propertyName);
@@ -200,7 +183,6 @@ public class InheritInfo {
         return prop;
       }
     }
-
     return null;
   }
 
@@ -208,7 +190,6 @@ public class InheritInfo {
    * Add the local properties for each sub class below this one.
    */
   public void addChildrenProperties(SqlTreeProperties selectProps) {
-
     for (InheritInfo childInfo : children) {
       selectProps.add(childInfo.descriptor.propertiesLocal());
       childInfo.addChildrenProperties(selectProps);
@@ -226,11 +207,9 @@ public class InheritInfo {
    * Return the associated InheritInfo for this discriminator value.
    */
   InheritInfo readType(String discValue) {
-
     if (discValue == null) {
       return null;
     }
-
     InheritInfo typeInfo = root.getType(discValue);
     if (typeInfo == null) {
       throw new PersistenceException("Inheritance type for discriminator value [" + discValue + "] was not found?");
@@ -242,7 +221,6 @@ public class InheritInfo {
    * Return the associated InheritInfo for this bean type.
    */
   public InheritInfo readType(Class<?> beanType) {
-
     InheritInfo typeInfo = root.getTypeByClass(beanType);
     if (typeInfo == null) {
       throw new PersistenceException("Inheritance type for bean type [" + beanType.getName() + "] was not found?");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java
index 764c2c700..bbe133838 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionBuilder.java
@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * Helper to build IntersectionTable.
  */
-public class IntersectionBuilder {
+public final class IntersectionBuilder {
 
   private final String publishTable;
   private final String draftTable;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
index 46d677ad8..3284032bb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java
@@ -12,14 +12,11 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-public class IntersectionRow {
+public final class IntersectionRow {
 
   private final String tableName;
-
   private final BeanDescriptor<?> targetDescriptor;
-
   private final LinkedHashMap<String, Object> values = new LinkedHashMap<>();
-
   private List<Object> excludeIds;
   private BeanDescriptor<?> excludeDescriptor;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java
index 8f10e3a92..1a3553ed4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionTable.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.Database;
 import io.ebean.SqlUpdate;
 
-public class IntersectionTable {
+public final class IntersectionTable {
 
   private final String insertSql;
   private final String deleteSql;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java
index d041ae0a1..f146dc86f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PartitionMeta.java
@@ -2,10 +2,9 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.annotation.PartitionMode;
 
-public class PartitionMeta {
+public final class PartitionMeta {
 
   private final PartitionMode mode;
-
   private String property;
 
   public PartitionMeta(PartitionMode mode, String property) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
index f552fc77f..a6d45a12e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-class PersistControllerManager {
+final class PersistControllerManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PersistControllerManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
index 0e9c261c7..13ca4e7a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
@@ -12,7 +12,7 @@ import java.util.List;
  * Manages the assignment/registration of BeanPersistListener with their
  * respective DeployBeanDescriptor's.
  */
-class PersistListenerManager {
+final class PersistListenerManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PersistListenerManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java
index 69ad243e8..1a1c5651f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java
@@ -5,7 +5,7 @@ import javax.persistence.Entity;
 /**
  * Utility to find the root bean type.
  */
-public class PersistenceContextUtil {
+public final class PersistenceContextUtil {
 
   /**
    * Find and return the root bean type for the given class.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
index 0ef7b7120..6e7bb97c5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-class PostConstructManager {
+final class PostConstructManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PostConstructManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
index 0648d788f..f30826b90 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * Default implementation for creating BeanControllers.
  */
-class PostLoadManager {
+final class PostLoadManager {
 
   private static final Logger logger = LoggerFactory.getLogger(PostLoadManager.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
index 480362e2a..6f66d3ed2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.annotation.ConstraintMode;
 import io.ebean.annotation.DbForeignKey;
 
-public class PropertyForeignKey {
+public final class PropertyForeignKey {
 
   private final boolean noIndex;
   private final boolean noConstraint;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
index a04d72ed6..4878557b2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 /**
  * A join pair of local and foreign properties.
  */
-public class TableJoinColumn {
+public final class TableJoinColumn {
 
   /**
    * The local database column name.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java
index f20ee47cf..c8a362b60 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.properties.BeanPropertySetter;
 /**
  * Setter used for "element beans" with ElementCollection.
  */
-class BeanPropertyElementSetter implements BeanPropertySetter {
+final class BeanPropertyElementSetter implements BeanPropertySetter {
 
   private final int pos;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java
index 72b541cef..ad70b8d30 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java
@@ -10,7 +10,7 @@ import java.util.Map;
  * Typically collects the overridden column names mapped
  * to the Embedded bean.
  */
-public class DeployBeanEmbedded {
+public final class DeployBeanEmbedded {
 
   /**
    * A map of property names to dbColumns.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java
index 20beef7eb..9bbfb6007 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java
@@ -8,7 +8,7 @@ import io.ebean.config.DatabaseConfig;
 /**
  * Used to obtain the Jackson AnnotatedClass for a given bean type utlimately to obtain field level Jackson annotations.
  */
-class DeployBeanObtainJackson<T> {
+final class DeployBeanObtainJackson<T> {
 
   private final DatabaseConfig config;
   private final Class<T> beanType;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index 79f253b86..1444c69de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -7,7 +7,7 @@ import javax.persistence.CascadeType;
 /**
  * Property mapped to a joined bean.
  */
-public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
+public final class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private boolean oneToOne;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 5466d5bca..a6ed9c330 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Helper object to classify BeanProperties into appropriate lists.
  */
-public class DeployBeanPropertyLists {
+public final class DeployBeanPropertyLists {
 
   private static final Logger logger = LoggerFactory.getLogger(DeployBeanPropertyLists.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java
index 6777dcc4c..870bae89f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.meta;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebeaninternal.server.deploy.ManyType;
 
-public class DeployBeanPropertySimpleCollection<T> extends DeployBeanPropertyAssocMany<T> {
+public final class DeployBeanPropertySimpleCollection<T> extends DeployBeanPropertyAssocMany<T> {
 
   public DeployBeanPropertySimpleCollection(DeployBeanDescriptor<?> desc, Class<T> targetType, ManyType manyType) {
     super(desc, targetType, manyType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
index de0166876..960205e0f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
@@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
  * in a BeanDescriptor.
  * </p>
  */
-public class DeployBeanTable {
+public final class DeployBeanTable {
 
   private final Class<?> beanType;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java
index 5915dc873..6a20d9145 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java
@@ -5,7 +5,7 @@ import io.ebean.annotation.IdentityGenerated;
 import io.ebean.annotation.IdentityType;
 import io.ebean.config.dbplatform.IdType;
 
-public class DeployIdentityMode {
+public final class DeployIdentityMode {
 
   public static DeployIdentityMode auto() {
     return new DeployIdentityMode(IdType.AUTO);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java
index 26a8402b6..4a8943a8e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy.meta;
 
 import javax.persistence.OrderColumn;
 
-public class DeployOrderColumn {
+public final class DeployOrderColumn {
 
   /**
    * Logical property name used for order by and available for expression language.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index c3451f9f4..2a4608358 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -15,7 +15,7 @@ import java.util.Set;
  * This gets converted into a immutable TableJoin when complete.
  * </p>
  */
-public class DeployTableJoin {
+public final class DeployTableJoin {
 
   /**
    * The joined table.
@@ -33,7 +33,7 @@ public class DeployTableJoin {
   private ArrayList<DeployTableJoinColumn> columns = new ArrayList<>(4);
 
   private InheritInfo inheritInfo;
-  
+
   private String extraWhere;
 
   /**
@@ -146,11 +146,11 @@ public class DeployTableJoin {
   public String getExtraWhere() {
     return extraWhere;
   }
-  
+
   public void setExtraWhere(String extraWhere) {
     this.extraWhere = extraWhere;
   }
-  
+
   public DeployTableJoin createInverse(String tableName) {
 
     DeployTableJoin inverse = new DeployTableJoin();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
index da4bf0339..df5c4e0d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
@@ -8,7 +8,7 @@ import javax.persistence.JoinColumn;
 /**
  * A join pair of local and foreign properties.
  */
-public class DeployTableJoinColumn {
+public final class DeployTableJoinColumn {
 
   /**
    * The local database column name.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 1ca59dbc8..a98867a54 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -41,7 +41,7 @@ import java.util.Set;
 /**
  * Read the deployment annotation for Assoc Many beans.
  */
-class AnnotationAssocManys extends AnnotationAssoc {
+final class AnnotationAssocManys extends AnnotationAssoc {
 
   AnnotationAssocManys(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig, BeanDescriptorManager factory) {
     super(info, readConfig, factory);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 36fa99b57..727fe7c83 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -30,7 +30,7 @@ import javax.persistence.PrimaryKeyJoinColumn;
 /**
  * Read the deployment annotations for Associated One beans.
  */
-public class AnnotationAssocOnes extends AnnotationAssoc {
+final class AnnotationAssocOnes extends AnnotationAssoc {
 
   private static final Logger log = LoggerFactory.getLogger(AnnotationAssocOnes.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 8985fb4ac..44a9d2113 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -36,7 +36,7 @@ import static io.ebean.util.AnnotationUtil.typeGet;
 /**
  * Read the class level deployment annotations.
  */
-public class AnnotationClass extends AnnotationParser {
+final class AnnotationClass extends AnnotationParser {
 
   private static final Logger logger = LoggerFactory.getLogger(AnnotationClass.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 5a0caa287..b6d570817 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -76,7 +76,7 @@ import java.util.UUID;
 /**
  * Read the field level deployment annotations.
  */
-public class AnnotationFields extends AnnotationParser {
+final class AnnotationFields extends AnnotationParser {
 
   /**
    * If present read Jackson JsonIgnore.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java
index 0faf59837..386e08e64 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java
@@ -15,7 +15,7 @@ import java.util.Set;
 
 import static io.ebean.util.AnnotationUtil.get;
 
-public class AnnotationFind {
+final class AnnotationFind {
 
   public static Set<JoinColumn> joinColumns(Field field) {
     final JoinColumn col = get(field, JoinColumn.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java
index 5001f2f70..955c119db 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 /**
  * Read the class level deployment annotations.
  */
-class AnnotationSql extends AnnotationParser {
+final class AnnotationSql extends AnnotationParser {
 
   AnnotationSql(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
     super(info, readConfig);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
index 002cb5e0e..e87ff7754 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
@@ -9,7 +9,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql;
 /**
  * Wraps information about a bean during deployment parsing.
  */
-public class DeployBeanInfo<T> {
+public final class DeployBeanInfo<T> {
 
   private final DeployUtil util;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 6fb54b46d..d3d7ddb7d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -35,7 +35,7 @@ import java.lang.reflect.WildcardType;
  * one or normal scalar property.
  * </p>
  */
-public class DeployCreateProperties {
+public final class DeployCreateProperties {
 
   private static final Logger logger = LoggerFactory.getLogger(DeployCreateProperties.class);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
index fd9e4641b..7bc0ebd1b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * Builds the InheritInfo deployment information.
  */
-public class DeployInherit {
+public final class DeployInherit {
 
   private final Map<Class<?>, DeployInheritInfo> deployMap = new LinkedHashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index fb1a65a54..d1af77c8c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -12,7 +12,7 @@ import java.util.List;
  * Represents a node in the Inheritance tree.
  * Holds information regarding Super Subclass support.
  */
-public class DeployInheritInfo {
+public final class DeployInheritInfo {
 
   /**
    * the default discriminator column according to the JPA 1.0 spec.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 68cb1c741..276ff8d33 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -26,7 +26,7 @@ import java.sql.Types;
 /**
  * Utility object to help processing deployment information.
  */
-public class DeployUtil {
+public final class DeployUtil {
 
   /**
    * Assumes CLOB rather than LONGVARCHAR.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJacksonAnnotation.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJacksonAnnotation.java
index 08435de62..f283055ae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJacksonAnnotation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJacksonAnnotation.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy.parse;
 
-class InitMetaJacksonAnnotation {
+final class InitMetaJacksonAnnotation {
 
   static void init(ReadAnnotationConfig readConfig) {
     readConfig.addMetaAnnotation(com.fasterxml.jackson.annotation.JacksonAnnotation.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
index 1daf37564..81b5576e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
@@ -15,7 +15,7 @@ import java.util.Set;
 /**
  * Configuration used when reading the deployment annotations.
  */
-class ReadAnnotationConfig {
+final class ReadAnnotationConfig {
 
   private final GeneratedPropertyFactory generatedPropFactory;
   private final String asOfViewSuffix;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
index da2bc6030..c4ab55a1b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory
 /**
  * Read the deployment annotations for the bean.
  */
-public class ReadAnnotations {
+public final class ReadAnnotations {
 
   private final ReadAnnotationConfig readConfig;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java
index 016e9f13a..95046f25d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJakarta.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * Jakarta validation annotations reader.
  */
-class ReadValidationAnnotationsJakarta implements ReadValidationAnnotations {
+final class ReadValidationAnnotationsJakarta implements ReadValidationAnnotations {
 
   ReadValidationAnnotationsJakarta(ReadAnnotationConfig readConfig) {
     readConfig.addMetaAnnotation(Size.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java
index a690e69de..4704bf766 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadValidationAnnotationsJavax.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * Javax validation annotations reader.
  */
-class ReadValidationAnnotationsJavax implements ReadValidationAnnotations {
+final class ReadValidationAnnotationsJavax implements ReadValidationAnnotations {
 
   ReadValidationAnnotationsJavax(ReadAnnotationConfig readConfig) {
       readConfig.addMetaAnnotation(Size.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java
index e7896b96a..be5b10aee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java
@@ -8,28 +8,22 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 /**
  * Mark transient properties.
  */
-public class TransientProperties {
-
-  public TransientProperties() {
-  }
+public final class TransientProperties {
 
   /**
    * Mark any additional properties as transient.
    */
   public void process(DeployBeanDescriptor<?> desc) {
-
     for (DeployBeanProperty prop : desc.propertiesBase()) {
       if (!prop.isDbRead() && !prop.isDbInsertable() && !prop.isDbUpdateable()) {
         prop.setTransient();
       }
     }
-
     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/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index 11b80da38..8ffef8a33 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -11,7 +11,7 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 
-final class DRawSqlService implements SpiRawSqlService {
+public final class DRawSqlService implements SpiRawSqlService {
 
   @Override
   public RawSql resultSet(ResultSet resultSet, String... propertyNames) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java
index 8e824f664..4e76caea8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/ArrayStack.java
@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * Stack based on ArrayList.
  */
-public final class ArrayStack<E> {
+public class ArrayStack<E> {
 
   private final List<E> list;
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java
index 73aa23ced..5b543e764 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java
@@ -1,12 +1,16 @@
 package io.ebeaninternal.server.deploy.parse;
 
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
+import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import org.junit.Test;
 
+import java.util.Collections;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
@@ -46,9 +50,8 @@ public class AnnotationClassTest {
 
     DeployUtil deployUtil = new DeployUtil(new DefaultTypeManager(config, new BootupClasses()), config);
 
-    DeployBeanInfo deployBeanInfo = new DeployBeanInfo(deployUtil, mock(DeployBeanDescriptor.class));
-    ReadAnnotationConfig readAnnotationConfig = mock(ReadAnnotationConfig.class);
-
+    DeployBeanInfo deployBeanInfo = new DeployBeanInfo(deployUtil, new DeployBeanDescriptor<>(null, null, null));
+    ReadAnnotationConfig readAnnotationConfig = new ReadAnnotationConfig(new GeneratedPropertyFactory(true, new DatabaseConfig(), Collections.emptyList()), "","", new DatabaseConfig());
     return new AnnotationClass(deployBeanInfo, readAnnotationConfig);
   }
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
index 6ffbe1fd4..0cb6db92d 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
@@ -11,7 +11,7 @@ import java.util.List;
  * Makes use of BeanVisitor and PropertyVisitor to navigate BeanDescriptors
  * and their properties.
  */
-public class VisitAllUsing extends VisitProperties {
+public final class VisitAllUsing extends VisitProperties {
 
   private final BeanVisitor visitor;
 

From 285a94e5fe96d8f540da94afbe8c3cefec9797ce Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 19:06:54 +1200
Subject: [PATCH 401/447] #2318 - Refactor internals - final classes in dto
 packages

---
 .../io/ebeaninternal/server/dto/DtoBeanDescriptor.java    | 5 +----
 .../java/io/ebeaninternal/server/dto/DtoBeanManager.java  | 5 ++---
 .../main/java/io/ebeaninternal/server/dto/DtoColumn.java  | 2 +-
 .../io/ebeaninternal/server/dto/DtoMappingRequest.java    | 7 +------
 .../main/java/io/ebeaninternal/server/dto/DtoMeta.java    | 8 +-------
 .../java/io/ebeaninternal/server/dto/DtoMetaBuilder.java  | 5 +----
 .../io/ebeaninternal/server/dto/DtoMetaConstructor.java   | 5 +----
 .../java/io/ebeaninternal/server/dto/DtoMetaProperty.java | 2 +-
 .../java/io/ebeaninternal/server/dto/DtoNamedQueries.java | 4 ++--
 .../io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java  | 4 +---
 .../ebeaninternal/server/dto/DtoQueryPlanConSetter.java   | 4 +---
 .../ebeaninternal/server/dto/DtoQueryPlanConstructor.java | 2 +-
 .../io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java | 2 +-
 13 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
index 10f2a2cdc..041ac7d45 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java
@@ -8,14 +8,11 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * Manages the query plans for a given DTO bean type.
  */
-public class DtoBeanDescriptor<T> {
+public final class DtoBeanDescriptor<T> {
 
   private final Map<Object, DtoQueryPlan> plans = new ConcurrentHashMap<>();
-
   private final Class<T> dtoType;
-
   private final DtoMeta meta;
-
   private final Map<String, String> namedQueries;
 
   DtoBeanDescriptor(Class<T> dtoType, DtoMeta meta, Map<String, String> namedQueries) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
index 4388a180d..c11f79843 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanManager.java
@@ -10,14 +10,13 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * Manages all the DTO bean descriptors.
  */
-public class DtoBeanManager {
+@SuppressWarnings("rawtypes")
+public final class DtoBeanManager {
 
   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, Map<Class<?>, DtoNamedQueries> namedQueries) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoColumn.java
index 187caf97f..9f42f2d0f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoColumn.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.dto;
 /**
  * A column in the resultSet that we want to map to a bean property.
  */
-public class DtoColumn {
+public final class DtoColumn {
 
   private final String label;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
index b2a72db61..8c882599c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
@@ -8,18 +8,13 @@ import io.ebeaninternal.api.SpiDtoQuery;
 /**
  * Request to map a resultSet columns for a query into a DTO bean.
  */
-public class DtoMappingRequest {
+public final class DtoMappingRequest {
 
   private final Class type;
-
   private final String label;
-
   private final ProfileLocation profileLocation;
-
   private final String sql;
-
   private final boolean relaxedMode;
-
   private final DtoColumn[] columnMeta;
 
   public DtoMappingRequest(SpiDtoQuery query, String sql, DtoColumn[] columnMeta) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
index 09bc441e9..9582c160e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
@@ -10,23 +10,19 @@ import java.util.Map;
  *
  * Uses this to map a mapping request (columns) to a 'query plan' (constructor and setters).
  */
-class DtoMeta {
+final 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;
@@ -47,9 +43,7 @@ class DtoMeta {
   }
 
   public DtoQueryPlan match(DtoMappingRequest request) {
-
     DtoColumn[] cols = request.getColumnMeta();
-
     int colLen = cols.length;
     DtoMetaConstructor constructor = constructorMap.get(colLen);
     if (constructor != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
index bc5f900ed..0241c2747 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
@@ -15,16 +15,13 @@ import java.util.List;
  * <p>
  * Use TypeManager to map bean property types to ScalarTypes.
  */
-class DtoMetaBuilder {
+final 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) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
index 35a736346..efd7c97d2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
@@ -10,22 +10,19 @@ import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.sql.SQLException;
 
-class DtoMetaConstructor {
+final class DtoMetaConstructor {
 
   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 {
-
     this.types = constructor.getParameterTypes();
     this.scalarTypes = new ScalarType[types.length];
     for (int i = 0; i < types.length; i++) {
       scalarTypes[i] = typeManager.getScalarType(types[i]);
     }
-
     this.handle = LOOKUP.findConstructor(someClass, typeFor(types));
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
index c4beae172..fe7d794a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
@@ -10,7 +10,7 @@ import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.sql.SQLException;
 
-class DtoMetaProperty implements DtoReadSet {
+final class DtoMetaProperty implements DtoReadSet {
 
   private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java
index 7b455de3d..6e92b010a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoNamedQueries.java
@@ -6,9 +6,9 @@ import java.util.Map;
 /**
  * Collection of named queries for a single Dto bean type.
  */
-public class DtoNamedQueries {
+public final class DtoNamedQueries {
 
-  private Map<String, String> namedRawSql = new HashMap<>();
+  private final Map<String, String> namedRawSql = new HashMap<>();
 
   /**
    * Add the named query from deployment XML.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java
index 1bc530b78..3ea144604 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConPlus.java
@@ -7,10 +7,9 @@ import java.sql.SQLException;
 /**
  * Plan based on Constructor plus some setter methods.
  */
-class DtoQueryPlanConPlus extends DtoQueryPlanBase {
+final class DtoQueryPlanConPlus extends DtoQueryPlanBase {
 
   private final DtoMetaConstructor maxArgConstructor;
-
   private final DtoReadSet[] setterProps;
 
   DtoQueryPlanConPlus(DtoMappingRequest request, DtoMetaConstructor maxArgConstructor, DtoReadSet[] setterProps) {
@@ -21,7 +20,6 @@ class DtoQueryPlanConPlus extends DtoQueryPlanBase {
 
   @Override
   public Object readRow(DataReader dataReader) throws SQLException {
-
     Object bean = maxArgConstructor.process(dataReader);
     for (DtoReadSet setterProp : setterProps) {
       setterProp.readSet(bean, dataReader);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java
index 70629e8da..a5aa905a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConSetter.java
@@ -7,10 +7,9 @@ import java.sql.SQLException;
 /**
  * Plan based on default constructor and setter methods.
  */
-class DtoQueryPlanConSetter extends DtoQueryPlanBase {
+final class DtoQueryPlanConSetter extends DtoQueryPlanBase {
 
   private final DtoMetaConstructor defaultConstructor;
-
   private final DtoReadSet[] setterProps;
 
   DtoQueryPlanConSetter(DtoMappingRequest request, DtoMetaConstructor defaultConstructor, DtoReadSet[] setterProps) {
@@ -21,7 +20,6 @@ class DtoQueryPlanConSetter extends DtoQueryPlanBase {
 
   @Override
   public Object readRow(DataReader dataReader) throws SQLException {
-
     Object bean = defaultConstructor.defaultConstructor();
     for (DtoReadSet setterProp : setterProps) {
       setterProp.readSet(bean, dataReader);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java
index 912b41cd2..e0d39faa7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanConstructor.java
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 /**
  * Plan based on mapping via single constructor only.
  */
-class DtoQueryPlanConstructor extends DtoQueryPlanBase {
+final class DtoQueryPlanConstructor extends DtoQueryPlanBase {
 
   private final DtoMetaConstructor constructor;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java
index 9fda8b81f..d2743e59d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoReadSetColumnSkip.java
@@ -5,7 +5,7 @@ import io.ebean.core.type.DataReader;
 /**
  * Placeholder to skip reading a column that isn't mapped to a bean property.
  */
-class DtoReadSetColumnSkip implements DtoReadSet {
+final class DtoReadSetColumnSkip implements DtoReadSet {
 
   static final DtoReadSet INSTANCE = new DtoReadSetColumnSkip();
 

From 55587b12aa5456c98db619a630efc6f1078aa33c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 19:15:35 +1200
Subject: [PATCH 402/447] #2318 - Refactor internals - final classes in el
 packages

---
 .../server/el/ElComparatorNoop.java           |  2 +-
 .../server/el/ElComparatorProperty.java       |  2 --
 .../io/ebeaninternal/server/el/ElFilter.java  |  3 --
 .../server/el/ElMatchBuilder.java             | 36 +++++++++----------
 .../server/el/ElPropertyChain.java            | 16 +--------
 .../server/el/ElPropertyChainBuilder.java     |  5 +--
 .../executor/DaemonScheduleThreadPool.java    |  2 --
 .../server/executor/DaemonThreadFactory.java  |  3 +-
 .../executor/DefaultBackgroundExecutor.java   |  2 +-
 .../readaudit/DefaultReadAuditLogger.java     | 13 -------
 10 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java
index 9377aa91c..9fa68b481 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorNoop.java
@@ -6,7 +6,7 @@ package io.ebeaninternal.server.el;
  * @author Roland Praml, FOCONIS AG
  *
  */
-public class ElComparatorNoop<T> implements ElComparator<T> {
+public final class ElComparatorNoop<T> implements ElComparator<T> {
 
   private static final long serialVersionUID = -9060871822183687180L;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
index a1093473f..56576d947 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java
@@ -12,9 +12,7 @@ public final class ElComparatorProperty<T> implements Comparator<T>, ElComparato
   private static final long serialVersionUID = -2735738237263956073L;
 
   private final ElPropertyValue elGetValue;
-
   private final int nullOrder;
-
   private final int asc;
 
   public ElComparatorProperty(ElPropertyValue elGetValue, boolean ascending, boolean nullsHigh) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java
index 4b205fb19..470345a31 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java
@@ -14,11 +14,8 @@ import java.util.regex.Pattern;
 public final class ElFilter<T> implements Filter<T> {
 
   private final BeanDescriptor<T> beanDescriptor;
-
   private final ArrayList<ElMatcher<T>> matches = new ArrayList<>();
-
   private int maxRows;
-
   private String sortByClause;
 
   public ElFilter(BeanDescriptor<T> beanDescriptor) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java
index 0cccfb9f4..66e966cfb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java
@@ -8,12 +8,12 @@ import java.util.regex.Pattern;
 /**
  * Contains the various ElMatcher implementations.
  */
-class ElMatchBuilder {
+final class ElMatchBuilder {
 
   /**
    * Case insensitive equals.
    */
-  static class RegularExpr<T> implements ElMatcher<T> {
+  static final class RegularExpr<T> implements ElMatcher<T> {
 
     final ElPropertyValue elGetValue;
     final String value;
@@ -49,7 +49,7 @@ class ElMatchBuilder {
     public abstract boolean isMatch(T bean);
   }
 
-  static class Ieq<T> extends BaseString<T> {
+  static final class Ieq<T> extends BaseString<T> {
     Ieq(ElPropertyValue elGetValue, String value) {
       super(elGetValue, value);
     }
@@ -64,7 +64,7 @@ class ElMatchBuilder {
   /**
    * Case insensitive starts with matcher.
    */
-  static class IStartsWith<T> implements ElMatcher<T> {
+  static final class IStartsWith<T> implements ElMatcher<T> {
 
     final ElPropertyValue elGetValue;
     final CharMatch charMatch;
@@ -85,7 +85,7 @@ class ElMatchBuilder {
   /**
    * Case insensitive ends with matcher.
    */
-  static class IEndsWith<T> implements ElMatcher<T> {
+  static final class IEndsWith<T> implements ElMatcher<T> {
 
     final ElPropertyValue elGetValue;
     final CharMatch charMatch;
@@ -103,7 +103,7 @@ class ElMatchBuilder {
     }
   }
 
-  static class StartsWith<T> extends BaseString<T> {
+  static final class StartsWith<T> extends BaseString<T> {
     StartsWith(ElPropertyValue elGetValue, String value) {
       super(elGetValue, value);
     }
@@ -115,7 +115,7 @@ class ElMatchBuilder {
     }
   }
 
-  static class EndsWith<T> extends BaseString<T> {
+  static final class EndsWith<T> extends BaseString<T> {
     EndsWith(ElPropertyValue elGetValue, String value) {
       super(elGetValue, value);
     }
@@ -127,7 +127,7 @@ class ElMatchBuilder {
     }
   }
 
-  static class IsNull<T> implements ElMatcher<T> {
+  static final class IsNull<T> implements ElMatcher<T> {
 
     final ElPropertyValue elGetValue;
 
@@ -141,7 +141,7 @@ class ElMatchBuilder {
     }
   }
 
-  static class IsNotNull<T> implements ElMatcher<T> {
+  static final class IsNotNull<T> implements ElMatcher<T> {
 
     final ElPropertyValue elGetValue;
 
@@ -170,7 +170,7 @@ class ElMatchBuilder {
     public abstract boolean isMatch(T value);
   }
 
-  static class InSet<T> implements ElMatcher<T> {
+  static final class InSet<T> implements ElMatcher<T> {
 
     final Set<?> set;
     final ElPropertyValue elGetValue;
@@ -183,7 +183,6 @@ class ElMatchBuilder {
 
     @Override
     public boolean isMatch(T bean) {
-
       Object value = elGetValue.pathGet(bean);
       return value != null && set.contains(value);
     }
@@ -192,7 +191,7 @@ class ElMatchBuilder {
   /**
    * Equal To.
    */
-  static class Eq<T> extends Base<T> {
+  static final class Eq<T> extends Base<T> {
 
     public Eq(Object filterValue, ElComparator<T> comparator) {
       super(filterValue, comparator);
@@ -207,7 +206,7 @@ class ElMatchBuilder {
   /**
    * Not Equal To.
    */
-  static class Ne<T> extends Base<T> {
+  static final class Ne<T> extends Base<T> {
 
     public Ne(Object filterValue, ElComparator<T> comparator) {
       super(filterValue, comparator);
@@ -222,7 +221,7 @@ class ElMatchBuilder {
   /**
    * Between.
    */
-  static class Between<T> implements ElMatcher<T> {
+  static final class Between<T> implements ElMatcher<T> {
 
     final Object min;
     final Object max;
@@ -236,7 +235,6 @@ class ElMatchBuilder {
 
     @Override
     public boolean isMatch(T value) {
-
       return (comparator.compareValue(min, value) <= 0
         && comparator.compareValue(max, value) >= 0);
     }
@@ -245,7 +243,7 @@ class ElMatchBuilder {
   /**
    * Greater Than.
    */
-  static class Gt<T> extends Base<T> {
+  static final class Gt<T> extends Base<T> {
     Gt(Object filterValue, ElComparator<T> comparator) {
       super(filterValue, comparator);
     }
@@ -259,7 +257,7 @@ class ElMatchBuilder {
   /**
    * Greater Than or Equal To.
    */
-  static class Ge<T> extends Base<T> {
+  static final class Ge<T> extends Base<T> {
     Ge(Object filterValue, ElComparator<T> comparator) {
       super(filterValue, comparator);
     }
@@ -273,7 +271,7 @@ class ElMatchBuilder {
   /**
    * Less Than or Equal To.
    */
-  static class Le<T> extends Base<T> {
+  static final class Le<T> extends Base<T> {
     Le(Object filterValue, ElComparator<T> comparator) {
       super(filterValue, comparator);
     }
@@ -287,7 +285,7 @@ class ElMatchBuilder {
   /**
    * Less Than.
    */
-  static class Lt<T> extends Base<T> {
+  static final class Lt<T> extends Base<T> {
     Lt(Object filterValue, ElComparator<T> comparator) {
       super(filterValue, comparator);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index 2effb1703..16d0e3808 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -22,30 +22,22 @@ import java.util.Arrays;
  * no further processing of the chain occurs.
  * </p>
  */
-public class ElPropertyChain implements ElPropertyValue {
+public final class ElPropertyChain implements ElPropertyValue {
 
   private final String prefix;
-
   private final String placeHolder;
   private final String placeHolderEncrypted;
-
   private final String name;
-
   private final String expression;
-
   private final boolean containsMany;
-
   private final ElPropertyValue[] chain;
-
   private final boolean assocId;
   private final int last;
   private final BeanProperty lastBeanProperty;
   private final ScalarType<?> scalarType;
-
   private final ElPropertyValue lastElPropertyValue;
 
   public ElPropertyChain(boolean containsMany, boolean embedded, String expression, ElPropertyValue[] chain) {
-
     this.containsMany = containsMany;
     this.chain = chain;
     this.expression = expression;
@@ -119,15 +111,12 @@ public class ElPropertyChain implements ElPropertyValue {
     if (!expression.startsWith(sinceProperty)) {
       return containsMany;
     }
-
     int i = 1 + SplitName.count(sinceProperty);
-
     for (; i < chain.length; i++) {
       if (chain[i].getBeanProperty().containsMany()) {
         return true;
       }
     }
-
     return false;
   }
 
@@ -281,7 +270,6 @@ public class ElPropertyChain implements ElPropertyValue {
 
   @Override
   public Object pathGetNested(Object bean) {
-
     Object prevBean = bean;
     for (int i = 0; i < last; i++) {
       // always return non null prevBean
@@ -293,7 +281,6 @@ public class ElPropertyChain implements ElPropertyValue {
 
   @Override
   public void pathSet(Object bean, Object value) {
-
     Object prevBean = bean;
     for (int i = 0; i < last; i++) {
       prevBean = chain[i].pathGetNested(prevBean);
@@ -310,5 +297,4 @@ public class ElPropertyChain implements ElPropertyValue {
     }
   }
 
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
index 93b17b708..fd69bdd9c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
@@ -13,14 +13,11 @@ import java.util.List;
  * order.customer.name.
  * </p>
  */
-public class ElPropertyChainBuilder {
+public final class ElPropertyChainBuilder {
 
   private final String expression;
-
   private final List<ElPropertyValue> chain = new ArrayList<>();
-
   private boolean embedded;
-
   private boolean containsMany;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
index 3bdf15777..983800061 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
@@ -15,9 +15,7 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
   private static final Logger logger = LoggerFactory.getLogger(DaemonScheduleThreadPool.class);
 
   private final ReentrantLock lock = new ReentrantLock();
-
   private final String namePrefix;
-
   private final int shutdownWaitSeconds;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java
index d1bbf3ee1..c2e14195b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java
@@ -13,10 +13,9 @@ import java.util.concurrent.atomic.AtomicInteger;
  * on shutdown or register with the JVM shutdown hook to perform a nice shutdown
  * of the daemon threads etc.
  */
-public class DaemonThreadFactory implements ThreadFactory {
+public final class DaemonThreadFactory implements ThreadFactory {
 
   private final AtomicInteger threadNumber = new AtomicInteger(1);
-
   private final String namePrefix;
 
   public DaemonThreadFactory(String namePrefix) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
index 28bb50765..305da21ca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * The default implementation of the BackgroundExecutor.
  */
-public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
+public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
   private final ScheduledExecutorService executor;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
index 64a9072eb..9e1403836 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
@@ -19,15 +19,11 @@ import java.util.Map;
 public class DefaultReadAuditLogger implements ReadAuditLogger {
 
   private static final Logger appLogger = LoggerFactory.getLogger(DefaultReadAuditLogger.class);
-
   private static final Logger queryLogger = LoggerFactory.getLogger("io.ebean.ReadAuditQuery");
-
   private static final Logger auditLogger = LoggerFactory.getLogger("io.ebean.ReadAudit");
 
   protected final JsonFactory jsonFactory = new JsonFactory();
-
   protected int defaultQueryBuffer = 500;
-
   protected int defaultReadBuffer = 150;
 
   /**
@@ -37,7 +33,6 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
   public void queryPlan(ReadAuditQueryPlan queryPlan) {
     StringWriter writer = new StringWriter(defaultQueryBuffer);
     try (JsonGenerator gen = jsonFactory.createGenerator(writer)) {
-
       gen.writeStartObject();
       String beanType = queryPlan.getBeanType();
       if (beanType != null) {
@@ -53,9 +48,7 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
       }
       gen.writeEndObject();
       gen.flush();
-
       queryLogger.info(writer.toString());
-
     } catch (IOException e) {
       appLogger.error("Error writing Read audit event", e);
     }
@@ -66,7 +59,6 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
    */
   @Override
   public void auditBean(ReadEvent beanEvent) {
-
     writeEvent(beanEvent);
   }
 
@@ -79,14 +71,11 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
   }
 
   protected void writeEvent(ReadEvent event) {
-
     try {
       StringWriter writer = new StringWriter(defaultReadBuffer);
       JsonGenerator gen = jsonFactory.createGenerator(writer);
       writeDetails(gen, event);
-
       auditLogger.info(writer.toString());
-
     } catch (IOException e) {
       appLogger.error("Error writing Read audit event", e);
     }
@@ -96,7 +85,6 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
    * Write the details for the read bean or read many beans event.
    */
   protected void writeDetails(JsonGenerator gen, ReadEvent event) throws IOException {
-
     gen.writeStartObject();
     String source = event.getSource();
     if (source != null) {
@@ -130,7 +118,6 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
       gen.writeFieldName("ids");
       EJson.writeCollection(event.getIds(), gen);
     }
-
     gen.writeEndObject();
     gen.flush();
     gen.close();

From 826e8518eadb21d9befc11a7a3ca133faa940931 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 19:46:08 +1200
Subject: [PATCH 403/447] #2318 - Refactor internals - final classes in type
 packages

---
 .../type/AttributeConverterAdapter.java       |  2 +-
 .../ebeaninternal/server/type/DataBind.java   | 45 +++++++++----------
 .../server/type/DataBindCapture.java          |  2 +-
 .../server/type/DataEncryptSupport.java       |  2 +-
 .../server/type/DecimalUtils.java             |  5 ---
 .../server/type/DefaultTypeFactory.java       |  4 +-
 .../server/type/EnumToDbIntegerMap.java       |  2 +-
 .../server/type/EnumToDbStringMap.java        |  2 +-
 .../server/type/EnumToDbValueMap.java         |  4 --
 .../server/type/InitObjectMapper.java         |  2 +-
 .../server/type/IsoJsonDateTimeParser.java    |  2 +-
 .../server/type/JacksonTypeHelper.java        |  2 +-
 .../server/type/LongToTimestampConverter.java |  5 +--
 .../server/type/PostgresHelper.java           |  3 +-
 .../server/type/RsetDataReaderIndexed.java    |  2 +-
 .../ebeaninternal/server/type/ScalarHelp.java |  4 +-
 .../server/type/bindcapture/BindCapture.java  |  2 +-
 .../bindcapture/BindCaptureStatement.java     |  2 +-
 .../type/bindcapture/BindCaptureTypes.java    | 39 ++++++++--------
 19 files changed, 56 insertions(+), 75 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java
index e358dd891..242b657f3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java
@@ -7,7 +7,7 @@ import javax.persistence.AttributeConverter;
 /**
  * Adapter from ScalarTypeConverter to AttributeConverter.
  */
-class AttributeConverterAdapter<B,S> implements ScalarTypeConverter<B, S> {
+final class AttributeConverterAdapter<B,S> implements ScalarTypeConverter<B, S> {
 
   private final AttributeConverter<B,S> converter;
   private final B nullValue;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
index a1a9ec8cf..89603122b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -26,15 +26,10 @@ public class DataBind implements DataBinder {
   private static final Logger log = LoggerFactory.getLogger(DataBind.class);
 
   private final DataTimeZone dataTimeZone;
-
   private final PreparedStatement pstmt;
-
   private final Connection connection;
-
   private final StringBuilder bindLog = new StringBuilder();
-
   private List<InputStream> inputStreams;
-
   protected int pos;
   private String json;
 
@@ -45,35 +40,35 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public void pushJson(String json) {
+  public final void pushJson(String json) {
     assert this.json == null; // we can only push one value
     this.json = json;
   }
 
   @Override
-  public String popJson() {
+  public final String popJson() {
     String ret = json;
     json = null;
     return ret;
   }
 
   @Override
-  public StringBuilder append(Object entry) {
+  public final StringBuilder append(Object entry) {
     return bindLog.append(entry);
   }
 
   @Override
-  public StringBuilder log() {
+  public final StringBuilder log() {
     return bindLog;
   }
 
   @Override
-  public void close() throws SQLException {
+  public final void close() throws SQLException {
     pstmt.close();
   }
 
   @Override
-  public int currentPos() {
+  public final int currentPos() {
     return pos;
   }
 
@@ -83,7 +78,7 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public void setObject(Object value, int sqlType) throws SQLException {
+  public final void setObject(Object value, int sqlType) throws SQLException {
     pstmt.setObject(++pos, value, sqlType);
   }
 
@@ -93,17 +88,17 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public int nextPos() {
+  public final int nextPos() {
     return ++pos;
   }
 
   @Override
-  public void decrementPos() {
+  public final void decrementPos() {
     --pos;
   }
 
   @Override
-  public int executeUpdate() throws SQLException {
+  public final int executeUpdate() throws SQLException {
     try {
       return pstmt.executeUpdate();
     } finally {
@@ -125,7 +120,7 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public PreparedStatement getPstmt() {
+  public final PreparedStatement getPstmt() {
     return pstmt;
   }
 
@@ -135,37 +130,37 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public void setInt(int i) throws SQLException {
+  public final void setInt(int i) throws SQLException {
     pstmt.setInt(++pos, i);
   }
 
   @Override
-  public void setLong(long i) throws SQLException {
+  public final void setLong(long i) throws SQLException {
     pstmt.setLong(++pos, i);
   }
 
   @Override
-  public void setShort(short i) throws SQLException {
+  public final void setShort(short i) throws SQLException {
     pstmt.setShort(++pos, i);
   }
 
   @Override
-  public void setFloat(float i) throws SQLException {
+  public final void setFloat(float i) throws SQLException {
     pstmt.setFloat(++pos, i);
   }
 
   @Override
-  public void setDouble(double i) throws SQLException {
+  public final void setDouble(double i) throws SQLException {
     pstmt.setDouble(++pos, i);
   }
 
   @Override
-  public void setBigDecimal(BigDecimal v) throws SQLException {
+  public final void setBigDecimal(BigDecimal v) throws SQLException {
     pstmt.setBigDecimal(++pos, v);
   }
 
   @Override
-  public void setDate(java.sql.Date v) throws SQLException {
+  public final void setDate(java.sql.Date v) throws SQLException {
     Calendar timeZone = dataTimeZone.getDateTimeZone();
     if (timeZone != null) {
       pstmt.setDate(++pos, v, timeZone);
@@ -175,7 +170,7 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public void setTimestamp(Timestamp v) throws SQLException {
+  public final void setTimestamp(Timestamp v) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeZone();
     if (timeZone != null) {
       pstmt.setTimestamp(++pos, v, timeZone);
@@ -185,7 +180,7 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public void setTime(Time v) throws SQLException {
+  public final void setTime(Time v) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeZone();
     if (timeZone != null) {
       pstmt.setTime(++pos, v, timeZone);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
index e87ebf471..659d0ef06 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.type.bindcapture.BindCaptureStatement;
 /**
  * Special DataBind used to capture bind values for obtaining explain plans.
  */
-public class DataBindCapture extends DataBind {
+public final class DataBindCapture extends DataBind {
 
   private final BindCaptureStatement captureStatement;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataEncryptSupport.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataEncryptSupport.java
index 32d87cd91..791d3e78e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataEncryptSupport.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataEncryptSupport.java
@@ -4,7 +4,7 @@ import io.ebean.config.EncryptKey;
 import io.ebean.config.EncryptKeyManager;
 import io.ebean.config.Encryptor;
 
-public class DataEncryptSupport {
+public final class DataEncryptSupport {
 
   private final EncryptKeyManager encryptKeyManager;
   private final Encryptor encryptor;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
index 60e3f6d6e..72f2d4e96 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
@@ -38,10 +38,8 @@ public final class DecimalUtils {
   }
 
   public static Duration toDuration(BigDecimal value) {
-
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
-
     return Duration.ofSeconds(seconds, nanoseconds);
   }
 
@@ -50,10 +48,8 @@ public final class DecimalUtils {
   }
 
   public static Timestamp toTimestamp(BigDecimal value) {
-
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
-
     Timestamp ts = new Timestamp(seconds * 1000);
     ts.setNanos(nanoseconds);
     return ts;
@@ -66,7 +62,6 @@ public final class DecimalUtils {
   }
 
   public static Instant toInstant(BigDecimal value) {
-
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
     return Instant.ofEpochSecond(seconds, nanoseconds);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
index 22f50b937..6c2f3b860 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
@@ -14,7 +14,7 @@ import java.util.Date;
  * Helper to create some default ScalarType objects for Booleans,
  * java.util.Date, java.util.Calendar etc.
  */
-public class DefaultTypeFactory {
+public final class DefaultTypeFactory {
 
   private final DatabaseConfig config;
 
@@ -22,7 +22,7 @@ public class DefaultTypeFactory {
     this.config = config;
   }
 
-  protected ScalarTypeBool createBoolean(String trueValue, String falseValue) {
+  ScalarTypeBool createBoolean(String trueValue, String falseValue) {
     try {
       // first try Integer based boolean
       Integer intTrue = BasicTypeConverter.toInteger(trueValue);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
index 7d62a8391..419d8f53a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
@@ -10,7 +10,7 @@ import java.sql.Types;
 /**
  * Used to map enum values to database integer values.
  */
-public class EnumToDbIntegerMap extends EnumToDbValueMap<Integer> {
+public final class EnumToDbIntegerMap extends EnumToDbValueMap<Integer> {
 
   @Override
   public int getDbType() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java
index 05b0f8991..c7dc4bc89 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java
@@ -9,7 +9,7 @@ import java.sql.Types;
 /**
  * Used to map Enum values to database string/varchar values.
  */
-public class EnumToDbStringMap extends EnumToDbValueMap<String> {
+public final class EnumToDbStringMap extends EnumToDbValueMap<String> {
 
   @Override
   public int getDbType() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java
index 08240cabc..57ab47ef5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java
@@ -22,13 +22,9 @@ public abstract class EnumToDbValueMap<T> {
   }
 
   final LinkedHashMap<Object, T> keyMap;
-
   final LinkedHashMap<T, Object> valueMap;
-
   final HashMap<Object, Object> nameMap;
-
   final boolean allowNulls;
-
   final boolean isIntegerType;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java
index 90a86ec79..7daee8bd5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/InitObjectMapper.java
@@ -9,7 +9,7 @@ import java.util.Set;
 /**
  * Initialise the Jackson ObjectMapper.
  */
-class InitObjectMapper {
+final class InitObjectMapper {
 
   /**
    * Create and return the default ObjectMapper.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
index a6f8a8636..fd4373062 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
@@ -4,7 +4,7 @@ import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 
-class IsoJsonDateTimeParser {
+final class IsoJsonDateTimeParser {
 
   private static final DateTimeFormatter ISO_MILLIS = new DateTimeFormatterBuilder()
     .parseCaseInsensitive()
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java
index 1e1db244d..7d2d5b3e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.type;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 
-class JacksonTypeHelper {
+final class JacksonTypeHelper {
 
   private final AnnotatedField field;
   private final ObjectMapper objectMapper;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java
index e396602d4..83d55871d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java
@@ -4,7 +4,7 @@ import io.ebean.config.ScalarTypeConverter;
 
 import java.sql.Timestamp;
 
-public class LongToTimestampConverter implements ScalarTypeConverter<Long, Timestamp> {
+public final class LongToTimestampConverter implements ScalarTypeConverter<Long, Timestamp> {
 
   @Override
   public Long getNullValue() {
@@ -13,15 +13,12 @@ public class LongToTimestampConverter implements ScalarTypeConverter<Long, Times
 
   @Override
   public Timestamp unwrapValue(Long beanType) {
-
     return new Timestamp(beanType);
   }
 
   @Override
   public Long wrapValue(Timestamp scalarType) {
-
     return scalarType.getTime();
   }
 
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
index d422b493f..f0f9c54bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
@@ -4,7 +4,7 @@ import org.postgresql.util.PGobject;
 
 import java.sql.SQLException;
 
-public class PostgresHelper {
+public final class PostgresHelper {
 
   /**
    * The Postgres JSON DB type.
@@ -26,7 +26,6 @@ public class PostgresHelper {
    * Construct and return Postgres specific PG object.
    */
   public static Object asObject(String pgType, String rawJson) throws SQLException {
-
     PGobject pgo = new PGobject();
     pgo.setType(pgType);
     pgo.setValue(rawJson);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReaderIndexed.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReaderIndexed.java
index 9ebeab367..773a19bb8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReaderIndexed.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReaderIndexed.java
@@ -7,7 +7,7 @@ import java.sql.ResultSet;
 /**
  * A DataReader with indexed positions for the properties to read specifically for RawSql use.
  */
-public class RsetDataReaderIndexed extends RsetDataReader {
+public final class RsetDataReaderIndexed extends RsetDataReader {
 
   private final int[] rsetIndexPositions;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarHelp.java
index cf561e426..5bfcf1a8e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarHelp.java
@@ -6,12 +6,12 @@ import java.io.IOException;
 /**
  * Utility methods for ScalarTypes.
  */
-public class ScalarHelp {
+final class ScalarHelp {
 
   /**
    * Write the string content as UTF with the proceeding boolean true indicating the non-null.
    */
-  public static void writeUTF(DataOutput dataOutput, String content) throws IOException {
+  static void writeUTF(DataOutput dataOutput, String content) throws IOException {
     dataOutput.writeBoolean(true);
     dataOutput.writeUTF(content);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
index f8e27393c..3e75d68a3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * Holds bind values that can be used to obtain an explain plan.
  */
-public class BindCapture {
+public final class BindCapture {
 
   private final List<BindCaptureEntry> entries = new ArrayList<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
index e8cda7b13..916c1c355 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
@@ -12,7 +12,7 @@ import java.util.Calendar;
 /**
  * Special PreparedStatement used to capture bind values used to obtain explain plans.
  */
-public class BindCaptureStatement extends BindCaptureStatementBase implements PreparedStatement {
+public final class BindCaptureStatement extends BindCaptureStatementBase implements PreparedStatement {
 
   private final BindCapture capture = new BindCapture();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
index 1c859c8fb..b2e36f828 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
@@ -13,9 +13,9 @@ import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Calendar;
 
-class BindCaptureTypes {
+final class BindCaptureTypes {
 
-  static class Null implements BindCaptureEntry {
+  static final class Null implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final int sqlType;
@@ -36,7 +36,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class Boolean implements BindCaptureEntry {
+  static final class Boolean implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final boolean x;
@@ -57,7 +57,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class Byte implements BindCaptureEntry {
+  static final class Byte implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final byte x;
@@ -78,7 +78,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class Bytes implements BindCaptureEntry {
+  static final class Bytes implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final byte[] x;
@@ -99,7 +99,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TShort implements BindCaptureEntry {
+  static final class TShort implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final short value;
@@ -120,7 +120,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TInt implements BindCaptureEntry {
+  static final class TInt implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final int value;
@@ -141,7 +141,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TLong implements BindCaptureEntry {
+  static final class TLong implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final long value;
@@ -162,7 +162,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TFloat implements BindCaptureEntry {
+  static final class TFloat implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final float value;
@@ -183,7 +183,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TDouble implements BindCaptureEntry {
+  static final class TDouble implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final double value;
@@ -204,7 +204,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TBigDecimal implements BindCaptureEntry {
+  static final class TBigDecimal implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final BigDecimal value;
@@ -226,7 +226,7 @@ class BindCaptureTypes {
   }
 
 
-  static class TString implements BindCaptureEntry {
+  static final class TString implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final String value;
@@ -247,7 +247,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TDate implements BindCaptureEntry {
+  static final class TDate implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final Date value;
@@ -268,7 +268,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TTime implements BindCaptureEntry {
+  static final class TTime implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final Time value;
@@ -289,7 +289,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TTimestamp implements BindCaptureEntry {
+  static final class TTimestamp implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final Timestamp value;
@@ -316,7 +316,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class TObject implements BindCaptureEntry {
+  static final class TObject implements BindCaptureEntry {
 
     private final int parameterIndex;
     private final Object value;
@@ -337,13 +337,12 @@ class BindCaptureTypes {
     }
   }
 
-  static class TArray implements BindCaptureEntry {
+  static final 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;
@@ -362,7 +361,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class CharacterStream implements BindCaptureEntry {
+  static final class CharacterStream implements BindCaptureEntry {
 
     private static final String dummy = "hi";
 
@@ -383,7 +382,7 @@ class BindCaptureTypes {
     }
   }
 
-  static class BinaryStream implements BindCaptureEntry {
+  static final class BinaryStream implements BindCaptureEntry {
 
     private static final byte[] dummy = "hi".getBytes(Charset.defaultCharset());
 

From 183416a6402471230a094603d1eccd291e5df84c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 20:09:02 +1200
Subject: [PATCH 404/447] #2318 - Delete unused ScalarTypeLongToTimestamp

---
 .../server/type/ScalarTypeLongToTimestamp.java       | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java
deleted file mode 100644
index 3a48dd786..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import io.ebean.config.JsonConfig;
-
-import java.sql.Timestamp;
-
-public class ScalarTypeLongToTimestamp extends ScalarTypeWrapper<Long, Timestamp> {
-
-  public ScalarTypeLongToTimestamp(JsonConfig.DateTime mode) {
-    super(Long.class, new ScalarTypeTimestamp(mode), new LongToTimestampConverter());
-  }
-}

From dde9b507ceaf60e5f070cbc8a3e47ac87af7d79a Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 20:09:27 +1200
Subject: [PATCH 405/447] #2318 - Refactor internals - final classes in type
 packages

---
 .../server/type/ScalarTypeArrayListH2.java    |  2 +-
 .../server/type/ScalarTypeArraySetH2.java     |  2 +-
 .../server/type/ScalarTypeBoolean.java        | 10 +++++-----
 .../server/type/ScalarTypeByte.java           |  2 +-
 .../server/type/ScalarTypeBytesBinary.java    |  2 +-
 .../server/type/ScalarTypeBytesBlob.java      |  2 +-
 .../server/type/ScalarTypeBytesEncrypted.java |  3 +--
 .../type/ScalarTypeBytesLongVarbinary.java    |  2 +-
 .../server/type/ScalarTypeBytesVarbinary.java |  2 +-
 .../server/type/ScalarTypeCalendar.java       |  2 +-
 .../server/type/ScalarTypeChar.java           |  2 +-
 .../server/type/ScalarTypeCharArray.java      |  2 +-
 .../server/type/ScalarTypeCidr.java           |  4 ++--
 .../server/type/ScalarTypeClass.java          |  5 +----
 .../server/type/ScalarTypeCurrency.java       |  2 +-
 .../server/type/ScalarTypeDate.java           |  2 +-
 .../server/type/ScalarTypeDayOfWeek.java      |  2 +-
 .../server/type/ScalarTypeDouble.java         |  2 +-
 .../type/ScalarTypeDurationWithNanos.java     |  2 +-
 .../type/ScalarTypeEncryptedWrapper.java      |  4 +---
 .../server/type/ScalarTypeEnumStandard.java   |  9 +++------
 .../type/ScalarTypeEnumWithMapping.java       |  2 --
 .../server/type/ScalarTypeFile.java           |  5 +----
 .../server/type/ScalarTypeFloat.java          |  2 +-
 .../server/type/ScalarTypeInet.java           |  4 ++--
 .../server/type/ScalarTypeInetAddress.java    |  2 +-
 .../type/ScalarTypeInetAddressPostgres.java   |  2 +-
 .../server/type/ScalarTypeInstant.java        |  2 +-
 .../server/type/ScalarTypeInteger.java        |  2 +-
 .../type/ScalarTypeJodaDateMidnight.java      |  2 +-
 .../server/type/ScalarTypeJodaDateTime.java   |  2 +-
 .../server/type/ScalarTypeJodaLocalDate.java  |  2 +-
 .../type/ScalarTypeJodaLocalDateTime.java     |  2 +-
 .../type/ScalarTypeJodaLocalTimeUTC.java      |  2 +-
 .../server/type/ScalarTypeJodaPeriod.java     |  2 +-
 .../server/type/ScalarTypeJsonList.java       |  2 +-
 .../server/type/ScalarTypeJsonNode.java       |  4 ++--
 .../type/ScalarTypeJsonNodePostgres.java      |  4 ++--
 .../type/ScalarTypeJsonObjectMapper.java      |  2 +-
 .../server/type/ScalarTypeLocalDate.java      |  2 +-
 .../server/type/ScalarTypeLocalDateTime.java  |  2 +-
 .../type/ScalarTypeLocalTimeWithNanos.java    |  2 +-
 .../server/type/ScalarTypeLocale.java         |  2 +-
 .../server/type/ScalarTypeLong.java           |  2 +-
 .../server/type/ScalarTypeLongVarchar.java    |  2 +-
 .../server/type/ScalarTypeMathBigInteger.java |  2 +-
 .../server/type/ScalarTypeMonth.java          |  2 +-
 .../server/type/ScalarTypeMonthDay.java       | 14 ++------------
 .../server/type/ScalarTypeOffsetDateTime.java |  4 ++--
 .../server/type/ScalarTypeOffsetTime.java     |  4 ++--
 .../server/type/ScalarTypePath.java           |  4 ++--
 .../server/type/ScalarTypePeriod.java         |  4 ++--
 .../server/type/ScalarTypePostgresHstore.java |  4 ++--
 .../server/type/ScalarTypeShort.java          |  4 ++--
 .../server/type/ScalarTypeString.java         |  2 +-
 .../server/type/ScalarTypeStringBase.java     |  2 +-
 .../server/type/ScalarTypeTime.java           |  4 ++--
 .../server/type/ScalarTypeTimeZone.java       |  4 ++--
 .../server/type/ScalarTypeTimestamp.java      |  4 ++--
 .../server/type/ScalarTypeURI.java            |  4 ++--
 .../server/type/ScalarTypeURL.java            |  4 ++--
 .../server/type/ScalarTypeUUIDBase.java       |  4 ++--
 .../server/type/ScalarTypeUUIDBinary.java     |  4 ++--
 .../server/type/ScalarTypeUUIDNative.java     |  4 ++--
 .../server/type/ScalarTypeUUIDVarchar.java    |  4 ++--
 .../server/type/ScalarTypeUtilDate.java       | 10 +++++-----
 .../server/type/ScalarTypeWrapper.java        |  3 ---
 .../server/type/ScalarTypeYear.java           |  4 ++--
 .../server/type/ScalarTypeYearMonthDate.java  |  9 +++++----
 .../server/type/ScalarTypeZoneId.java         |  4 ++--
 .../server/type/ScalarTypeZoneOffset.java     |  4 ++--
 .../server/type/ScalarTypeZonedDateTime.java  |  4 ++--
 .../server/type/SimpleAesEncryptor.java       | 19 +------------------
 .../server/type/TypeJsonManager.java          |  2 +-
 .../server/type/TypeReflectHelper.java        |  3 +--
 .../server/type/TypeResolver.java             |  6 +-----
 .../server/type/UtilDateParser.java           |  2 +-
 77 files changed, 113 insertions(+), 161 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
index f8b30a7a0..c9bc3a3f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
@@ -19,7 +19,7 @@ import static java.util.Collections.EMPTY_LIST;
  * H2 database support for DB ARRAY.
  */
 @SuppressWarnings("rawtypes")
-class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
+final class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
 
   static PlatformArrayTypeFactory factory() {
     return new ScalarTypeArrayListH2.Factory();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
index cd7f7cf98..1d5c78553 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
@@ -19,7 +19,7 @@ import static java.util.Collections.EMPTY_SET;
  * H2 database support for DB ARRAY.
  */
 @SuppressWarnings("rawtypes")
-class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
+final class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
 
   static PlatformArrayTypeFactory factory() {
     return new ScalarTypeArraySetH2.Factory();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
index 93a688e94..56bc180a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
@@ -21,9 +21,9 @@ import java.sql.Types;
  * This may or may not be a native jdbc type depending on the database and jdbc driver.
  * </p>
  */
-public class ScalarTypeBoolean {
+public final class ScalarTypeBoolean {
 
-  public static class Native extends BooleanBase {
+  public static final class Native extends BooleanBase {
 
     /**
      * Native Boolean database type.
@@ -75,7 +75,7 @@ public class ScalarTypeBoolean {
    * type.boolean.dbtype="bit" in the ebean configuration
    * </p>
    */
-  static class BitBoolean extends BooleanBase {
+  static final class BitBoolean extends BooleanBase {
 
     /**
      * Native Boolean database type.
@@ -124,7 +124,7 @@ public class ScalarTypeBoolean {
   /**
    * Converted to/from an Integer in the Database.
    */
-  static class IntBoolean extends BooleanBase {
+  static final class IntBoolean extends BooleanBase {
 
     private final Integer trueValue;
     private final Integer falseValue;
@@ -211,7 +211,7 @@ public class ScalarTypeBoolean {
   /**
    * Converted to/from an Integer in the Database.
    */
-  static class StringBoolean extends BooleanBase {
+  static final class StringBoolean extends BooleanBase {
 
     private final String trueValue;
     private final String falseValue;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
index 5d0660930..3a64f421f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
@@ -18,7 +18,7 @@ import java.sql.Types;
 /**
  * ScalarType for Byte.
  */
-public class ScalarTypeByte extends ScalarTypeBase<Byte> {
+public final class ScalarTypeByte extends ScalarTypeBase<Byte> {
 
   public ScalarTypeByte() {
     super(Byte.class, true, Types.TINYINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
index 8567c808f..18cdb096e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for Types.BINARY to byte[].
  */
-public class ScalarTypeBytesBinary extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesBinary extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesBinary() {
     super(true, Types.BINARY);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
index 5ad02618f..5cc3e2afc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for BLOB.
  */
-public class ScalarTypeBytesBlob extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesBlob extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesBlob() {
     super(true, Types.BLOB);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index 9b81acfde..df8b32ba9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -16,10 +16,9 @@ import java.sql.SQLException;
 /**
  * Encrypted ScalarType that wraps a byte[] types.
  */
-public class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
+public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
 
   private final ScalarTypeBytesBase baseType;
-
   private final DataEncryptSupport dataEncryptSupport;
 
   public ScalarTypeBytesEncrypted(ScalarTypeBytesBase baseType, DataEncryptSupport dataEncryptSupport) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
index 8d1b87cf9..fef593e12 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for Longvarbinary.
  */
-public class ScalarTypeBytesLongVarbinary extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesLongVarbinary extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesLongVarbinary() {
     super(true, Types.LONGVARBINARY);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
index 3e9b68790..dea5cc1a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for Types.VARBINARY to byte[].
  */
-public class ScalarTypeBytesVarbinary extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesVarbinary extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesVarbinary() {
     super(true, Types.VARBINARY);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index c0c67e7f8..bbefa5a83 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -16,7 +16,7 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.util.Calendar.
  */
-public class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
+public final class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
 
   public ScalarTypeCalendar(JsonConfig.DateTime mode, int jdbcType) {
     super(mode, Calendar.class, false, jdbcType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
index 509506298..f5fe00954 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
@@ -10,7 +10,7 @@ import java.sql.Types;
 /**
  * ScalarType for char.
  */
-public class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
+public final class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
 
   public ScalarTypeChar() {
     super(char.class, false, Types.VARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
index dedb38838..ebfd69a6f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -13,7 +13,7 @@ import java.sql.Types;
 /**
  * ScalarType for char[].
  */
-public class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
+public final class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
 
   public ScalarTypeCharArray() {
     super(char[].class, false, Types.VARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
index 1d303a157..390ac22c7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
@@ -42,7 +42,7 @@ public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cidr to Varchar.
    */
-  public static class Varchar extends ScalarTypeCidr {
+  public static final class Varchar extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBinder binder, Cidr value) throws SQLException {
@@ -57,7 +57,7 @@ public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cidr to Postgres CIDR.
    */
-  public static class Postgres extends ScalarTypeCidr {
+  public static final class Postgres extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBinder binder, Cidr value) throws SQLException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
index 112e08459..78f4a19de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
@@ -4,12 +4,9 @@ import javax.persistence.PersistenceException;
 
 /**
  * ScalarType for Class that persists it to VARCHAR column.
- *
- * @author emcgreal
- * @author rbygrave
  */
 @SuppressWarnings({"rawtypes"})
-public class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {
+public final class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {
 
   public ScalarTypeClass() {
     super(Class.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
index 6ed58b133..0eaeb8602 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
@@ -5,7 +5,7 @@ import java.util.Currency;
 /**
  * ScalarType for java.util.Currency which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeCurrency extends ScalarTypeBaseVarchar<Currency> {
+public final class ScalarTypeCurrency extends ScalarTypeBaseVarchar<Currency> {
 
   public ScalarTypeCurrency() {
     super(Currency.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
index b9d49586f..b69571c11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
@@ -12,7 +12,7 @@ import java.sql.Types;
 /**
  * ScalarType for java.sql.Date.
  */
-public class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
+public final class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
 
   public ScalarTypeDate(JsonConfig.Date mode) {
     super(mode, Date.class, true, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
index 39c8ada61..1cee17865 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
@@ -11,7 +11,7 @@ import java.time.DayOfWeek;
 /**
  * ScalarType mapping for Month enum.
  */
-public class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
+public final class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
 
   static final EnumToDbIntegerMap beanDbMap = new EnumToDbIntegerMap();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 14f825413..02adb9de8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * ScalarType for Double and double.
  */
-public class ScalarTypeDouble extends ScalarTypeBase<Double> {
+public final class ScalarTypeDouble extends ScalarTypeBase<Double> {
 
   public ScalarTypeDouble() {
     super(Double.class, true, Types.DOUBLE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
index faeca10a5..2f99708b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
@@ -15,7 +15,7 @@ import java.time.Duration;
  * Stored in the DB as DECIMAL value.
  * </p>
  */
-public class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
+public final class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
 
   public ScalarTypeDurationWithNanos() {
     super(Types.DECIMAL);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index ba9a44b20..1a552d11a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -12,12 +12,10 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.sql.SQLException;
 
-public class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, LocalEncryptedType {
+public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, LocalEncryptedType {
 
   private final ScalarType<T> wrapped;
-
   private final DataEncryptSupport dataEncryptSupport;
-
   private final ScalarTypeBytesBase byteArrayType;
 
   public ScalarTypeEncryptedWrapper(ScalarType<T> wrapped, ScalarTypeBytesBase byteArrayType, DataEncryptSupport dataEncryptSupport) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index 4c8a5e645..dcdc8d42a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -28,10 +28,10 @@ import java.util.Set;
  * Ebean specific @EnumMapping.
  * </p>
  */
-public class ScalarTypeEnumStandard {
+public final class ScalarTypeEnumStandard {
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public static class StringEnum extends EnumBase implements ScalarTypeEnum {
+  public static final class StringEnum extends EnumBase implements ScalarTypeEnum {
 
     private final int length;
 
@@ -63,15 +63,12 @@ public class ScalarTypeEnumStandard {
     }
 
     private int maxValueLength(Class<?> enumType) {
-
       int maxLen = 0;
-
       Object[] ea = enumType.getEnumConstants();
       for (Object anEa : ea) {
         Enum<?> e = (Enum<?>) anEa;
         maxLen = Math.max(maxLen, e.name().length());
       }
-
       return maxLen;
     }
 
@@ -120,7 +117,7 @@ public class ScalarTypeEnumStandard {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public static class OrdinalEnum extends EnumBase implements ScalarTypeEnum {
+  public static final class OrdinalEnum extends EnumBase implements ScalarTypeEnum {
 
     private final Object[] enumArray;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
index 598889f49..6960d4d09 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
@@ -17,9 +17,7 @@ import java.util.Set;
 public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase implements ScalarType, ScalarTypeEnum {
 
   private final EnumToDbValueMap beanDbMap;
-
   private final int length;
-
   private final boolean withConstraint;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index 4dfa68a24..d6f694672 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -25,16 +25,13 @@ import java.sql.Types;
 /**
  * ScalarType for streaming between a File and the database.
  */
-public class ScalarTypeFile extends ScalarTypeBase<File> {
+public final class ScalarTypeFile extends ScalarTypeBase<File> {
 
   private static final Logger logger = LoggerFactory.getLogger(ScalarTypeFile.class);
 
   private final String prefix;
-
   private final String suffix;
-
   private final File directory;
-
   private final int bufferSize;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index e9f8e1306..d468b74ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * ScalarType for Float and float.
  */
-public class ScalarTypeFloat extends ScalarTypeBase<Float> {
+public final class ScalarTypeFloat extends ScalarTypeBase<Float> {
 
   public ScalarTypeFloat() {
     super(Float.class, true, Types.REAL);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
index 9252afe6e..9a7b884f4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -42,7 +42,7 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
   /**
    * Inet to Varchar.
    */
-  public static class Varchar extends ScalarTypeInet {
+  public static final class Varchar extends ScalarTypeInet {
 
     Varchar() {
       super(Types.VARCHAR);
@@ -61,7 +61,7 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
   /**
    * Inet to Postgres INET.
    */
-  public static class Postgres extends ScalarTypeInet {
+  public static final class Postgres extends ScalarTypeInet {
 
     Postgres() {
       super(ExtraDbTypes.INET);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
index 1de5e1db7..419f52cd3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
@@ -7,7 +7,7 @@ import java.net.InetAddress;
 /**
  * ScalarType for java.net.URI which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
+public final class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
 
   public ScalarTypeInetAddress() {
     super(InetAddress.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
index 086f4fd45..aba3aa4c9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
@@ -11,7 +11,7 @@ import java.sql.Types;
 /**
  * ScalarType for InetAddress to Postgres INET.
  */
-public class ScalarTypeInetAddressPostgres extends ScalarTypeBaseVarchar<InetAddress> {
+public final class ScalarTypeInetAddressPostgres extends ScalarTypeBaseVarchar<InetAddress> {
 
   public ScalarTypeInetAddressPostgres() {
     super(InetAddress.class, false, ExtraDbTypes.INET);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
index dd78f4a65..0d84af6e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
@@ -9,7 +9,7 @@ import java.time.Instant;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
+public final class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
 
   public ScalarTypeInstant(JsonConfig.DateTime mode) {
     super(mode, Instant.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 0d343d05b..cae0de91b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -17,7 +17,7 @@ import java.sql.Types;
 /**
  * ScalarType for Integer and int.
  */
-public class ScalarTypeInteger extends ScalarTypeBase<Integer> {
+public final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
 
   public static ScalarTypeInteger INSTANCE = new ScalarTypeInteger();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
index bebd64de7..c108b99f1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
@@ -11,7 +11,7 @@ import java.sql.Types;
  * ScalarType for Joda DateMidnight. This maps to a JDBC Date.
  */
 @SuppressWarnings("deprecation")
-public class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
+public final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
 
   /**
    * Instantiates a new scalar type joda date midnight.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
index f8d9816ae..2ca296ed0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
@@ -11,7 +11,7 @@ import java.time.Instant;
 /**
  * ScalarType for Joda DateTime. This maps to a JDBC Timestamp.
  */
-public class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime<DateTime> {
+public final class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime<DateTime> {
 
   public ScalarTypeJodaDateTime(JsonConfig.DateTime mode) {
     super(mode, DateTime.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index 4727f1d58..09acb797e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -11,7 +11,7 @@ import java.sql.Types;
 /**
  * ScalarType for Joda LocalDate. This maps to a JDBC Date.
  */
-public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
+public final class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
   public ScalarTypeJodaLocalDate(JsonConfig.Date mode) {
     super(mode, LocalDate.class, false, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
index bb5db7e37..5d537dc9c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
@@ -11,7 +11,7 @@ import java.time.Instant;
 /**
  * ScalarType for Joda LocalDateTime. This maps to a JDBC Timestamp.
  */
-public class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
+public final class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
 
   public ScalarTypeJodaLocalDateTime(JsonConfig.DateTime mode) {
     super(mode, LocalDateTime.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
index 1cf2656a0..4de3c513a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
@@ -13,7 +13,7 @@ import java.sql.Types;
 /**
  * ScalarType for Joda LocalTime. This maps to a JDBC Time.
  */
-public class ScalarTypeJodaLocalTimeUTC extends ScalarTypeJodaLocalTime {
+public final class ScalarTypeJodaLocalTimeUTC extends ScalarTypeJodaLocalTime {
 
   public ScalarTypeJodaLocalTimeUTC() {
     super();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
index 5d3e3ee4e..2dc09a233 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
@@ -5,7 +5,7 @@ import org.joda.time.Period;
 /**
  * ScalarType for Joda Period stored as DB VARCHAR
  */
-public class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
+public final class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
 
   public ScalarTypeJodaPeriod() {
     super(Period.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index d3c700443..71179dba7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * Types for mapping List in JSON format to DB types VARCHAR, JSON and JSONB.
  */
-class ScalarTypeJsonList {
+final class ScalarTypeJsonList {
 
   /**
    * Return the appropriate ScalarType based requested dbType and if Postgres.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
index 5ff3ef99a..9c3950b94 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -27,7 +27,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   /**
    * Clob storage based implementation.
    */
-  public static class Clob extends ScalarTypeJsonNode {
+  public static final class Clob extends ScalarTypeJsonNode {
 
     public Clob(ObjectMapper objectMapper) {
       super(objectMapper, Types.CLOB);
@@ -46,7 +46,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   /**
    * Varchar storage based implementation.
    */
-  public static class Varchar extends ScalarTypeJsonNode {
+  public static final class Varchar extends ScalarTypeJsonNode {
 
     public Varchar(ObjectMapper objectMapper) {
       super(objectMapper, Types.VARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
index f24178aab..94d46a67d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
@@ -31,7 +31,7 @@ public abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
   /**
    * ScalarType mapping JsonNode to Postgres JSON database type.
    */
-  public static class JSON extends ScalarTypeJsonNodePostgres {
+  public static final class JSON extends ScalarTypeJsonNodePostgres {
 
     public JSON(ObjectMapper objectMapper) {
       super(objectMapper, DbPlatformType.JSON, PostgresHelper.JSON_TYPE);
@@ -41,7 +41,7 @@ public abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
   /**
    * ScalarType mapping JsonNode to Postgres JSONB database type.
    */
-  public static class JSONB extends ScalarTypeJsonNodePostgres {
+  public static final class JSONB extends ScalarTypeJsonNodePostgres {
 
     public JSONB(ObjectMapper objectMapper) {
       super(objectMapper, DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 65cb88cdc..5cda3f921 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -25,7 +25,7 @@ import java.sql.Types;
 /**
  * Supports @DbJson properties using Jackson ObjectMapper.
  */
-class ScalarTypeJsonObjectMapper {
+final class ScalarTypeJsonObjectMapper {
 
   /**
    * Create and return the appropriate ScalarType.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index eca6102fa..4fd228459 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -13,7 +13,7 @@ import java.time.ZonedDateTime;
 /**
  * ScalarType for java.time.LocalDate. This maps to a JDBC Date.
  */
-public class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
+public final class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
   public ScalarTypeLocalDate(JsonConfig.Date mode) {
     super(mode, LocalDate.class, false, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 12b884e82..e03c67898 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -14,7 +14,7 @@ import java.time.ZoneId;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
+public final class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
 
   public ScalarTypeLocalDateTime(JsonConfig.DateTime mode) {
     super(mode, LocalDateTime.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
index 0633fe19c..2a86abbfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
@@ -11,7 +11,7 @@ import java.time.LocalTime;
 /**
  * ScalarType for java.time.LocalTime stored with Nanos as DB BIGINT type.
  */
-public class ScalarTypeLocalTimeWithNanos extends ScalarTypeLocalTime {
+public final class ScalarTypeLocalTimeWithNanos extends ScalarTypeLocalTime {
 
   public ScalarTypeLocalTimeWithNanos() {
     super(Types.BIGINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
index 438ddaf6a..cc1a4c166 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
@@ -5,7 +5,7 @@ import java.util.Locale;
 /**
  * ScalarType for java.util.Currency which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeLocale extends ScalarTypeBaseVarchar<Locale> {
+public final class ScalarTypeLocale extends ScalarTypeBaseVarchar<Locale> {
 
   public ScalarTypeLocale() {
     super(Locale.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index 26c272f54..697e84376 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * ScalarType for Long and long.
  */
-public class ScalarTypeLong extends ScalarTypeBase<Long> {
+public final class ScalarTypeLong extends ScalarTypeBase<Long> {
 
   public ScalarTypeLong() {
     super(Long.class, true, Types.BIGINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
index 9bde5947f..9dd621d36 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
@@ -5,7 +5,7 @@ import java.sql.Types;
 /**
  * ScalarType for String.
  */
-public class ScalarTypeLongVarchar extends ScalarTypeClob {
+public final class ScalarTypeLongVarchar extends ScalarTypeClob {
 
   public ScalarTypeLongVarchar() {
     super(true, Types.LONGVARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index bb101706f..3c5b99255 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -17,7 +17,7 @@ import java.sql.Types;
 /**
  * ScalarType for java.math.BigInteger.
  */
-public class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
+public final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
 
   public ScalarTypeMathBigInteger() {
     super(BigInteger.class, false, Types.BIGINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
index 2707c88f1..a04925ebc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
@@ -11,7 +11,7 @@ import java.time.Month;
 /**
  * ScalarType mapping for Month enum.
  */
-public class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
+public final class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
 
   static final EnumToDbIntegerMap beanDbMap = new EnumToDbIntegerMap();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
index acebb04e9..eb26a84b9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
@@ -21,24 +21,14 @@ import java.time.MonthDay;
  * Note that the year used should be a leap year.
  * </p>
  */
-public class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
-
-  protected final int year;
-
-  /**
-   * Construct with a year of 2000 (which is a leap year).
-   */
-  public ScalarTypeMonthDay() {
-    this(2000); // Year 2000 is a leap year
-  }
+final class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
 
   /**
    * Construct with a base year. The year should be a leap year to
    * allow the 29th Feb value.
    */
-  public ScalarTypeMonthDay(int year) {
+  ScalarTypeMonthDay() {
     super(MonthDay.class, false, Types.DATE);
-    this.year = year;
   }
 
   private MonthDay convertFromDate(Date ts) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
index b68f3eba9..f7e151238 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
@@ -13,11 +13,11 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateTime> {
+final class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateTime> {
 
   private final ZoneId zoneId;
 
-  public ScalarTypeOffsetDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
+  ScalarTypeOffsetDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
     super(mode, OffsetDateTime.class, false, Types.TIMESTAMP);
     this.zoneId = zoneId;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
index 2cb3a6f35..e1f241b51 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
@@ -5,9 +5,9 @@ import java.time.OffsetTime;
 /**
  * ScalarType for java.time.OffsetTime stored as DB VARCHAR
  */
-public class ScalarTypeOffsetTime extends ScalarTypeBaseVarchar<OffsetTime> {
+final class ScalarTypeOffsetTime extends ScalarTypeBaseVarchar<OffsetTime> {
 
-  public ScalarTypeOffsetTime() {
+  ScalarTypeOffsetTime() {
     super(OffsetTime.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
index c5ca8951d..a5e318881 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
@@ -8,9 +8,9 @@ import java.nio.file.Paths;
 /**
  * ScalarType for java.nio.file.Path which converts to and from a VARCHAR database column.
  */
-public class ScalarTypePath extends ScalarTypeBaseVarchar<Path> {
+final class ScalarTypePath extends ScalarTypeBaseVarchar<Path> {
 
-  public ScalarTypePath() {
+  ScalarTypePath() {
     super(Path.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
index 573ba6e5c..9b0175173 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
@@ -5,9 +5,9 @@ import java.time.Period;
 /**
  * ScalarType for Joda Period stored as DB VARCHAR
  */
-public class ScalarTypePeriod extends ScalarTypeBaseVarchar<Period> {
+final class ScalarTypePeriod extends ScalarTypeBaseVarchar<Period> {
 
-  public ScalarTypePeriod() {
+  ScalarTypePeriod() {
     super(Period.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
index 14d2c50d3..69b3d8a5b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
@@ -20,9 +20,9 @@ import java.util.Map;
  * Postgres Hstore type which maps Map<String,String> to a single 'HStore column' in the DB.
  */
 @SuppressWarnings("rawtypes")
-public class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
+final class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
 
-  public ScalarTypePostgresHstore() {
+  ScalarTypePostgresHstore() {
     super(Map.class, false, DbPlatformType.HSTORE);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
index 43d7dac80..b3205b747 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
@@ -17,9 +17,9 @@ import java.sql.Types;
 /**
  * ScalarType for Short and short.
  */
-public class ScalarTypeShort extends ScalarTypeBase<Short> {
+final class ScalarTypeShort extends ScalarTypeBase<Short> {
 
-  public ScalarTypeShort() {
+  ScalarTypeShort() {
     super(Short.class, true, Types.SMALLINT);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
index 3ee87d9d9..d57bf253b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
@@ -5,7 +5,7 @@ import java.sql.Types;
 /**
  * ScalarType for String.
  */
-public class ScalarTypeString extends ScalarTypeStringBase {
+public final class ScalarTypeString extends ScalarTypeStringBase {
 
   public static final ScalarTypeString INSTANCE = new ScalarTypeString();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index 50b0d980d..d0ea5a278 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * Base ScalarType for String type using Varchar, Clob and LongVarchar.
  */
-public abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
+abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
 
   ScalarTypeStringBase(boolean jdbcNative, int jdbcType) {
     super(String.class, jdbcNative, jdbcType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index 4664d79ed..8328edfbe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -17,9 +17,9 @@ import java.sql.Types;
 /**
  * ScalarType for java.sql.Time.
  */
-public class ScalarTypeTime extends ScalarTypeBase<Time> {
+final class ScalarTypeTime extends ScalarTypeBase<Time> {
 
-  public ScalarTypeTime() {
+  ScalarTypeTime() {
     super(Time.class, true, Types.TIME);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
index 17acc14c0..b059d2e31 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
@@ -5,9 +5,9 @@ import java.util.TimeZone;
 /**
  * ScalarType for java.util.TimeZone which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeTimeZone extends ScalarTypeBaseVarchar<TimeZone> {
+final class ScalarTypeTimeZone extends ScalarTypeBaseVarchar<TimeZone> {
 
-  public ScalarTypeTimeZone() {
+  ScalarTypeTimeZone() {
     super(TimeZone.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
index 92db17b5d..a99b8cc56 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
@@ -15,9 +15,9 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeTimestamp extends ScalarTypeBaseDateTime<Timestamp> {
+final class ScalarTypeTimestamp extends ScalarTypeBaseDateTime<Timestamp> {
 
-  public ScalarTypeTimestamp(JsonConfig.DateTime mode) {
+  ScalarTypeTimestamp(JsonConfig.DateTime mode) {
     super(mode, Timestamp.class, true, Types.TIMESTAMP);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
index 3e3a67146..f7c9bcc81 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
@@ -8,9 +8,9 @@ import java.net.URISyntaxException;
 /**
  * ScalarType for java.net.URI which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeURI extends ScalarTypeBaseVarchar<URI> {
+final class ScalarTypeURI extends ScalarTypeBaseVarchar<URI> {
 
-  public ScalarTypeURI() {
+  ScalarTypeURI() {
     super(URI.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
index 577c20b19..c93cd2a38 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
@@ -8,9 +8,9 @@ import java.net.URL;
 /**
  * ScalarType for java.net.URL which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeURL extends ScalarTypeBaseVarchar<URL> {
+final class ScalarTypeURL extends ScalarTypeBaseVarchar<URL> {
 
-  public ScalarTypeURL() {
+  ScalarTypeURL() {
     super(URL.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index 28ea7c879..abf91811b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -14,9 +14,9 @@ import java.util.UUID;
 /**
  * Base UUID type for string formatting, json handling etc.
  */
-public abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> implements ScalarTypeLogicalType {
+abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> implements ScalarTypeLogicalType {
 
-  public ScalarTypeUUIDBase(boolean jdbcNative, int jdbcType) {
+  ScalarTypeUUIDBase(boolean jdbcNative, int jdbcType) {
     super(UUID.class, jdbcNative, jdbcType);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
index c94b73d67..078d51a12 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
@@ -8,11 +8,11 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.UUID;
 
-public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
+public final class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
 
   private final boolean optimized;
 
-  protected ScalarTypeUUIDBinary(boolean optimized) {
+  ScalarTypeUUIDBinary(boolean optimized) {
     super(false, Types.BINARY);
     this.optimized = optimized;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
index cbbc63d27..73e375b3b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
@@ -10,9 +10,9 @@ import java.util.UUID;
 /**
  * Postgres Hstore type which maps Map<String,String> to a single 'HStore column' in the DB.
  */
-public class ScalarTypeUUIDNative extends ScalarTypeUUIDBase {
+final class ScalarTypeUUIDNative extends ScalarTypeUUIDBase {
 
-  public ScalarTypeUUIDNative() {
+  ScalarTypeUUIDNative() {
     super(false, DbPlatformType.UUID);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
index aaba1c713..19a9e0829 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
@@ -10,9 +10,9 @@ import java.util.UUID;
 /**
  * ScalarType for java.util.UUID which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeUUIDVarchar extends ScalarTypeUUIDBase {
+final class ScalarTypeUUIDVarchar extends ScalarTypeUUIDBase {
 
-  protected ScalarTypeUUIDVarchar() {
+  ScalarTypeUUIDVarchar() {
     super(false, Types.VARCHAR);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 711992a08..3a816d498 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -16,11 +16,11 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.util.Date.
  */
-public class ScalarTypeUtilDate {
+final class ScalarTypeUtilDate {
 
-  public static class TimestampType extends ScalarTypeBaseDateTime<java.util.Date> {
+  static final class TimestampType extends ScalarTypeBaseDateTime<java.util.Date> {
 
-    public TimestampType(JsonConfig.DateTime mode) {
+    TimestampType(JsonConfig.DateTime mode) {
       super(mode, java.util.Date.class, false, Types.TIMESTAMP);
     }
 
@@ -89,9 +89,9 @@ public class ScalarTypeUtilDate {
     }
   }
 
-  public static class DateType extends ScalarTypeBaseDate<java.util.Date> {
+  static final class DateType extends ScalarTypeBaseDate<java.util.Date> {
 
-    public DateType(JsonConfig.Date mode) {
+    DateType(JsonConfig.Date mode) {
       super(mode, Date.class, false, Types.DATE);
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index 1ef378e03..1ce79bec0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -26,11 +26,8 @@ import java.sql.SQLException;
 public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
 
   private final ScalarType<S> scalarType;
-
   private final ScalarTypeConverter<B, S> converter;
-
   private final Class<B> wrapperType;
-
   private final B nullValue;
 
   public ScalarTypeWrapper(Class<B> wrapperType, ScalarType<S> scalarType, ScalarTypeConverter<B, S> converter) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
index d9b35fad5..c515de0e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
@@ -18,9 +18,9 @@ import java.time.Year;
 /**
  * ScalarType for java.time.Year
  */
-public class ScalarTypeYear extends ScalarTypeBase<Year> {
+final class ScalarTypeYear extends ScalarTypeBase<Year> {
 
-  public ScalarTypeYear() {
+  ScalarTypeYear() {
     super(Year.class, false, Types.INTEGER);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index 35b6683fd..e7ee97287 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -14,21 +14,22 @@ import java.time.ZonedDateTime;
 /**
  * ScalarType for java.time.LocalDate. This maps to a JDBC Date.
  */
-public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
+final class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
 
-  public ScalarTypeYearMonthDate(JsonConfig.Date mode) {
+  ScalarTypeYearMonthDate(JsonConfig.Date mode) {
     super(mode, YearMonth.class, false, Types.DATE);
   }
 
+  @Override
   protected String toIsoFormat(YearMonth value) {
     return value.atDay(1).toString();
   }
 
-  protected LocalDate toLocalDate(YearMonth yearMonth) {
+  LocalDate toLocalDate(YearMonth yearMonth) {
     return yearMonth.atDay(1);
   }
 
-  protected YearMonth fromLocalDate(LocalDate localDate) {
+  YearMonth fromLocalDate(LocalDate localDate) {
     return YearMonth.of(localDate.getYear(), localDate.getMonth());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
index 01a0c61d0..482752494 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
@@ -5,9 +5,9 @@ import java.time.ZoneId;
 /**
  * ScalarType for java.time.OffsetTime stored as DB VARCHAR
  */
-public class ScalarTypeZoneId extends ScalarTypeBaseVarchar<ZoneId> {
+final class ScalarTypeZoneId extends ScalarTypeBaseVarchar<ZoneId> {
 
-  public ScalarTypeZoneId() {
+  ScalarTypeZoneId() {
     super(ZoneId.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
index 420cf1ce6..613b25c2d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
@@ -5,9 +5,9 @@ import java.time.ZoneOffset;
 /**
  * ScalarType for java.time.OffsetTime stored as DB VARCHAR
  */
-public class ScalarTypeZoneOffset extends ScalarTypeBaseVarchar<ZoneOffset> {
+final class ScalarTypeZoneOffset extends ScalarTypeBaseVarchar<ZoneOffset> {
 
-  public ScalarTypeZoneOffset() {
+  ScalarTypeZoneOffset() {
     super(ZoneOffset.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
index 12e13cdfa..533489e6f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
@@ -11,11 +11,11 @@ import java.time.ZonedDateTime;
 /**
  * ScalarType for ZonedDateTime.
  */
-public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTime> {
+final class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTime> {
 
   private final ZoneId zoneId;
 
-  public ScalarTypeZonedDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
+  ScalarTypeZonedDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
     super(mode, ZonedDateTime.class, false, Types.TIMESTAMP);
     this.zoneId = zoneId;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
index 28d661591..0dfd3f999 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
@@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets;
 /**
  * Simple AES based encryption and decryption.
  */
-public class SimpleAesEncryptor implements Encryptor {
+public final class SimpleAesEncryptor implements Encryptor {
 
   private static final String AES_CIPHER = "AES/CBC/PKCS5Padding";
 
@@ -21,7 +21,6 @@ public class SimpleAesEncryptor implements Encryptor {
   }
 
   private String paddKey(EncryptKey encryptKey) {
-
     String key = encryptKey.getStringValue();
     int addChars = 16 - key.length();
     if (addChars < 0) {
@@ -38,25 +37,18 @@ public class SimpleAesEncryptor implements Encryptor {
 
   @Override
   public byte[] decrypt(byte[] data, EncryptKey encryptKey) {
-
     if (data == null) {
       return null;
     }
-
     String key = paddKey(encryptKey);
-
     try {
-
       byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
       IvParameterSpec iv = getIvParameterSpec(key);
-
       SecretKeySpec sks = new SecretKeySpec(keyBytes, "AES");
       Cipher c = Cipher.getInstance(AES_CIPHER);
 
       c.init(Cipher.DECRYPT_MODE, sks, iv);
-
       return c.doFinal(data);
-
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -64,24 +56,17 @@ public class SimpleAesEncryptor implements Encryptor {
 
   @Override
   public byte[] encrypt(byte[] data, EncryptKey encryptKey) {
-
     if (data == null) {
       return null;
     }
-
     String key = paddKey(encryptKey);
-
     try {
       byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
       IvParameterSpec iv = getIvParameterSpec(key);
-
       SecretKeySpec sks = new SecretKeySpec(keyBytes, "AES");
       Cipher c = Cipher.getInstance(AES_CIPHER);
-
       c.init(Cipher.ENCRYPT_MODE, sks, iv);
-
       return c.doFinal(data);
-
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -92,14 +77,12 @@ public class SimpleAesEncryptor implements Encryptor {
     if (data == null) {
       return null;
     }
-
     byte[] bytes = decrypt(data, key);
     return new String(bytes, StandardCharsets.UTF_8);
   }
 
   @Override
   public byte[] encryptString(String valueFormatValue, EncryptKey key) {
-
     if (valueFormatValue == null) {
       return null;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
index 989ba2729..6660a9f39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
@@ -5,7 +5,7 @@ import io.ebean.ModifyAwareType;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.config.dbplatform.DbPlatformType;
 
-class TypeJsonManager {
+final class TypeJsonManager {
 
   private final boolean postgres;
   private final ObjectMapper objectMapper;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
index 663d18f00..25177d7df 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
@@ -4,7 +4,7 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
 
-public class TypeReflectHelper {
+public final class TypeReflectHelper {
 
   public static Class<?>[] getParams(Class<?> cls, Class<?> matchRawType) {
     return TypeResolver.resolveRawArgs(matchRawType, cls);
@@ -46,7 +46,6 @@ public class TypeReflectHelper {
   }
 
   private static Class<?> getClass(Type type) {
-
     while (true) {
       if (type instanceof ParameterizedType) {
         type = ((ParameterizedType) type).getRawType();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
index 2fecd6a4b..873984ba0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
@@ -15,7 +15,7 @@ import java.util.Map;
  *
  * It is a cut down version removing the lambda support and related sun.misc.Unsafe use etc.
  */
-class TypeResolver {
+final class TypeResolver {
 
   /** An unknown type. */
   private static final class Unknown {
@@ -137,9 +137,7 @@ class TypeResolver {
   }
 
   private static Map<TypeVariable<?>, Type> getTypeVariableMap(final Class<?> targetType) {
-
     Map<TypeVariable<?>, Type> map = new HashMap<>();
-
     // Populate interfaces
     populateSuperTypeArgs(targetType.getGenericInterfaces(), map);
 
@@ -173,7 +171,6 @@ 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) {
-
     for (Type type : types) {
       if (type instanceof ParameterizedType) {
         ParameterizedType parameterizedType = (ParameterizedType) type;
@@ -195,7 +192,6 @@ class TypeResolver {
     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) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
index a420f7ecc..4ad7722c8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
@@ -4,7 +4,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-class UtilDateParser {
+final class UtilDateParser {
 
   private static final SimpleDateFormat dateTimeProto = new SimpleDateFormat("yyyy-MM-dd");
 

From 7521cb530ec80ac29f60aeeb12057265e0b3c7cd Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 20:48:15 +1200
Subject: [PATCH 406/447] #2318 - Refactor internals - final classes in type
 packages

---
 .../server/deploy/BeanDescriptorManager.java  | 42 +++--------------
 .../server/deploy/parse/AnnotationFields.java | 46 -------------------
 .../server/type/ConvertInetAddresses.java     |  2 +-
 .../server/type/DecimalUtils.java             | 18 ++++----
 .../server/type/DefaultTypeFactory.java       |  2 +-
 .../server/type/DefaultTypeManager.java       |  2 +-
 .../server/type/EnumToDbIntegerMap.java       |  2 +-
 .../server/type/EnumToDbStringMap.java        |  2 +-
 .../server/type/EnumToDbValueMap.java         | 10 ++--
 .../server/type/LongToTimestampConverter.java | 24 ----------
 .../server/type/PostgresHelper.java           |  6 +--
 .../server/type/ScalarTypeArrayList.java      |  2 +-
 .../server/type/ScalarTypeArraySet.java       |  2 +-
 .../server/type/ScalarTypeBase.java           |  6 +--
 .../server/type/ScalarTypeBaseDate.java       |  2 +-
 .../server/type/ScalarTypeBaseDateTime.java   |  4 +-
 .../server/type/ScalarTypeBaseVarchar.java    |  6 +--
 .../server/type/ScalarTypeBigDecimal.java     |  4 +-
 .../server/type/ScalarTypeByte.java           |  2 +-
 .../server/type/ScalarTypeBytesBase.java      |  2 +-
 .../server/type/ScalarTypeBytesBinary.java    |  4 +-
 .../server/type/ScalarTypeBytesBlob.java      |  4 +-
 .../type/ScalarTypeBytesLongVarbinary.java    |  4 +-
 .../server/type/ScalarTypeBytesVarbinary.java |  4 +-
 .../server/type/ScalarTypeCalendar.java       |  4 +-
 .../server/type/ScalarTypeChar.java           |  4 +-
 .../server/type/ScalarTypeCharArray.java      |  4 +-
 .../server/type/ScalarTypeCidr.java           |  6 +--
 .../server/type/ScalarTypeClass.java          |  2 +-
 .../server/type/ScalarTypeClob.java           |  4 +-
 .../server/type/ScalarTypeCurrency.java       |  4 +-
 .../server/type/ScalarTypeDate.java           |  4 +-
 .../server/type/ScalarTypeDayOfWeek.java      |  4 +-
 .../server/type/ScalarTypeDouble.java         |  4 +-
 .../server/type/ScalarTypeDuration.java       | 10 ++--
 .../type/ScalarTypeDurationWithNanos.java     |  4 +-
 .../server/type/ScalarTypeEnumStandard.java   | 14 +++---
 .../type/ScalarTypeEnumWithMapping.java       |  6 +--
 .../server/type/ScalarTypeFile.java           |  9 ++--
 .../server/type/ScalarTypeFloat.java          |  4 +-
 .../server/type/ScalarTypeInet.java           |  2 +-
 .../server/type/ScalarTypeInetAddress.java    |  4 +-
 .../type/ScalarTypeInetAddressPostgres.java   |  4 +-
 .../server/type/ScalarTypeInstant.java        |  4 +-
 .../server/type/ScalarTypeInteger.java        |  6 +--
 .../type/ScalarTypeJodaDateMidnight.java      |  4 +-
 .../server/type/ScalarTypeJodaDateTime.java   |  4 +-
 .../server/type/ScalarTypeJodaLocalDate.java  |  4 +-
 .../type/ScalarTypeJodaLocalDateTime.java     |  4 +-
 .../server/type/ScalarTypeJodaLocalTime.java  |  4 +-
 .../type/ScalarTypeJodaLocalTimeUTC.java      |  4 +-
 .../server/type/ScalarTypeJodaPeriod.java     |  4 +-
 .../server/type/ScalarTypeJsonNode.java       | 14 +++---
 .../type/ScalarTypeJsonNodePostgres.java      |  7 ++-
 .../server/type/ScalarTypeLocalDate.java      |  4 +-
 .../server/type/ScalarTypeLocalDateTime.java  |  4 +-
 .../server/type/ScalarTypeLocalTime.java      |  6 +--
 .../type/ScalarTypeLocalTimeWithNanos.java    |  4 +-
 .../server/type/ScalarTypeLocale.java         |  4 +-
 .../server/type/ScalarTypeLong.java           |  4 +-
 .../server/type/ScalarTypeLongVarchar.java    |  2 +-
 .../server/type/ScalarTypeMathBigInteger.java |  4 +-
 .../server/type/ScalarTypeMonth.java          |  5 +-
 .../server/type}/TestLocaleParse.java         |  2 +-
 .../server/type/TestTypeManager.java          |  5 +-
 65 files changed, 149 insertions(+), 253 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java
 rename ebean-core/src/test/java/{org/tests/unitinternal => io/ebeaninternal/server/type}/TestLocaleParse.java (97%)
 rename ebean-core/src/test/java/io/{ebean => ebeaninternal}/server/type/TestTypeManager.java (97%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index ef1117659..edeaa397b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -6,16 +6,8 @@ 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.DatabaseConfig;
-import io.ebean.config.EncryptKey;
-import io.ebean.config.EncryptKeyManager;
-import io.ebean.config.NamingConvention;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbHistorySupport;
-import io.ebean.config.dbplatform.DbIdentity;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.PlatformIdGenerator;
+import io.ebean.config.*;
+import io.ebean.config.dbplatform.*;
 import io.ebean.core.type.ScalarType;
 import io.ebean.event.changelog.ChangeLogFilter;
 import io.ebean.event.changelog.ChangeLogListener;
@@ -36,26 +28,12 @@ import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.deploy.id.IdBinderEmbedded;
 import io.ebeaninternal.server.deploy.id.IdBinderFactory;
-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.DeployBeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
-import io.ebeaninternal.server.deploy.meta.DeployBeanTable;
-import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
-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;
-import io.ebeaninternal.server.deploy.parse.DeployInherit;
-import io.ebeaninternal.server.deploy.parse.DeployUtil;
-import io.ebeaninternal.server.deploy.parse.ReadAnnotations;
-import io.ebeaninternal.server.deploy.parse.TransientProperties;
+import io.ebeaninternal.server.deploy.meta.*;
+import io.ebeaninternal.server.deploy.parse.*;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.properties.BeanPropertiesReader;
 import io.ebeaninternal.server.properties.BeanPropertyAccess;
 import io.ebeaninternal.server.properties.EnhanceBeanPropertyAccess;
-import io.ebeaninternal.server.type.ScalarTypeInteger;
 import io.ebeaninternal.server.type.TypeManager;
 import io.ebeaninternal.xmapping.api.XmapEbean;
 import io.ebeaninternal.xmapping.api.XmapEntity;
@@ -73,14 +51,7 @@ import javax.sql.DataSource;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -905,7 +876,8 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private void makeOrderColumn(DeployBeanPropertyAssocMany<?> oneToMany) {
     DeployBeanDescriptor<?> targetDesc = getTargetDescriptor(oneToMany);
     DeployOrderColumn orderColumn = oneToMany.getOrderColumn();
-    DeployBeanProperty orderProperty = new DeployBeanProperty(targetDesc, Integer.class, ScalarTypeInteger.INSTANCE, null);
+    final ScalarType<?> scalarType = typeManager.getScalarType(Integer.class);
+    DeployBeanProperty orderProperty = new DeployBeanProperty(targetDesc, Integer.class, scalarType, null);
     orderProperty.setName(DeployOrderColumn.LOGICAL_NAME);
     orderProperty.setDbColumn(orderColumn.getName());
     orderProperty.setNullable(orderColumn.isNullable());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index b6d570817..571e1d3ca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -82,9 +82,7 @@ final class AnnotationFields extends AnnotationParser {
    * If present read Jackson JsonIgnore.
    */
   private final boolean jacksonAnnotationsPresent;
-
   private final GeneratedPropertyFactory generatedPropFactory;
-
   /**
    * By default we lazy load Lob properties.
    */
@@ -118,20 +116,16 @@ final class AnnotationFields extends AnnotationParser {
    * Read the Id marker annotations on EmbeddedId properties.
    */
   private void readAssocOne(DeployBeanPropertyAssoc<?> prop) {
-
     readJsonAnnotations(prop);
-
     if (has(prop, Id.class)) {
       readIdAssocOne(prop);
     }
-
     if (has(prop, EmbeddedId.class)) {
       prop.setId();
       prop.setNullable(false);
       prop.setEmbedded();
       info.setEmbeddedId(prop);
     }
-
     DocEmbedded docEmbedded = get(prop, DocEmbedded.class);
     if (docEmbedded != null) {
       prop.setDocStoreEmbedded(docEmbedded.doc());
@@ -143,19 +137,16 @@ final class AnnotationFields extends AnnotationParser {
         }
       }
     }
-
     if (prop instanceof DeployBeanPropertyAssocOne<?>) {
       if (prop.isId() && !prop.isEmbedded()) {
         prop.setEmbedded();
       }
       readEmbeddedAttributeOverrides((DeployBeanPropertyAssocOne<?>) prop);
     }
-
     Formula formula = prop.getMetaAnnotationFormula(platform);
     if (formula != null) {
       prop.setSqlFormula(processFormula(formula.select()), processFormula(formula.join()));
     }
-
     initWhoProperties(prop);
     initDbMigration(prop);
   }
@@ -170,32 +161,26 @@ final class AnnotationFields extends AnnotationParser {
   }
 
   private void readField(DeployBeanProperty prop) {
-
     // all Enums will have a ScalarType assigned...
     boolean isEnum = prop.getPropertyType().isEnum();
     Enumerated enumerated = get(prop, Enumerated.class);
     if (isEnum || enumerated != null) {
       util.setEnumScalarType(enumerated, prop);
     }
-
     // its persistent and assumed to be on the base table
     // rather than on a secondary table
     prop.setDbRead(true);
     prop.setDbInsertable(true);
     prop.setDbUpdateable(true);
-
     Column column = prop.getMetaAnnotation(Column.class);
     if (column != null) {
       readColumn(column, prop);
     }
-
     readJsonAnnotations(prop);
-
     if (prop.getDbColumn() == null) {
       // No @Column or @Column.name() so use NamingConvention
       prop.setDbColumn(namingConvention.getColumnFromProperty(beanType, prop.getName()));
     }
-
     initIdentity(prop);
     initTenantId(prop);
     initDbJson(prop);
@@ -204,7 +189,6 @@ final class AnnotationFields extends AnnotationParser {
     initWhen(prop);
     initWhoProperties(prop);
     initDbMigration(prop);
-
     // Want to process last so we can use with @Formula
     if (has(prop, Transient.class)) {
       // it is not a persistent property.
@@ -213,9 +197,7 @@ final class AnnotationFields extends AnnotationParser {
       prop.setDbUpdateable(false);
       prop.setTransient();
     }
-
     initEncrypt(prop);
-
     for (Index index : annotationIndexes(prop)) {
       addIndex(prop, index);
     }
@@ -234,22 +216,18 @@ final class AnnotationFields extends AnnotationParser {
     if (identity != null) {
       readIdentity(identity);
     }
-
     // determine the JDBC type using Lob/Temporal
     // otherwise based on the property Class
     Temporal temporal = get(prop, Temporal.class);
     if (temporal != null) {
       readTemporal(temporal, prop);
-
     } else if (has(prop, Lob.class)) {
       util.setLobType(prop);
     }
-
     Length length = get(prop, Length.class);
     if (length != null) {
       prop.setDbLength(length.value());
     }
-
     if (has(prop, io.ebean.annotation.NotNull.class)) {
       prop.setNullable(false);
     }
@@ -336,7 +314,6 @@ final class AnnotationFields extends AnnotationParser {
     if (formula != null) {
       prop.setSqlFormula(processFormula(formula.select()), processFormula(formula.join()));
     }
-
     final Aggregation aggregation = prop.getMetaAnnotation(Aggregation.class);
     if (aggregation != null) {
       prop.setAggregation(aggregation.value().replace("$1", prop.getName()));
@@ -349,7 +326,6 @@ final class AnnotationFields extends AnnotationParser {
       prop.setVersionColumn();
       generatedPropFactory.setVersion(prop);
     }
-
     Basic basic = get(prop, Basic.class);
     if (basic != null) {
       prop.setFetchType(basic.fetch());
@@ -397,7 +373,6 @@ final class AnnotationFields extends AnnotationParser {
     if (dbDefault != null) {
       prop.setDbColumnDefault(dbDefault.value());
     }
-
     Set<DbMigration> dbMigration = annotationDbMigrations(prop);
     dbMigration.forEach(ann -> prop.addDbMigrationInfo(
       new DbMigrationInfo(ann.preAdd(), ann.postAdd(), ann.preAlter(), ann.postAlter(), ann.platforms())));
@@ -423,7 +398,6 @@ final class AnnotationFields extends AnnotationParser {
         throw new RuntimeException("DB-columname has to be specified exactly one time in columnNames.");
       }
     }
-
     if (columnNames.length == 1 && hasRelationshipItem(prop)) {
       throw new RuntimeException("Can't use Index on foreign key relationships.");
     }
@@ -438,13 +412,11 @@ final class AnnotationFields extends AnnotationParser {
         prop.setJsonDeserialize(!jsonIgnore.value());
       }
     }
-
     Expose expose = get(prop, Expose.class);
     if (expose != null) {
       prop.setJsonSerialize(expose.serialize());
       prop.setJsonDeserialize(expose.deserialize());
     }
-
     JsonIgnore jsonIgnore = get(prop, JsonIgnore.class);
     if (jsonIgnore != null) {
       prop.setJsonSerialize(jsonIgnore.serialize());
@@ -460,9 +432,7 @@ final class AnnotationFields extends AnnotationParser {
   }
 
   private void setEncryption(DeployBeanProperty prop, boolean dbEncString, int dbLen) {
-
     util.checkEncryptKeyManagerDefined(prop.getFullBeanName());
-
     ScalarType<?> st = prop.getScalarType();
     if (byte[].class.equals(st.getType())) {
       // Always using Java client encryption rather than DB for encryption
@@ -474,12 +444,9 @@ final class AnnotationFields extends AnnotationParser {
       prop.setScalarType(encryptedScalarType);
       prop.setLocalEncrypted();
       return;
-
     }
     if (dbEncString) {
-
       DbEncrypt dbEncrypt = util.getDbPlatform().getDbEncrypt();
-
       if (dbEncrypt != null) {
         // check if we have a DB encryption function for this type
         int jdbcType = prop.getScalarType().getJdbcType();
@@ -491,7 +458,6 @@ final class AnnotationFields extends AnnotationParser {
         }
       }
     }
-
     prop.setScalarType(createScalarType(prop, st));
     prop.setLocalEncrypted();
     if (dbLen > 0) {
@@ -501,11 +467,9 @@ final class AnnotationFields extends AnnotationParser {
 
   @SuppressWarnings({"unchecked"})
   private ScalarTypeEncryptedWrapper<?> createScalarType(DeployBeanProperty prop, ScalarType<?> st) {
-
     // Use Java Encryptor wrapping the logical scalar type
     DataEncryptSupport support = createDataEncryptSupport(prop);
     ScalarTypeBytesBase byteType = getDbEncryptType(prop);
-
     return new ScalarTypeEncryptedWrapper(st, byteType, support);
   }
 
@@ -515,10 +479,8 @@ final class AnnotationFields extends AnnotationParser {
   }
 
   private DataEncryptSupport createDataEncryptSupport(DeployBeanProperty prop) {
-
     String table = info.getDescriptor().getBaseTable();
     String column = prop.getDbColumn();
-
     return util.createDataEncryptSupport(table, column);
   }
 
@@ -530,7 +492,6 @@ final class AnnotationFields extends AnnotationParser {
       }
     }
     descriptor.setIdGeneratedValue();
-
     SequenceGenerator seq = get(prop, SequenceGenerator.class);
     if (seq != null) {
       String seqName = seq.sequenceName();
@@ -543,13 +504,11 @@ final class AnnotationFields extends AnnotationParser {
     GenerationType strategy = gen.strategy();
     if (strategy == GenerationType.IDENTITY) {
       descriptor.setIdentityType(IdType.IDENTITY);
-
     } else if (strategy == GenerationType.SEQUENCE) {
       descriptor.setIdentityType(IdType.SEQUENCE);
       if (!gen.generator().isEmpty()) {
         descriptor.setIdentitySequenceGenerator(gen.generator());
       }
-
     } else if (strategy == GenerationType.AUTO) {
       if (!gen.generator().isEmpty()) {
         // use a custom IdGenerator
@@ -565,21 +524,16 @@ final class AnnotationFields extends AnnotationParser {
   }
 
   private void readTemporal(Temporal temporal, DeployBeanProperty prop) {
-
     TemporalType type = temporal.value();
     if (type == TemporalType.DATE) {
       prop.setDbType(Types.DATE);
-
     } else if (type == TemporalType.TIMESTAMP) {
       prop.setDbType(Types.TIMESTAMP);
-
     } else if (type == TemporalType.TIME) {
       prop.setDbType(Types.TIME);
-
     } else {
       throw new PersistenceException("Unhandled type " + type);
     }
   }
 
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java
index 03357004a..ebec02029 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java
@@ -112,7 +112,7 @@ import java.util.regex.Pattern;
  * @author Erik Kline
  * @since 5
  */
-public final class ConvertInetAddresses {
+final class ConvertInetAddresses {
 
   private static final int IPV4_PART_COUNT = 4;
   private static final int IPV6_PART_COUNT = 8;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
index 72f2d4e96..13ceb73c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
@@ -27,7 +27,7 @@ import java.time.Instant;
  * @author Nick Williams
  * @since 2.2.0
  */
-public final class DecimalUtils {
+final class DecimalUtils {
 
   private static final char[] ZEROES = new char[]{'0', '0', '0', '0', '0', '0', '0', '0', '0'};
 
@@ -37,17 +37,17 @@ public final class DecimalUtils {
     throw new RuntimeException("DecimalUtils cannot be instantiated.");
   }
 
-  public static Duration toDuration(BigDecimal value) {
+  static Duration toDuration(BigDecimal value) {
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
     return Duration.ofSeconds(seconds, nanoseconds);
   }
 
-  public static BigDecimal toDecimal(Duration instant) {
+  static BigDecimal toDecimal(Duration instant) {
     return new BigDecimal(toDecimal(instant.getSeconds(), instant.getNano()));
   }
 
-  public static Timestamp toTimestamp(BigDecimal value) {
+  static Timestamp toTimestamp(BigDecimal value) {
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
     Timestamp ts = new Timestamp(seconds * 1000);
@@ -55,30 +55,30 @@ public final class DecimalUtils {
     return ts;
   }
 
-  public static BigDecimal toDecimal(Timestamp instant) {
+  static BigDecimal toDecimal(Timestamp instant) {
     long millis = instant.getTime();
     long secs = millis / 1000;
     return new BigDecimal(toDecimal(secs, instant.getNanos()));
   }
 
-  public static Instant toInstant(BigDecimal value) {
+  static Instant toInstant(BigDecimal value) {
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
     return Instant.ofEpochSecond(seconds, nanoseconds);
   }
 
-  public static BigDecimal toDecimal(Instant instant) {
+  static BigDecimal toDecimal(Instant instant) {
     return new BigDecimal(toDecimal(instant.getEpochSecond(), instant.getNano()));
   }
 
-  public static String toDecimal(long seconds, int nanoseconds) {
+  static String toDecimal(long seconds, int nanoseconds) {
     StringBuilder string = new StringBuilder(Integer.toString(nanoseconds));
     if (string.length() < 9)
       string.insert(0, ZEROES, 0, 9 - string.length());
     return seconds + "." + string;
   }
 
-  public static int extractNanosecondDecimal(BigDecimal value, long integer) {
+  static int extractNanosecondDecimal(BigDecimal value, long integer) {
     return value.subtract(new BigDecimal(integer)).multiply(ONE_BILLION).intValue();
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
index 6c2f3b860..b962a4811 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
@@ -14,7 +14,7 @@ import java.util.Date;
  * Helper to create some default ScalarType objects for Booleans,
  * java.util.Date, java.util.Calendar etc.
  */
-public final class DefaultTypeFactory {
+final class DefaultTypeFactory {
 
   private final DatabaseConfig config;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 6e1e1f0d7..d58c284f3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -71,7 +71,7 @@ public final class DefaultTypeManager implements TypeManager {
   private final ScalarType<?> varbinaryType = new ScalarTypeBytesVarbinary();
   private final ScalarType<?> longVarbinaryType = new ScalarTypeBytesLongVarbinary();
   private final ScalarType<?> shortType = new ScalarTypeShort();
-  private final ScalarType<?> integerType = ScalarTypeInteger.INSTANCE;
+  private final ScalarType<?> integerType = new ScalarTypeInteger();
   private final ScalarType<?> longType = new ScalarTypeLong();
   private final ScalarType<?> doubleType = new ScalarTypeDouble();
   private final ScalarType<?> floatType = new ScalarTypeFloat();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
index 419d8f53a..2e2d2cc31 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
@@ -10,7 +10,7 @@ import java.sql.Types;
 /**
  * Used to map enum values to database integer values.
  */
-public final class EnumToDbIntegerMap extends EnumToDbValueMap<Integer> {
+final class EnumToDbIntegerMap extends EnumToDbValueMap<Integer> {
 
   @Override
   public int getDbType() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java
index c7dc4bc89..062749580 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java
@@ -9,7 +9,7 @@ import java.sql.Types;
 /**
  * Used to map Enum values to database string/varchar values.
  */
-public final class EnumToDbStringMap extends EnumToDbValueMap<String> {
+final class EnumToDbStringMap extends EnumToDbValueMap<String> {
 
   @Override
   public int getDbType() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java
index 57ab47ef5..92ebc9334 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java
@@ -15,9 +15,9 @@ import java.util.LinkedHashMap;
  * Enum gets converter to.
  * </p>
  */
-public abstract class EnumToDbValueMap<T> {
+abstract class EnumToDbValueMap<T> {
 
-  public static EnumToDbValueMap<?> create(boolean integerType) {
+  static EnumToDbValueMap<?> create(boolean integerType) {
     return integerType ? new EnumToDbIntegerMap() : new EnumToDbStringMap();
   }
 
@@ -30,7 +30,7 @@ public abstract class EnumToDbValueMap<T> {
   /**
    * Construct with allowNulls defaulting to false.
    */
-  public EnumToDbValueMap() {
+  EnumToDbValueMap() {
     this(false, false);
   }
 
@@ -42,7 +42,7 @@ public abstract class EnumToDbValueMap<T> {
    * value is found.
    * </p>
    */
-  public EnumToDbValueMap(boolean allowNulls, boolean isIntegerType) {
+  EnumToDbValueMap(boolean allowNulls, boolean isIntegerType) {
     this.allowNulls = allowNulls;
     this.isIntegerType = isIntegerType;
     this.keyMap = new LinkedHashMap<>();
@@ -54,7 +54,7 @@ public abstract class EnumToDbValueMap<T> {
    * Return true if this is mapping to integers, false
    * if mapping to Strings.
    */
-  public boolean isIntegerType() {
+  boolean isIntegerType() {
     return isIntegerType;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java
deleted file mode 100644
index 83d55871d..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import io.ebean.config.ScalarTypeConverter;
-
-import java.sql.Timestamp;
-
-public final class LongToTimestampConverter implements ScalarTypeConverter<Long, Timestamp> {
-
-  @Override
-  public Long getNullValue() {
-    return null;
-  }
-
-  @Override
-  public Timestamp unwrapValue(Long beanType) {
-    return new Timestamp(beanType);
-  }
-
-  @Override
-  public Long wrapValue(Timestamp scalarType) {
-    return scalarType.getTime();
-  }
-
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
index f0f9c54bd..768c7a751 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
@@ -9,14 +9,14 @@ public final class PostgresHelper {
   /**
    * The Postgres JSON DB type.
    */
-  public static final String JSON_TYPE = "json";
+  static final String JSON_TYPE = "json";
 
   /**
    * The Postgres JSONB DB type.
    */
-  public static final String JSONB_TYPE = "jsonb";
+  static final String JSONB_TYPE = "jsonb";
 
-  public static final String INET_TYPE = "inet";
+  static final String INET_TYPE = "inet";
 
   public static Object asInet(String value) throws SQLException {
     return asObject(INET_TYPE, value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index 6ee64d5cf..f0b0ad855 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -28,7 +28,7 @@ import static java.util.Collections.EMPTY_LIST;
  * Type mapped for DB ARRAY type (Postgres only effectively).
  */
 @SuppressWarnings("rawtypes")
-public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTypeArray {
+class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTypeArray {
 
   static PlatformArrayTypeFactory factory() {
     return new Factory();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index 90f592428..666d52b10 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -29,7 +29,7 @@ import static java.util.Collections.EMPTY_SET;
  * Type mapped for DB ARRAY type (Postgres only effectively).
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
-public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements ScalarTypeArray {
+class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements ScalarTypeArray {
 
   static PlatformArrayTypeFactory factory() {
     return new Factory();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
index a6a0675a0..5d2bb45e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
@@ -6,15 +6,13 @@ import io.ebean.core.type.ScalarType;
 /**
  * Base ScalarType object.
  */
-public abstract class ScalarTypeBase<T> implements ScalarType<T> {
+abstract class ScalarTypeBase<T> implements ScalarType<T> {
 
   protected final Class<T> type;
-
   protected final boolean jdbcNative;
-
   protected final int jdbcType;
 
-  public ScalarTypeBase(Class<T> type, boolean jdbcNative, int jdbcType) {
+  ScalarTypeBase(Class<T> type, boolean jdbcNative, int jdbcType) {
     this.type = type;
     this.jdbcNative = jdbcNative;
     this.jdbcType = jdbcType;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index f752da1d4..4e55d34de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -18,7 +18,7 @@ import java.sql.Types;
 /**
  * Base class for Date types.
  */
-public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
+abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
   protected final JsonConfig.Date mode;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index c296b2e1f..aa1670df7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -21,11 +21,11 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.parseIso;
 /**
  * Base type for DateTime types.
  */
-public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
+abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
 
   protected final JsonConfig.DateTime mode;
 
-  public ScalarTypeBaseDateTime(JsonConfig.DateTime mode, Class<T> type, boolean jdbcNative, int jdbcType) {
+  ScalarTypeBaseDateTime(JsonConfig.DateTime mode, Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
     this.mode = mode;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
index 78e26c4c0..7fd7d974e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
@@ -17,13 +17,13 @@ import java.sql.Types;
  * Base ScalarType for types which converts to and from a VARCHAR database
  * column.
  */
-public abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
+abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
 
-  public ScalarTypeBaseVarchar(Class<T> type) {
+  ScalarTypeBaseVarchar(Class<T> type) {
     super(type, false, Types.VARCHAR);
   }
 
-  public ScalarTypeBaseVarchar(Class<T> type, boolean jdbcNative, int jdbcType) {
+  ScalarTypeBaseVarchar(Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 58dc1e720..0a3e98b6c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -17,9 +17,9 @@ import java.sql.Types;
 /**
  * ScalarType for BigDecimal.
  */
-public class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
+class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
 
-  public ScalarTypeBigDecimal() {
+  ScalarTypeBigDecimal() {
     super(BigDecimal.class, true, Types.DECIMAL);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
index 3a64f421f..250bb1006 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
@@ -18,7 +18,7 @@ import java.sql.Types;
 /**
  * ScalarType for Byte.
  */
-public final class ScalarTypeByte extends ScalarTypeBase<Byte> {
+final class ScalarTypeByte extends ScalarTypeBase<Byte> {
 
   public ScalarTypeByte() {
     super(Byte.class, true, Types.TINYINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
index 202ade97e..437c626f8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
@@ -17,7 +17,7 @@ import java.sql.SQLException;
  */
 public abstract class ScalarTypeBytesBase extends ScalarTypeBase<byte[]> {
 
-  protected ScalarTypeBytesBase(boolean jdbcNative, int jdbcType) {
+  ScalarTypeBytesBase(boolean jdbcNative, int jdbcType) {
     super(byte[].class, jdbcNative, jdbcType);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
index 18cdb096e..45e143aff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
@@ -8,9 +8,9 @@ import java.sql.Types;
 /**
  * ScalarType for Types.BINARY to byte[].
  */
-public final class ScalarTypeBytesBinary extends ScalarTypeBytesBase {
+final class ScalarTypeBytesBinary extends ScalarTypeBytesBase {
 
-  public ScalarTypeBytesBinary() {
+  ScalarTypeBytesBinary() {
     super(true, Types.BINARY);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
index 5cc3e2afc..88ba70876 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
@@ -8,9 +8,9 @@ import java.sql.Types;
 /**
  * ScalarType for BLOB.
  */
-public final class ScalarTypeBytesBlob extends ScalarTypeBytesBase {
+final class ScalarTypeBytesBlob extends ScalarTypeBytesBase {
 
-  public ScalarTypeBytesBlob() {
+  ScalarTypeBytesBlob() {
     super(true, Types.BLOB);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
index fef593e12..7b561a302 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
@@ -8,9 +8,9 @@ import java.sql.Types;
 /**
  * ScalarType for Longvarbinary.
  */
-public final class ScalarTypeBytesLongVarbinary extends ScalarTypeBytesBase {
+final class ScalarTypeBytesLongVarbinary extends ScalarTypeBytesBase {
 
-  public ScalarTypeBytesLongVarbinary() {
+  ScalarTypeBytesLongVarbinary() {
     super(true, Types.LONGVARBINARY);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
index dea5cc1a1..dc61c87f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
@@ -8,9 +8,9 @@ import java.sql.Types;
 /**
  * ScalarType for Types.VARBINARY to byte[].
  */
-public final class ScalarTypeBytesVarbinary extends ScalarTypeBytesBase {
+final class ScalarTypeBytesVarbinary extends ScalarTypeBytesBase {
 
-  public ScalarTypeBytesVarbinary() {
+  ScalarTypeBytesVarbinary() {
     super(true, Types.VARBINARY);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index bbefa5a83..9028523b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -16,9 +16,9 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.util.Calendar.
  */
-public final class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
+final class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
 
-  public ScalarTypeCalendar(JsonConfig.DateTime mode, int jdbcType) {
+  ScalarTypeCalendar(JsonConfig.DateTime mode, int jdbcType) {
     super(mode, Calendar.class, false, jdbcType);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
index f5fe00954..6be7012b6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
@@ -10,9 +10,9 @@ import java.sql.Types;
 /**
  * ScalarType for char.
  */
-public final class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
+final class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
 
-  public ScalarTypeChar() {
+  ScalarTypeChar() {
     super(char.class, false, Types.VARCHAR);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
index ebfd69a6f..869614f9d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -13,9 +13,9 @@ import java.sql.Types;
 /**
  * ScalarType for char[].
  */
-public final class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
+final class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
 
-  public ScalarTypeCharArray() {
+  ScalarTypeCharArray() {
     super(char[].class, false, Types.VARCHAR);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
index 390ac22c7..6c9f18b82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
@@ -10,7 +10,7 @@ import java.sql.Types;
 /**
  * ScalarType for Cidr to Varchar or Postgres CIDR.
  */
-public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
+abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
 
   ScalarTypeCidr() {
     super(Cidr.class, false, ExtraDbTypes.CIDR);
@@ -42,7 +42,7 @@ public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cidr to Varchar.
    */
-  public static final class Varchar extends ScalarTypeCidr {
+  static final class Varchar extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBinder binder, Cidr value) throws SQLException {
@@ -57,7 +57,7 @@ public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cidr to Postgres CIDR.
    */
-  public static final class Postgres extends ScalarTypeCidr {
+  static final class Postgres extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBinder binder, Cidr value) throws SQLException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
index 78f4a19de..44fb1c475 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
@@ -6,7 +6,7 @@ import javax.persistence.PersistenceException;
  * ScalarType for Class that persists it to VARCHAR column.
  */
 @SuppressWarnings({"rawtypes"})
-public final class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {
+final class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {
 
   public ScalarTypeClass() {
     super(Class.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java
index f2df74f00..7903a76ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java
@@ -8,13 +8,13 @@ import java.sql.Types;
 /**
  * ScalarType for String.
  */
-public class ScalarTypeClob extends ScalarTypeStringBase {
+class ScalarTypeClob extends ScalarTypeStringBase {
 
   ScalarTypeClob(boolean jdbcNative, int jdbcType) {
     super(jdbcNative, jdbcType);
   }
 
-  public ScalarTypeClob() {
+  ScalarTypeClob() {
     super(true, Types.CLOB);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
index 0eaeb8602..194e43c32 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
@@ -5,9 +5,9 @@ import java.util.Currency;
 /**
  * ScalarType for java.util.Currency which converts to and from a VARCHAR database column.
  */
-public final class ScalarTypeCurrency extends ScalarTypeBaseVarchar<Currency> {
+final class ScalarTypeCurrency extends ScalarTypeBaseVarchar<Currency> {
 
-  public ScalarTypeCurrency() {
+  ScalarTypeCurrency() {
     super(Currency.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
index b69571c11..84d7330da 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
@@ -12,9 +12,9 @@ import java.sql.Types;
 /**
  * ScalarType for java.sql.Date.
  */
-public final class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
+final class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
 
-  public ScalarTypeDate(JsonConfig.Date mode) {
+  ScalarTypeDate(JsonConfig.Date mode) {
     super(mode, Date.class, true, Types.DATE);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
index 1cee17865..b0c8b3e7f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
@@ -11,7 +11,7 @@ import java.time.DayOfWeek;
 /**
  * ScalarType mapping for Month enum.
  */
-public final class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
+final class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
 
   static final EnumToDbIntegerMap beanDbMap = new EnumToDbIntegerMap();
 
@@ -22,7 +22,7 @@ public final class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
     }
   }
 
-  public ScalarTypeDayOfWeek() {
+  ScalarTypeDayOfWeek() {
     super(beanDbMap, DayOfWeek.class, 1);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 02adb9de8..5877c5d4a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -16,9 +16,9 @@ import java.sql.Types;
 /**
  * ScalarType for Double and double.
  */
-public final class ScalarTypeDouble extends ScalarTypeBase<Double> {
+final class ScalarTypeDouble extends ScalarTypeBase<Double> {
 
-  public ScalarTypeDouble() {
+  ScalarTypeDouble() {
     super(Double.class, true, Types.DOUBLE);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index 4632160d9..8e34afe27 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -19,21 +19,21 @@ import java.time.Duration;
 /**
  * ScalarType for java.time.Duration (with seconds precision).
  */
-public class ScalarTypeDuration extends ScalarTypeBase<Duration> {
+class ScalarTypeDuration extends ScalarTypeBase<Duration> {
 
-  public ScalarTypeDuration() {
+  ScalarTypeDuration() {
     super(Duration.class, false, Types.BIGINT);
   }
 
-  protected ScalarTypeDuration(int jdbcType) {
+  ScalarTypeDuration(int jdbcType) {
     super(Duration.class, false, jdbcType);
   }
 
-  public BigDecimal convertToBigDecimal(Duration value) {
+  BigDecimal convertToBigDecimal(Duration value) {
     return (value == null) ? null : DecimalUtils.toDecimal(value);
   }
 
-  public Duration convertFromBigDecimal(BigDecimal value) {
+  Duration convertFromBigDecimal(BigDecimal value) {
     return (value == null) ? null : DecimalUtils.toDuration(value);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
index 2f99708b3..9ba27cc6c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
@@ -15,9 +15,9 @@ import java.time.Duration;
  * Stored in the DB as DECIMAL value.
  * </p>
  */
-public final class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
+final class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
 
-  public ScalarTypeDurationWithNanos() {
+  ScalarTypeDurationWithNanos() {
     super(Types.DECIMAL);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index dcdc8d42a..8545bc9a7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -28,17 +28,17 @@ import java.util.Set;
  * Ebean specific @EnumMapping.
  * </p>
  */
-public final class ScalarTypeEnumStandard {
+final class ScalarTypeEnumStandard {
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public static final class StringEnum extends EnumBase implements ScalarTypeEnum {
+  static final class StringEnum extends EnumBase implements ScalarTypeEnum {
 
     private final int length;
 
     /**
      * Create a ScalarTypeEnum.
      */
-    public StringEnum(Class enumType) {
+    StringEnum(Class enumType) {
       super(enumType, false, Types.VARCHAR);
       this.length = maxValueLength(enumType);
     }
@@ -117,14 +117,14 @@ public final class ScalarTypeEnumStandard {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public static final class OrdinalEnum extends EnumBase implements ScalarTypeEnum {
+  static final class OrdinalEnum extends EnumBase implements ScalarTypeEnum {
 
     private final Object[] enumArray;
 
     /**
      * Create a ScalarTypeEnum.
      */
-    public OrdinalEnum(Class enumType) {
+    OrdinalEnum(Class enumType) {
       super(enumType, false, Types.INTEGER);
       this.enumArray = EnumSet.allOf(enumType).toArray();
     }
@@ -200,11 +200,11 @@ public final class ScalarTypeEnumStandard {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public abstract static class EnumBase extends ScalarTypeBase {
+  abstract static class EnumBase extends ScalarTypeBase {
 
     protected final Class enumType;
 
-    public EnumBase(Class<?> type, boolean jdbcNative, int jdbcType) {
+    EnumBase(Class<?> type, boolean jdbcNative, int jdbcType) {
       super(type, jdbcNative, jdbcType);
       this.enumType = type;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
index 6960d4d09..cafee64f7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
@@ -14,7 +14,7 @@ import java.util.Set;
  * Additional control over mapping to DB values.
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
-public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase implements ScalarType, ScalarTypeEnum {
+class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase implements ScalarType, ScalarTypeEnum {
 
   private final EnumToDbValueMap beanDbMap;
   private final int length;
@@ -23,14 +23,14 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i
   /**
    * Create with an explicit mapping of bean to database values.
    */
-  public ScalarTypeEnumWithMapping(EnumToDbValueMap<?> beanDbMap, Class<?> enumType, int length, boolean withConstraint) {
+  ScalarTypeEnumWithMapping(EnumToDbValueMap<?> beanDbMap, Class<?> enumType, int length, boolean withConstraint) {
     super(enumType, false, beanDbMap.getDbType());
     this.beanDbMap = beanDbMap;
     this.length = length;
     this.withConstraint = withConstraint;
   }
 
-  public ScalarTypeEnumWithMapping(EnumToDbValueMap<?> beanDbMap, Class<?> enumType, int length) {
+  ScalarTypeEnumWithMapping(EnumToDbValueMap<?> beanDbMap, Class<?> enumType, int length) {
     this(beanDbMap, enumType, length, true);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index d6f694672..2aa96dba5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -25,7 +25,7 @@ import java.sql.Types;
 /**
  * ScalarType for streaming between a File and the database.
  */
-public final class ScalarTypeFile extends ScalarTypeBase<File> {
+final class ScalarTypeFile extends ScalarTypeBase<File> {
 
   private static final Logger logger = LoggerFactory.getLogger(ScalarTypeFile.class);
 
@@ -37,14 +37,14 @@ public final class ScalarTypeFile extends ScalarTypeBase<File> {
   /**
    * Construct with reasonable defaults of Blob and 8096 buffer size.
    */
-  public ScalarTypeFile() {
+  ScalarTypeFile() {
     this(Types.LONGVARBINARY, "db-", null, null, 8096);
   }
 
   /**
    * Create the ScalarTypeFile.
    */
-  public ScalarTypeFile(int jdbcType, String prefix, String suffix, File directory, int bufferSize) {
+  ScalarTypeFile(int jdbcType, String prefix, String suffix, File directory, int bufferSize) {
     super(File.class, false, jdbcType);
     this.prefix = prefix;
     this.suffix = suffix;
@@ -73,15 +73,12 @@ public final class ScalarTypeFile extends ScalarTypeBase<File> {
     if (is == null) {
       return null;
     }
-
     try {
       // stream from db into our temp file
       File tempFile = File.createTempFile(prefix, suffix, directory);
       OutputStream os = getOutputStream(tempFile);
       pump(is, os);
-
       return tempFile;
-
     } catch (IOException e) {
       throw new SQLException("Error reading db file inputStream", e);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index d468b74ef..fd13f2082 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -16,9 +16,9 @@ import java.sql.Types;
 /**
  * ScalarType for Float and float.
  */
-public final class ScalarTypeFloat extends ScalarTypeBase<Float> {
+final class ScalarTypeFloat extends ScalarTypeBase<Float> {
 
-  public ScalarTypeFloat() {
+  ScalarTypeFloat() {
     super(Float.class, true, Types.REAL);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
index 9a7b884f4..122fdcc5a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -10,7 +10,7 @@ import java.sql.Types;
 /**
  * ScalarType for Inet to Varchar or Postgres INET.
  */
-public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
+abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
 
   ScalarTypeInet(int jdbcType) {
     super(Inet.class, false, jdbcType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
index 419f52cd3..166a81280 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
@@ -7,9 +7,9 @@ import java.net.InetAddress;
 /**
  * ScalarType for java.net.URI which converts to and from a VARCHAR database column.
  */
-public final class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
+final class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
 
-  public ScalarTypeInetAddress() {
+  ScalarTypeInetAddress() {
     super(InetAddress.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
index aba3aa4c9..a4ff9074d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
@@ -11,9 +11,9 @@ import java.sql.Types;
 /**
  * ScalarType for InetAddress to Postgres INET.
  */
-public final class ScalarTypeInetAddressPostgres extends ScalarTypeBaseVarchar<InetAddress> {
+final class ScalarTypeInetAddressPostgres extends ScalarTypeBaseVarchar<InetAddress> {
 
-  public ScalarTypeInetAddressPostgres() {
+  ScalarTypeInetAddressPostgres() {
     super(InetAddress.class, false, ExtraDbTypes.INET);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
index 0d84af6e1..d3fbee011 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
@@ -9,9 +9,9 @@ import java.time.Instant;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public final class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
+final class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
 
-  public ScalarTypeInstant(JsonConfig.DateTime mode) {
+  ScalarTypeInstant(JsonConfig.DateTime mode) {
     super(mode, Instant.class, false, Types.TIMESTAMP);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index cae0de91b..172522224 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -17,11 +17,9 @@ import java.sql.Types;
 /**
  * ScalarType for Integer and int.
  */
-public final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
+final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
 
-  public static ScalarTypeInteger INSTANCE = new ScalarTypeInteger();
-
-  private ScalarTypeInteger() {
+  ScalarTypeInteger() {
     super(Integer.class, true, Types.INTEGER);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
index c108b99f1..9a7990a6d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
@@ -11,12 +11,12 @@ import java.sql.Types;
  * ScalarType for Joda DateMidnight. This maps to a JDBC Date.
  */
 @SuppressWarnings("deprecation")
-public final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
+final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
 
   /**
    * Instantiates a new scalar type joda date midnight.
    */
-  public ScalarTypeJodaDateMidnight(JsonConfig.Date mode) {
+  ScalarTypeJodaDateMidnight(JsonConfig.Date mode) {
     super(mode, org.joda.time.DateMidnight.class, false, Types.DATE);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
index 2ca296ed0..0291f31dd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
@@ -11,9 +11,9 @@ import java.time.Instant;
 /**
  * ScalarType for Joda DateTime. This maps to a JDBC Timestamp.
  */
-public final class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime<DateTime> {
+final class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime<DateTime> {
 
-  public ScalarTypeJodaDateTime(JsonConfig.DateTime mode) {
+  ScalarTypeJodaDateTime(JsonConfig.DateTime mode) {
     super(mode, DateTime.class, false, Types.TIMESTAMP);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index 09acb797e..a7f385442 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -11,9 +11,9 @@ import java.sql.Types;
 /**
  * ScalarType for Joda LocalDate. This maps to a JDBC Date.
  */
-public final class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
+final class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
-  public ScalarTypeJodaLocalDate(JsonConfig.Date mode) {
+  ScalarTypeJodaLocalDate(JsonConfig.Date mode) {
     super(mode, LocalDate.class, false, Types.DATE);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
index 5d537dc9c..913d290be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
@@ -11,9 +11,9 @@ import java.time.Instant;
 /**
  * ScalarType for Joda LocalDateTime. This maps to a JDBC Timestamp.
  */
-public final class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
+final class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
 
-  public ScalarTypeJodaLocalDateTime(JsonConfig.DateTime mode) {
+  ScalarTypeJodaLocalDateTime(JsonConfig.DateTime mode) {
     super(mode, LocalDateTime.class, false, Types.TIMESTAMP);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index bb8f5070b..785069345 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -20,9 +20,9 @@ import java.sql.Types;
 /**
  * ScalarType for Joda LocalTime. This maps to a JDBC Time.
  */
-public class ScalarTypeJodaLocalTime extends ScalarTypeBase<LocalTime> {
+class ScalarTypeJodaLocalTime extends ScalarTypeBase<LocalTime> {
 
-  public ScalarTypeJodaLocalTime() {
+  ScalarTypeJodaLocalTime() {
     super(LocalTime.class, false, Types.TIME);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
index 4de3c513a..e19af274e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
@@ -13,9 +13,9 @@ import java.sql.Types;
 /**
  * ScalarType for Joda LocalTime. This maps to a JDBC Time.
  */
-public final class ScalarTypeJodaLocalTimeUTC extends ScalarTypeJodaLocalTime {
+final class ScalarTypeJodaLocalTimeUTC extends ScalarTypeJodaLocalTime {
 
-  public ScalarTypeJodaLocalTimeUTC() {
+  ScalarTypeJodaLocalTimeUTC() {
     super();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
index 2dc09a233..5c319c6ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
@@ -5,9 +5,9 @@ import org.joda.time.Period;
 /**
  * ScalarType for Joda Period stored as DB VARCHAR
  */
-public final class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
+final class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
 
-  public ScalarTypeJodaPeriod() {
+  ScalarTypeJodaPeriod() {
     super(Period.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
index 9c3950b94..675328de5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -22,14 +22,14 @@ import java.sql.Types;
 /**
  * Type which maps Jackson's JsonNode to various DB types (Clob, Varchar, Blob) in JSON format.
  */
-public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
+abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
 
   /**
    * Clob storage based implementation.
    */
-  public static final class Clob extends ScalarTypeJsonNode {
+  static final class Clob extends ScalarTypeJsonNode {
 
-    public Clob(ObjectMapper objectMapper) {
+    Clob(ObjectMapper objectMapper) {
       super(objectMapper, Types.CLOB);
     }
 
@@ -46,7 +46,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   /**
    * Varchar storage based implementation.
    */
-  public static final class Varchar extends ScalarTypeJsonNode {
+  static final class Varchar extends ScalarTypeJsonNode {
 
     public Varchar(ObjectMapper objectMapper) {
       super(objectMapper, Types.VARCHAR);
@@ -56,9 +56,9 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   /**
    * Blob storage based implementation.
    */
-  public static class Blob extends ScalarTypeJsonNode {
+  static class Blob extends ScalarTypeJsonNode {
 
-    public Blob(ObjectMapper objectMapper) {
+    Blob(ObjectMapper objectMapper) {
       super(objectMapper, Types.BLOB);
     }
 
@@ -91,7 +91,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
    */
   final ObjectMapper objectMapper;
 
-  public ScalarTypeJsonNode(ObjectMapper objectMapper, int jdbcType) {
+  ScalarTypeJsonNode(ObjectMapper objectMapper, int jdbcType) {
     super(JsonNode.class, false, jdbcType);
     this.objectMapper = objectMapper;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
index 94d46a67d..b23252367 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
@@ -10,10 +10,9 @@ import java.sql.SQLException;
 /**
  * Support for mapping JsonNode to Postgres DB types JSON and JSONB.
  */
-public abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
+abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
 
   final ObjectMapper objectMapper;
-
   final String postgresType;
 
   ScalarTypeJsonNodePostgres(ObjectMapper objectMapper, int jdbcType, String postgresType) {
@@ -31,7 +30,7 @@ public abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
   /**
    * ScalarType mapping JsonNode to Postgres JSON database type.
    */
-  public static final class JSON extends ScalarTypeJsonNodePostgres {
+  static final class JSON extends ScalarTypeJsonNodePostgres {
 
     public JSON(ObjectMapper objectMapper) {
       super(objectMapper, DbPlatformType.JSON, PostgresHelper.JSON_TYPE);
@@ -41,7 +40,7 @@ public abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
   /**
    * ScalarType mapping JsonNode to Postgres JSONB database type.
    */
-  public static final class JSONB extends ScalarTypeJsonNodePostgres {
+  static final class JSONB extends ScalarTypeJsonNodePostgres {
 
     public JSONB(ObjectMapper objectMapper) {
       super(objectMapper, DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index 4fd228459..286818c37 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -13,9 +13,9 @@ import java.time.ZonedDateTime;
 /**
  * ScalarType for java.time.LocalDate. This maps to a JDBC Date.
  */
-public final class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
+final class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
-  public ScalarTypeLocalDate(JsonConfig.Date mode) {
+  ScalarTypeLocalDate(JsonConfig.Date mode) {
     super(mode, LocalDate.class, false, Types.DATE);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index e03c67898..5e43af855 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -14,9 +14,9 @@ import java.time.ZoneId;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public final class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
+final class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
 
-  public ScalarTypeLocalDateTime(JsonConfig.DateTime mode) {
+  ScalarTypeLocalDateTime(JsonConfig.DateTime mode) {
     super(mode, LocalDateTime.class, false, Types.TIMESTAMP);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index 42997622e..f851bdcfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -19,13 +19,13 @@ import java.time.LocalTime;
 /**
  * ScalarType for java.time.LocalTime stored as JDBC Time.
  */
-public class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
+class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
 
-  public ScalarTypeLocalTime() {
+  ScalarTypeLocalTime() {
     super(LocalTime.class, false, Types.TIME);
   }
 
-  protected ScalarTypeLocalTime(int jdbcTtype) {
+  ScalarTypeLocalTime(int jdbcTtype) {
     super(LocalTime.class, false, jdbcTtype);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
index 2a86abbfa..237c2f633 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
@@ -11,9 +11,9 @@ import java.time.LocalTime;
 /**
  * ScalarType for java.time.LocalTime stored with Nanos as DB BIGINT type.
  */
-public final class ScalarTypeLocalTimeWithNanos extends ScalarTypeLocalTime {
+final class ScalarTypeLocalTimeWithNanos extends ScalarTypeLocalTime {
 
-  public ScalarTypeLocalTimeWithNanos() {
+  ScalarTypeLocalTimeWithNanos() {
     super(Types.BIGINT);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
index cc1a4c166..88190593a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
@@ -5,9 +5,9 @@ import java.util.Locale;
 /**
  * ScalarType for java.util.Currency which converts to and from a VARCHAR database column.
  */
-public final class ScalarTypeLocale extends ScalarTypeBaseVarchar<Locale> {
+final class ScalarTypeLocale extends ScalarTypeBaseVarchar<Locale> {
 
-  public ScalarTypeLocale() {
+  ScalarTypeLocale() {
     super(Locale.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index 697e84376..5287c5fd5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -16,9 +16,9 @@ import java.sql.Types;
 /**
  * ScalarType for Long and long.
  */
-public final class ScalarTypeLong extends ScalarTypeBase<Long> {
+final class ScalarTypeLong extends ScalarTypeBase<Long> {
 
-  public ScalarTypeLong() {
+  ScalarTypeLong() {
     super(Long.class, true, Types.BIGINT);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
index 9dd621d36..6b7dcecb8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
@@ -5,7 +5,7 @@ import java.sql.Types;
 /**
  * ScalarType for String.
  */
-public final class ScalarTypeLongVarchar extends ScalarTypeClob {
+final class ScalarTypeLongVarchar extends ScalarTypeClob {
 
   public ScalarTypeLongVarchar() {
     super(true, Types.LONGVARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index 3c5b99255..aa6d7d4b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -17,9 +17,9 @@ import java.sql.Types;
 /**
  * ScalarType for java.math.BigInteger.
  */
-public final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
+final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
 
-  public ScalarTypeMathBigInteger() {
+  ScalarTypeMathBigInteger() {
     super(BigInteger.class, false, Types.BIGINT);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
index a04925ebc..1b1403230 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
@@ -11,10 +11,9 @@ import java.time.Month;
 /**
  * ScalarType mapping for Month enum.
  */
-public final class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
+final class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
 
   static final EnumToDbIntegerMap beanDbMap = new EnumToDbIntegerMap();
-
   static {
     Month[] values = Month.values();
     for (Month value : values) {
@@ -22,7 +21,7 @@ public final class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
     }
   }
 
-  public ScalarTypeMonth() {
+  ScalarTypeMonth() {
     super(beanDbMap, Month.class, 1);
   }
 
diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestLocaleParse.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java
similarity index 97%
rename from ebean-core/src/test/java/org/tests/unitinternal/TestLocaleParse.java
rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java
index 33f4ef818..6e81002da 100644
--- a/ebean-core/src/test/java/org/tests/unitinternal/TestLocaleParse.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java
@@ -1,4 +1,4 @@
-package org.tests.unitinternal;
+package io.ebeaninternal.server.type;
 
 import io.ebeaninternal.server.type.ScalarTypeLocale;
 import org.junit.Assert;
diff --git a/ebean-core/src/test/java/io/ebean/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
similarity index 97%
rename from ebean-core/src/test/java/io/ebean/server/type/TestTypeManager.java
rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
index 537191972..da942345d 100644
--- a/ebean-core/src/test/java/io/ebean/server/type/TestTypeManager.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
@@ -1,9 +1,12 @@
-package io.ebean.server.type;
+package io.ebeaninternal.server.type;
 
 import io.ebean.BaseTestCase;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.core.type.ScalarType;
+import io.ebean.server.type.MyDayOfWeek;
+import io.ebean.server.type.MyEnum;
+import io.ebean.server.type.MySex;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import io.ebeaninternal.server.type.RsetDataReader;

From d096706685d77964b5300de2f14c2d656fa6cac5 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 21:03:53 +1200
Subject: [PATCH 407/447] #2318 - Refactor internals - final classes in
 internal api package

---
 .../java/io/ebeaninternal/api/BeanCacheResult.java  |  4 ++--
 .../io/ebeaninternal/api/BinaryReadContext.java     |  2 +-
 .../io/ebeaninternal/api/BinaryWriteContext.java    |  3 +--
 .../main/java/io/ebeaninternal/api/BindParams.java  |  9 +--------
 .../java/io/ebeaninternal/api/BindValuesKey.java    |  2 +-
 .../io/ebeaninternal/api/CacheIdLookupMany.java     |  3 +--
 .../io/ebeaninternal/api/CacheIdLookupSingle.java   |  2 +-
 .../main/java/io/ebeaninternal/api/DbOffline.java   |  2 +-
 .../java/io/ebeaninternal/api/ExtraMetrics.java     |  2 +-
 .../main/java/io/ebeaninternal/api/HashQuery.java   |  2 +-
 .../java/io/ebeaninternal/api/HelpScopeTrans.java   |  2 +-
 .../java/io/ebeaninternal/api/LoadBeanRequest.java  |  6 +-----
 .../java/io/ebeaninternal/api/LoadManyRequest.java  |  5 +----
 .../java/io/ebeaninternal/api/ManyWhereJoins.java   |  5 +----
 .../src/main/java/io/ebeaninternal/api/Monitor.java | 12 ------------
 .../io/ebeaninternal/api/NaturalKeyEntryBasic.java  |  2 +-
 .../io/ebeaninternal/api/NaturalKeyEntrySimple.java |  2 +-
 .../java/io/ebeaninternal/api/NaturalKeyEq.java     |  2 +-
 .../io/ebeaninternal/api/NaturalKeyQueryData.java   |  8 +-------
 .../java/io/ebeaninternal/api/NaturalKeySet.java    |  3 +--
 .../io/ebeaninternal/api/NoopQueryBindCapture.java  |  2 +-
 .../io/ebeaninternal/api/NoopQueryPlanManager.java  |  2 +-
 .../java/io/ebeaninternal/api/PlatformMatch.java    |  3 +--
 .../java/io/ebeaninternal/api/PropertyJoin.java     |  9 +--------
 .../main/java/io/ebeaninternal/api/ScopeTrans.java  | 13 +------------
 .../io/ebeaninternal/api/ScopedTransaction.java     |  4 +---
 .../ebeaninternal/api/SpiExpressionValidation.java  |  3 +--
 .../java/io/ebeaninternal/api/TransactionEvent.java |  8 +-------
 .../io/ebeaninternal/api/TransactionEventTable.java |  7 +------
 .../java/io/ebeaninternal/json/DJsonService.java    |  2 +-
 .../java/io/ebeaninternal/json/EJsonReader.java     |  2 +-
 .../java/io/ebeaninternal/json/EJsonWriter.java     |  2 +-
 .../java/io/ebeaninternal/json/ModifyAwareFlag.java |  2 +-
 .../io/ebeaninternal/json/ModifyAwareIterator.java  |  3 +--
 .../java/io/ebeaninternal/json/ModifyAwareList.java |  3 +--
 .../ebeaninternal/json/ModifyAwareListIterator.java |  3 +--
 .../java/io/ebeaninternal/json/ModifyAwareMap.java  |  6 +-----
 .../java/io/ebeaninternal/json/ModifyAwareSet.java  |  7 +++----
 .../server/autotune/NoAutoTuneService.java          |  2 +-
 39 files changed, 41 insertions(+), 120 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/Monitor.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java b/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java
index c3b70e2e1..11e6d5f15 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java
@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * The results of bean cache hit.
  */
-public class BeanCacheResult<T> {
+public final class BeanCacheResult<T> {
 
   private final List<Entry<T>> list = new ArrayList<>();
 
@@ -27,7 +27,7 @@ public class BeanCacheResult<T> {
   /**
    * Bean and cache key pair.
    */
-  static class Entry<T> {
+  static final class Entry<T> {
 
     private final T bean;
     private final Object key;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BinaryReadContext.java b/ebean-core/src/main/java/io/ebeaninternal/api/BinaryReadContext.java
index 105a9b81b..bde5c8167 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BinaryReadContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BinaryReadContext.java
@@ -7,7 +7,7 @@ import java.io.IOException;
 /**
  * Context used to read binary format messages.
  */
-public class BinaryReadContext {
+public final class BinaryReadContext {
 
   private final DataInputStream in;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BinaryWriteContext.java b/ebean-core/src/main/java/io/ebeaninternal/api/BinaryWriteContext.java
index c36bfebc8..610ad41ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BinaryWriteContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BinaryWriteContext.java
@@ -6,10 +6,9 @@ import java.io.IOException;
 /**
  * Context used to write binary message (like RemoteTransactionEvent).
  */
-public class BinaryWriteContext {
+public final class BinaryWriteContext {
 
   private final DataOutputStream out;
-
   private long counter;
 
   public BinaryWriteContext(DataOutputStream out) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index 64a0a0287..7c5264892 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -13,35 +13,28 @@ import java.util.Map.Entry;
  * Supports ordered or named parameters.
  * </p>
  */
-public class BindParams implements Serializable {
+public final class BindParams implements Serializable {
 
   private static final long serialVersionUID = 4541081933302086285L;
 
   private final List<Param> positionedParameters = new ArrayList<>();
-
   private final Map<String, Param> namedParameters = new LinkedHashMap<>();
-
   /**
    * This is the sql. For named parameters this is the sql after the named
    * parameters have been replaced with question mark place holders and the
    * parameters have been ordered by addNamedParamInOrder().
    */
   private String preparedSql;
-
   /**
    * Bind hash and count used to detect when the bind values have changed such
    * that the generated SQL (with named parameters) needs to be recalculated.
    */
   private String bindHash;
-
   /**
    * Helper to add positioned parameters in order.
    */
   private int addPos;
 
-  public BindParams() {
-  }
-
   /**
    * Reset positioned parameters (usually due to bind parameter expansion).
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
index 4a6eac324..062932af2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
@@ -9,7 +9,7 @@ import java.util.List;
  * The equals/hashCode implementation must meet the requirement that the query bind values
  * match for L2 query cache hit (given the query plan hash is already a match).
  */
-public class BindValuesKey {
+public final class BindValuesKey {
 
   private final List<Object> values = new ArrayList<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java
index bfe9d5b84..2c896e2fb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java
@@ -11,10 +11,9 @@ import java.util.Set;
 /**
  * Used for bean cache lookup with where ids in expression.
  */
-public class CacheIdLookupMany<T> implements CacheIdLookup<T> {
+public final class CacheIdLookupMany<T> implements CacheIdLookup<T> {
 
   private final IdInExpression idInExpression;
-
   private int remaining;
 
   public CacheIdLookupMany(IdInExpression idInExpression) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java
index 47ee89c4b..bfc55b5c1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java
@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * Used for bean cache lookup with a single id value.
  */
-public class CacheIdLookupSingle<T> implements CacheIdLookup<T> {
+public final class CacheIdLookupSingle<T> implements CacheIdLookup<T> {
 
   private final Object idValue;
   private boolean found;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java b/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java
index 9e184ad61..0d3c72db7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/DbOffline.java
@@ -6,7 +6,7 @@ import io.ebean.annotation.Platform;
  * Helper to indicate that an EbeanServer should come up offline
  * typically for DDL generation purposes.
  */
-public class DbOffline {
+public final class DbOffline {
 
   private static final String KEY = "ebean.dboffline";
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java
index 5d6f79527..57280b9f3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java
@@ -8,7 +8,7 @@ import io.ebean.metric.TimedMetric;
 /**
  * Extra metrics collected to measure internal behaviour.
  */
-public class ExtraMetrics {
+public final class ExtraMetrics {
 
   private final TimedMetric bindCapture;
   private final TimedMetric planCollect;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
index faddb7bee..a207f3c57 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 /**
  * A hash key for a query including both the query plan and bind values.
  */
-public class HashQuery {
+public final class HashQuery {
 
   private final CQueryPlanKey planHash;
   private final BindValuesKey bindValuesKey;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java
index cb7643c65..7356fbc01 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java
@@ -6,7 +6,7 @@ import io.ebean.TxScope;
 /**
  * Helper object to make AOP generated code simpler.
  */
-public class HelpScopeTrans {
+public final class HelpScopeTrans {
   private static boolean enabled = true;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
index 9d72463a5..a763182b2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
@@ -13,16 +13,12 @@ import java.util.Set;
 /**
  * Request for loading ManyToOne and OneToOne relationships.
  */
-public class LoadBeanRequest extends LoadRequest {
+public final class LoadBeanRequest extends LoadRequest {
 
   private final List<EntityBeanIntercept> batch;
-
   private final LoadBeanBuffer loadBuffer;
-
   private final String lazyLoadProperty;
-
   private final boolean loadCache;
-
   private boolean loadedFromCache;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index 0343b8579..cd49558d6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -15,16 +15,13 @@ import java.util.List;
 /**
  * Request for loading Associated Many Beans.
  */
-public class LoadManyRequest extends LoadRequest {
+public final class LoadManyRequest extends LoadRequest {
 
   private static final Logger logger = LoggerFactory.getLogger(LoadManyRequest.class);
 
   private final List<BeanCollection<?>> batch;
-
   private final LoadManyBuffer loadContext;
-
   private final boolean onlyIds;
-
   private final boolean loadCache;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
index 0c6b128a2..91fc49d21 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
@@ -17,16 +17,13 @@ import java.util.TreeSet;
  * Holds the joins needs to support the many where predicates.
  * These joins are independent of any 'fetch' joins on the many.
  */
-public class ManyWhereJoins implements Serializable {
+public final class ManyWhereJoins implements Serializable {
 
   private static final long serialVersionUID = -6490181101871795417L;
 
   private final TreeMap<String, PropertyJoin> joins = new TreeMap<>();
-
   private List<String> formulaJoinProperties;
-
   private boolean aggregation;
-
   /**
    * 'Mode' indicating that joins added while this is true are required to be outer joins.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/Monitor.java b/ebean-core/src/main/java/io/ebeaninternal/api/Monitor.java
deleted file mode 100644
index e1b930769..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/api/Monitor.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.ebeaninternal.api;
-
-import java.io.Serializable;
-
-/**
- * Object used as a synchronization monitor that is serializable.
- */
-public class Monitor implements Serializable {
-
-  private static final long serialVersionUID = -2741687226680981940L;
-
-}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java
index aff59771b..61514bc66 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java
@@ -11,7 +11,7 @@ import java.util.Map;
 /**
  * Natural key entry with name value pairs for each of the properties making up the key.
  */
-class NaturalKeyEntryBasic implements NaturalKeyEntry {
+final class NaturalKeyEntryBasic implements NaturalKeyEntry {
 
   private final Map<String,Object> map = new HashMap<>();
   private final String key;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java
index 0fa7bef62..0ad6e9343 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-class NaturalKeyEntrySimple implements NaturalKeyEntry {
+final class NaturalKeyEntrySimple implements NaturalKeyEntry {
 
   private final String key;
   private final Object val;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEq.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEq.java
index e7a6218df..3933c2f4b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEq.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEq.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 /**
  * A property value pair in a natural key lookup.
  */
-public class NaturalKeyEq {
+public final class NaturalKeyEq {
 
   final String property;
   final Object value;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
index 6966787d5..a8b4d348d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
@@ -11,28 +11,22 @@ import java.util.Set;
 /**
  * Collects the data for processing the natural key cache processing.
  */
-public class NaturalKeyQueryData<T> {
+public final class NaturalKeyQueryData<T> {
 
   private final BeanNaturalKey naturalKey;
-
   /**
    * Only one of IN or IN PAIRS is allowed.
    */
   private boolean hasIn;
-
   // IN Pairs clause - only one allowed
   private String inProperty0, inProperty1;
   private List<Pairs.Entry> inPairs;
-
   // IN clause - only one allowed
   private List<Object> inValues;
   private String inProperty;
-
   // normal EQ expressions
   private List<NaturalKeyEq> eqList;
-
   private NaturalKeySet set;
-
   private int hitCount;
 
   public NaturalKeyQueryData(BeanNaturalKey naturalKey) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java
index cf31afbf9..89b5ae484 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java
@@ -4,8 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-public class NaturalKeySet {
-
+public final class NaturalKeySet {
 
   private final Map<Object, NaturalKeyEntry> map = new LinkedHashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java
index 2f7162c70..33ee06b54 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.api;
 
 import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
-class NoopQueryBindCapture implements SpiQueryBindCapture {
+final class NoopQueryBindCapture implements SpiQueryBindCapture {
 
   @Override
   public boolean collectFor(long timeMicros) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java
index 813121f92..9c6a54952 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryPlanManager.java
@@ -6,7 +6,7 @@ import io.ebean.meta.QueryPlanRequest;
 import java.util.Collections;
 import java.util.List;
 
-class NoopQueryPlanManager implements QueryPlanManager {
+final class NoopQueryPlanManager implements QueryPlanManager {
 
   @Override
   public void setDefaultThreshold(long thresholdMicros) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/PlatformMatch.java b/ebean-core/src/main/java/io/ebeaninternal/api/PlatformMatch.java
index a333008e9..eeb51221e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/PlatformMatch.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/PlatformMatch.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 import io.ebean.annotation.Platform;
 import io.ebean.util.StringHelper;
 
-public class PlatformMatch {
+public final class PlatformMatch {
 
   /**
    * Return true if the script platforms is a match/supported for the given platform.
@@ -15,7 +15,6 @@ public class PlatformMatch {
     if (platforms == null || platforms.trim().isEmpty()) {
       return true;
     }
-
     // match on base platform name and platform name
     for (String name : StringHelper.splitNames(platforms)) {
       if (name.equalsIgnoreCase(platform.base().name()) || name.equalsIgnoreCase(platform.name())) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java b/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java
index 2b11732b0..ab63e09d4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java
@@ -5,16 +5,9 @@ import io.ebeaninternal.server.query.SqlJoinType;
 /**
  * Represents a join required for a given property and whether than needs to be an outer join.
  */
-public class PropertyJoin {
+public final class PropertyJoin {
 
-  /**
-   * The property name.
-   */
   private final String property;
-
-  /**
-   * Set to true if the property needs to be an outer join.
-   */
   private final SqlJoinType joinType;
 
   public PropertyJoin(String property, SqlJoinType joinType) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index 631b6dfb8..f3ca6555f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
 /**
  * Used internally to handle the scoping of transactions for methods.
  */
-public class ScopeTrans {
+public final class ScopeTrans {
 
   private static final int OPCODE_ATHROW = 191;
 
@@ -15,43 +15,32 @@ public class ScopeTrans {
    * The transaction in scope (can be null).
    */
   private final SpiTransaction transaction;
-
   /**
    * If true by default rollback on Checked exceptions.
    */
   private final boolean rollbackOnChecked;
-
   /**
    * True if the transaction was created and hence should be committed
    * on finally if it hasn't already been rolled back.
    */
   private final boolean created;
-
   /**
    * Explicit set of Exceptions that DO NOT cause a rollback to occur.
    */
   private final ArrayList<Class<? extends Throwable>> noRollbackFor;
-
   /**
    * Explicit set of Exceptions that DO cause a rollback to occur.
    */
   private final ArrayList<Class<? extends Throwable>> rollbackFor;
-
   private Boolean restoreBatch;
-
   private Boolean restoreBatchOnCascade;
-
   private int restoreBatchSize;
-
   private Boolean restoreBatchGeneratedKeys;
-
   private boolean restoreBatchFlushOnQuery;
-
   /**
    * Flag set when a rollback has occurred.
    */
   private boolean rolledBack;
-
   /**
    * Flag set when nested commit has occurred.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index f5a1db07b..383746f13 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -10,15 +10,13 @@ import javax.persistence.PersistenceException;
  *
  * These can be nested and internally they are pushed and popped from a stack.
  */
-public class ScopedTransaction extends SpiTransactionProxy {
+public final class ScopedTransaction extends SpiTransactionProxy {
 
   private final TransactionScopeManager manager;
-
   /**
    * Stack of 'nested' transactions.
    */
   private final ArrayStack<ScopeTrans> stack = new ArrayStack<>();
-
   private ScopeTrans current;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java
index e02397a75..203827820 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java
@@ -8,10 +8,9 @@ import java.util.Set;
 /**
  * Property expression validation request for a given root bean type.
  */
-public class SpiExpressionValidation {
+public final class SpiExpressionValidation {
 
   private final BeanType<?> desc;
-
   private final LinkedHashSet<String> unknown = new LinkedHashSet<>();
 
   public SpiExpressionValidation(BeanType<?> desc) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index 52d87d23e..22a5ba904 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -20,7 +20,7 @@ import java.util.List;
  * to the TransactionEventManager.
  * </p>
  */
-public class TransactionEvent implements Serializable {
+public final class TransactionEvent implements Serializable {
 
   private static final long serialVersionUID = 7230903304106097120L;
 
@@ -29,13 +29,9 @@ public class TransactionEvent implements Serializable {
    * the cluster).
    */
   private final transient boolean local;
-
   private TransactionEventTable eventTables;
-
   private transient List<PersistRequestBean<?>> listenerNotify;
-
   private transient DeleteByIdMap deleteByIdMap;
-
   private transient CacheChangeSet changeSet;
 
   /**
@@ -110,11 +106,9 @@ public class TransactionEvent implements Serializable {
    * Build and return the cache changeSet.
    */
   public CacheChangeSet buildCacheChanges(TransactionManager manager) {
-
     if (changeSet == null && deleteByIdMap == null && eventTables == null) {
       return null;
     }
-
     if (changeSet == null) {
       changeSet = new CacheChangeSet();
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
index 18ea4f5a3..de55cd163 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEventTable.java
@@ -28,20 +28,17 @@ public final class TransactionEventTable implements Serializable, BinaryWritable
   }
 
   public void add(TransactionEventTable table) {
-
     for (TableIUD iud : table.values()) {
       add(iud);
     }
   }
 
   public void add(String table, boolean insert, boolean update, boolean delete) {
-
     table = table.toUpperCase();
     add(new TableIUD(table, insert, update, delete));
   }
 
   public void add(TableIUD newTableIUD) {
-
     TableIUD existingTableIUD = map.put(newTableIUD.getTableName(), newTableIUD);
     if (existingTableIUD != null) {
       newTableIUD.add(existingTableIUD);
@@ -56,7 +53,7 @@ public final class TransactionEventTable implements Serializable, BinaryWritable
     return map.values();
   }
 
-  public static class TableIUD implements Serializable, BulkTableEvent, BinaryWritable {
+  public static final class TableIUD implements Serializable, BulkTableEvent, BinaryWritable {
 
     private static final long serialVersionUID = -1958317571064162089L;
 
@@ -73,12 +70,10 @@ public final class TransactionEventTable implements Serializable, BinaryWritable
     }
 
     public static TableIUD readBinaryMessage(BinaryReadContext dataInput) throws IOException {
-
       String table = dataInput.readUTF();
       boolean insert = dataInput.readBoolean();
       boolean update = dataInput.readBoolean();
       boolean delete = dataInput.readBoolean();
-
       return new TableIUD(table, insert, update, delete);
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/DJsonService.java b/ebean-core/src/main/java/io/ebeaninternal/json/DJsonService.java
index d98aa6d7c..aa3443ced 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/DJsonService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/DJsonService.java
@@ -17,7 +17,7 @@ import java.util.Set;
 /**
  * Utility that converts between JSON content and simple java Maps/Lists.
  */
-public class DJsonService implements SpiJsonService {
+public final class DJsonService implements SpiJsonService {
 
   /**
    * Write the nested Map/List as json.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/EJsonReader.java b/ebean-core/src/main/java/io/ebeaninternal/json/EJsonReader.java
index fa3451f8e..938f7f5a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/EJsonReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/EJsonReader.java
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-class EJsonReader {
+final class EJsonReader {
 
   static final JsonFactory json = new JsonFactory();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/EJsonWriter.java b/ebean-core/src/main/java/io/ebeaninternal/json/EJsonWriter.java
index 1c110c077..2a05f306d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/EJsonWriter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/EJsonWriter.java
@@ -14,7 +14,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-class EJsonWriter {
+final class EJsonWriter {
 
   /**
    * Base jsonFactory implementation used when it is not passed in.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareFlag.java b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareFlag.java
index 911675605..08cdb273e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareFlag.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareFlag.java
@@ -7,7 +7,7 @@ import java.io.Serializable;
 /**
  * Detects when content has been modified and as such needs to be persisted (included in an update).
  */
-public class ModifyAwareFlag implements ModifyAwareType, Serializable {
+public final class ModifyAwareFlag implements ModifyAwareType, Serializable {
 
   private static final long serialVersionUID = 1;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareIterator.java b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareIterator.java
index 7e21e297f..fb57f3447 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareIterator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareIterator.java
@@ -7,10 +7,9 @@ import java.util.Iterator;
 /**
  * Wraps an iterator for the purposes of detecting modifications.
  */
-public class ModifyAwareIterator<E> implements Iterator<E> {
+public final class ModifyAwareIterator<E> implements Iterator<E> {
 
   private final ModifyAwareType owner;
-
   private final Iterator<E> it;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareList.java b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
index 7803871df..4743cf27b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareList.java
@@ -13,12 +13,11 @@ import java.util.Objects;
 /**
  * Modify aware wrapper of a list.
  */
-public class ModifyAwareList<E> implements List<E>, ModifyAwareType, Serializable {
+public final class ModifyAwareList<E> implements List<E>, ModifyAwareType, Serializable {
 
   private static final long serialVersionUID = 1;
 
   final List<E> list;
-
   final ModifyAwareType owner;
 
   public ModifyAwareList(List<E> list) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareListIterator.java b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareListIterator.java
index 5f6d5f013..974e88700 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareListIterator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareListIterator.java
@@ -7,10 +7,9 @@ import java.util.ListIterator;
 /**
  * Modify aware wrapper of a ListIterator.
  */
-public class ModifyAwareListIterator<E> implements ListIterator<E> {
+public final class ModifyAwareListIterator<E> implements ListIterator<E> {
 
   final ModifyAwareType owner;
-
   final ListIterator<E> iterator;
 
   public ModifyAwareListIterator(ModifyAwareType owner, ListIterator<E> iterator) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
index 9d5e1fffe..2b2610a2e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareMap.java
@@ -12,15 +12,11 @@ import java.util.Set;
 /**
  * Map that is wraps an underlying map for the purpose of detecting changes.
  */
-public class ModifyAwareMap<K, V> implements Map<K, V>, ModifyAwareType, Serializable {
+public final class ModifyAwareMap<K, V> implements Map<K, V>, ModifyAwareType, Serializable {
 
   private static final long serialVersionUID = 1;
 
   final ModifyAwareType owner;
-
-  /**
-   * The underlying map.
-   */
   final Map<K, V> map;
 
   public ModifyAwareMap(Map<K, V> underlying) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
index f20b39602..06353dd98 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/json/ModifyAwareSet.java
@@ -11,13 +11,12 @@ import java.util.Set;
 /**
  * Wraps a Set for the purposes of detecting modifications.
  */
-public class ModifyAwareSet<E> implements Set<E>, ModifyAwareType, Serializable {
+public final class ModifyAwareSet<E> implements Set<E>, ModifyAwareType, Serializable {
 
   private static final long serialVersionUID = 1;
 
-  protected final ModifyAwareType owner;
-
-  protected final Set<E> set;
+  private final ModifyAwareType owner;
+  private final Set<E> set;
 
   /**
    * Create as top level with it's own ModifyAwareOwner instance wrapping the given Set.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/autotune/NoAutoTuneService.java b/ebean-core/src/main/java/io/ebeaninternal/server/autotune/NoAutoTuneService.java
index b826329bc..b849bbfb7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/autotune/NoAutoTuneService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/autotune/NoAutoTuneService.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.api.SpiQuery;
 /**
  * Noop service when AutoTuneService is not available.
  */
-public class NoAutoTuneService implements AutoTuneService {
+public final class NoAutoTuneService implements AutoTuneService {
 
   @Override
   public void startup() {

From 190a2c47e92fe8eb06fbaee7b5fffd957e8f8c88 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 21:24:56 +1200
Subject: [PATCH 408/447] #2318 - Refactor internals - final classes in cache
 package

---
 .../server/cache/CacheChangeBeanRemove.java   |  3 +-
 .../server/cache/CacheChangeBeanUpdate.java   |  2 +-
 .../cache/CacheChangeNaturalKeyPut.java       |  2 +-
 .../server/cache/CacheChangeSet.java          | 15 ++-----
 .../server/cache/CacheManagerOptions.java     |  7 +---
 .../server/cache/CachedBeanData.java          |  3 +-
 .../server/cache/CachedBeanDataFromBean.java  |  4 +-
 .../server/cache/CachedBeanDataToBean.java    | 10 +----
 .../server/cache/CachedBeanId.java            |  2 +-
 .../server/cache/CachedManyIds.java           |  2 +-
 .../server/cache/DefaultCacheAdapter.java     |  2 +-
 .../server/cache/DefaultCacheHolder.java      |  6 +--
 .../server/cache/DefaultServerCache.java      | 39 ++++---------------
 .../cache/DefaultServerCacheConfig.java       | 14 +++----
 .../cache/DefaultServerCacheFactory.java      |  3 +-
 .../cache/DefaultServerCacheManager.java      |  6 +--
 .../cache/DefaultServerCachePlugin.java       |  2 +-
 .../server/cache/RemoteCacheEvent.java        | 10 ++---
 .../changelog/DefaultChangeLogListener.java   |  2 +-
 .../changelog/DefaultChangeLogRegister.java   |  4 --
 .../readaudit/DefaultReadAuditPrepare.java    |  2 +-
 21 files changed, 35 insertions(+), 105 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java
index c6f99f194..7c2086c55 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java
@@ -8,10 +8,9 @@ import java.util.Collection;
 /**
  * Change to remove bean from L2 cache.
  */
-class CacheChangeBeanRemove implements CacheChange {
+final class CacheChangeBeanRemove implements CacheChange {
 
   private final BeanDescriptor<?> descriptor;
-
   private final Collection<Object> ids;
 
   CacheChangeBeanRemove(Object id, BeanDescriptor<?> descriptor) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
index 391e778c2..8203d3a19 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java
@@ -7,7 +7,7 @@ import java.util.Map;
 /**
  * Put a new bean entry into the cache.
  */
-class CacheChangeBeanUpdate implements CacheChange {
+final class CacheChangeBeanUpdate implements CacheChange {
 
   private final BeanDescriptor<?> desc;
   private final String key;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java
index f90a23749..72f5cfb45 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 /**
  * Change the natural key mapping for a bean.
  */
-class CacheChangeNaturalKeyPut implements CacheChange {
+final class CacheChangeNaturalKeyPut implements CacheChange {
 
   private final BeanDescriptor<?> descriptor;
   private final String key;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index 20cd7329c..a1393db06 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -14,18 +14,13 @@ import java.util.Set;
 /**
  * List of changes to be applied to L2 cache.
  */
-public class CacheChangeSet {
+public final 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 Set<BeanDescriptor<?>> beanCaches = new HashSet<>();
-
   private final Map<BeanDescriptor<?>, CacheChangeBeanRemove> beanRemoveMap = new HashMap<>();
-
   private final Map<ManyKey, ManyChange> manyChangeMap = new HashMap<>();
 
   /**
@@ -173,14 +168,11 @@ public class CacheChangeSet {
   /**
    * Changes for a specific many property.
    */
-  private static class ManyChange implements CacheChange {
+  private static final class ManyChange implements CacheChange {
 
     final ManyKey key;
-
     final Set<Object> removes = new HashSet<>();
-
     final Map<Object, CachedManyIds> puts = new LinkedHashMap<>();
-
     boolean clear;
 
     ManyChange(ManyKey key) {
@@ -229,10 +221,9 @@ public class CacheChangeSet {
   /**
    * Key for changes on a many property.
    */
-  private static class ManyKey {
+  private static final class ManyKey {
 
     private final BeanDescriptor<?> desc;
-
     private final String manyProperty;
 
     ManyKey(BeanDescriptor<?> desc, String manyProperty) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java
index 98490702d..ae0c10f4c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java
@@ -10,18 +10,13 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 /**
  * Configuration options when creating the default cache manager.
  */
-public class CacheManagerOptions {
+public final class CacheManagerOptions {
 
   private final ClusterManager clusterManager;
-
   private final DatabaseConfig databaseConfig;
-
   private final boolean localL2Caching;
-
   private CurrentTenantProvider currentTenantProvider;
-
   private QueryCacheEntryValidate queryCacheEntryValidate;
-
   private ServerCacheFactory cacheFactory = new DefaultServerCacheFactory();
   private ServerCacheOptions beanDefault = new ServerCacheOptions();
   private ServerCacheOptions queryDefault = new ServerCacheOptions();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java
index 930adae21..23ced1d5e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java
@@ -11,13 +11,12 @@ import java.util.Map;
 /**
  * Data held in the bean cache for cached beans.
  */
-public class CachedBeanData implements Externalizable {
+public final class CachedBeanData implements Externalizable {
 
   private long whenCreated;
   private long version;
   private String discValue;
   private Map<String, Object> data;
-
   /**
    * The sharable bean is effectively transient (near cache only).
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
index 32ac2ce9a..2fd3fd46b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java
@@ -9,10 +9,9 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class CachedBeanDataFromBean {
+public final class CachedBeanDataFromBean {
 
   public static CachedBeanData extract(BeanDescriptor<?> desc, EntityBean bean) {
-
     EntityBeanIntercept ebi = bean._ebean_getIntercept();
     Map<String, Object> data = new LinkedHashMap<>();
 
@@ -46,7 +45,6 @@ public class CachedBeanDataFromBean {
   }
 
   private static EntityBean createSharableBean(BeanDescriptor<?> desc, EntityBean bean, EntityBeanIntercept beanEbi) {
-
     if (!desc.isCacheSharableBeans() || !beanEbi.isFullyLoadedBean()) {
       return null;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
index 6dbdae1ff..08f3a80fd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java
@@ -7,30 +7,24 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
-public class CachedBeanDataToBean {
-
+public final 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) {
         desc = desc.getInheritInfo().readType(bean.getClass()).desc();
     }
-
     if (idProperty != null) {
       // load the id property
       loadProperty(bean, cacheBeanData, ebi, idProperty, context);
     }
-
     // load the non-many properties
     for (BeanProperty prop : desc.propertiesNonMany()) {
       loadProperty(bean, cacheBeanData, ebi, prop, context);
     }
-
     for (BeanPropertyAssocMany<?> prop : desc.propertiesMany()) {
       if (prop.isElementCollection()) {
         loadProperty(bean, cacheBeanData, ebi, prop, context);
@@ -38,12 +32,10 @@ public class CachedBeanDataToBean {
         prop.createReferenceIfNull(bean);
       }
     }
-
     ebi.setLoadedLazy();
   }
 
   private static void loadProperty(EntityBean bean, CachedBeanData cacheBeanData, EntityBeanIntercept ebi, BeanProperty prop, PersistenceContext context) {
-
     if (cacheBeanData.isLoaded(prop.getName())) {
       if (!ebi.isLoadedProperty(prop.getPropertyIndex())) {
         Object value = cacheBeanData.getData(prop.getName());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanId.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanId.java
index 45eab630c..6b0fc903b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanId.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedBeanId.java
@@ -10,7 +10,7 @@ import java.io.ObjectOutput;
  * <p>
  * Put into L2 cache such that we know the type of a bean with inheritance.
  */
-public class CachedBeanId implements Externalizable {
+public final class CachedBeanId implements Externalizable {
 
   private String discValue;
   private Object id;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java
index 155a43ff5..dd589deea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java
@@ -13,7 +13,7 @@ import java.util.List;
  * This is effectively just the Id values for each of the beans in the collection.
  * </p>
  */
-public class CachedManyIds implements Externalizable {
+public final class CachedManyIds implements Externalizable {
 
   private List<Object> idList;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
index bd7b0a763..413af049d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java
@@ -13,7 +13,7 @@ import java.util.List;
  * Used to hide the Supplier part of the SpiCacheManager API from public use.
  * </p>
  */
-public class DefaultCacheAdapter implements ServerCacheManager {
+public final class DefaultCacheAdapter implements ServerCacheManager {
 
   private final SpiCacheManager cacheManager;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index cf15c51fe..6d632acc3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -23,14 +23,13 @@ import java.util.concurrent.locks.ReentrantLock;
 /**
  * Manages the construction of caches.
  */
-class DefaultCacheHolder {
+final class DefaultCacheHolder {
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.ALL");
 
   private final ReentrantLock lock = new ReentrantLock();
   private final ConcurrentHashMap<String, ServerCache> allCaches = new ConcurrentHashMap<>();
   private final ConcurrentHashMap<String, Set<String>> collectIdCaches = new ConcurrentHashMap<>();
-
   private final ServerCacheFactory cacheFactory;
   private final ServerCacheOptions beanDefault;
   private final ServerCacheOptions queryDefault;
@@ -76,7 +75,6 @@ class DefaultCacheHolder {
    * Return the cache for a given bean type.
    */
   private ServerCache getCacheInternal(Class<?> beanType, ServerCacheType type, String collectionProperty) {
-
     String shortName = key(beanType.getSimpleName(), collectionProperty, type);
     String fullKey = key(beanType.getName(), collectionProperty, type);
     return allCaches.computeIfAbsent(fullKey, s -> createCache(beanType, type, fullKey, shortName));
@@ -143,10 +141,8 @@ 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(nearCache, tuning).applyDefaults(beanDefault);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index 334a0838a..ebd086117 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -39,7 +39,6 @@ public class DefaultServerCache implements ServerCache {
    * The underlying map (ConcurrentHashMap or similar)
    */
   protected final Map<Object, SoftReference<CacheEntry>> map;
-
   protected final CountMetric hitCount;
   protected final CountMetric missCount;
   protected final CountMetric putCount;
@@ -49,16 +48,11 @@ public class DefaultServerCache implements ServerCache {
 
   protected final String name;
   protected final String shortName;
-
-  private int maxSize;
-
+  private final int maxSize;
   private final int trimFrequency;
-
-  private int maxIdleSecs;
-
-  private int maxSecsToLive;
-
-  private TenantAwareKey tenantAwareKey;
+  private final int maxIdleSecs;
+  private final int maxSecsToLive;
+  private final TenantAwareKey tenantAwareKey;
 
   public DefaultServerCache(DefaultServerCacheConfig config) {
     this.name = config.getName();
@@ -71,7 +65,6 @@ public class DefaultServerCache implements ServerCache {
     this.trimFrequency = config.determineTrimFrequency();
 
     MetricFactory factory = MetricFactory.get();
-
     String prefix = "l2n.";
     this.hitCount = factory.createCountMetric(prefix + shortName + ".hit");
     this.missCount = factory.createCountMetric(prefix + shortName + ".miss");
@@ -82,9 +75,7 @@ public class DefaultServerCache implements ServerCache {
   }
 
   public void periodicTrim(BackgroundExecutor executor) {
-
     EvictionRunnable trim = new EvictionRunnable();
-
     // default to trimming the cache every 60 seconds
     long trimFreqSecs = (trimFrequency == 0) ? 60 : trimFrequency;
     executor.scheduleWithFixedDelay(trim, trimFreqSecs, trimFreqSecs, TimeUnit.SECONDS);
@@ -102,11 +93,9 @@ public class DefaultServerCache implements ServerCache {
 
   @Override
   public ServerCacheStatistics getStatistics(boolean reset) {
-
     ServerCacheStatistics cacheStats = new ServerCacheStatistics();
     cacheStats.setCacheName(name);
     cacheStats.setMaxSize(maxSize);
-
     cacheStats.setSize(size());
     cacheStats.setHitCount(hitCount.get(reset));
     cacheStats.setMissCount(missCount.get(reset));
@@ -114,7 +103,6 @@ public class DefaultServerCache implements ServerCache {
     cacheStats.setRemoveCount(removeCount.get(reset));
     cacheStats.setClearCount(clearCount.get(reset));
     cacheStats.setEvictCount(evictCount.get(reset));
-
     return cacheStats;
   }
 
@@ -134,10 +122,8 @@ public class DefaultServerCache implements ServerCache {
 
   @Override
   public int getHitRatio() {
-
     long mc = missCount.get(false);
     long hc = hitCount.get(false);
-
     long totalCount = hc + mc;
     if (totalCount == 0) {
       return 0;
@@ -178,7 +164,6 @@ public class DefaultServerCache implements ServerCache {
    */
   @Override
   public Object get(Object id) {
-
     CacheEntry entry = getCacheEntry(id);
     if (entry == null) {
       missCount.increment();
@@ -252,31 +237,25 @@ public class DefaultServerCache implements ServerCache {
    * Run the eviction based on Idle time, Time to live and LRU last access.
    */
   public void runEviction() {
-
     long trimForMaxSize;
     if (maxSize == 0) {
       trimForMaxSize = 0;
     } else {
       trimForMaxSize = size() - maxSize;
     }
-
     if (maxIdleSecs == 0 && maxSecsToLive == 0 && trimForMaxSize < 0) {
       // nothing to trim on this cache
       return;
     }
-
     long startNanos = System.nanoTime();
-
     long trimmedByIdle = 0;
     long trimmedByGC = 0;
     long trimmedByTTL = 0;
     long trimmedByLRU = 0;
 
     List<CacheEntry> activeList = new ArrayList<>(map.size());
-
     long idleExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxIdleSecs);
     long ttlExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxSecsToLive);
-
     Iterator<SoftReference<CacheEntry>> it = map.values().iterator();
     while (it.hasNext()) {
       SoftReference<CacheEntry> ref = it.next();
@@ -287,16 +266,13 @@ public class DefaultServerCache implements ServerCache {
       } else if (maxIdleSecs > 0 && idleExpireNano > cacheEntry.getLastAccessTime()) {
         it.remove();
         trimmedByIdle++;
-
       } else if (maxSecsToLive > 0 && ttlExpireNano > cacheEntry.getCreateTime()) {
         it.remove();
         trimmedByTTL++;
-
       } else if (trimForMaxSize > 0) {
         activeList.add(cacheEntry);
       }
     }
-
     if (trimForMaxSize > 0 && activeList.size() > maxSize) {
       // sort into last access time ascending
       activeList.sort(BY_LAST_ACCESS);
@@ -313,7 +289,6 @@ public class DefaultServerCache implements ServerCache {
     evictCount.add(trimmedByGC);
     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[{}] gc[{}]",
@@ -324,7 +299,7 @@ public class DefaultServerCache implements ServerCache {
   /**
    * Runnable that calls the eviction routine.
    */
-  public class EvictionRunnable implements Runnable {
+  public final class EvictionRunnable implements Runnable {
 
     @Override
     public void run() {
@@ -335,7 +310,7 @@ public class DefaultServerCache implements ServerCache {
   /**
    * Comparator for sorting by last access time.
    */
-  public static class CompareByLastAccess implements Comparator<CacheEntry>, Serializable {
+  public static final class CompareByLastAccess implements Comparator<CacheEntry>, Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -348,7 +323,7 @@ public class DefaultServerCache implements ServerCache {
   /**
    * Wraps the value to additionally hold createTime and lastAccessTime and hit counter.
    */
-  public static class CacheEntry {
+  public static final class CacheEntry {
 
     private final Object key;
     private final Object value;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
index 5f8ed1d5d..2c329a62a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheConfig.java
@@ -10,16 +10,14 @@ import java.lang.ref.SoftReference;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class DefaultServerCacheConfig {
+public final class DefaultServerCacheConfig {
 
   private final ServerCacheConfig config;
-
-  private int maxSize;
-  private int maxIdleSecs;
-  private int maxSecsToLive;
-  private int trimFrequency;
-
-  private Map<Object, SoftReference<CacheEntry>> map;
+  private final int maxSize;
+  private final int maxIdleSecs;
+  private final int maxSecsToLive;
+  private final int trimFrequency;
+  private final Map<Object, SoftReference<CacheEntry>> map;
 
   public DefaultServerCacheConfig(ServerCacheConfig config) {
     this(config,  new ConcurrentHashMap<>());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
index 1b0476f3c..eab615ed1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java
@@ -11,7 +11,7 @@ import io.ebean.cache.ServerCacheNotify;
 /**
  * Default implementation of ServerCacheFactory.
  */
-class DefaultServerCacheFactory implements ServerCacheFactory {
+final class DefaultServerCacheFactory implements ServerCacheFactory {
 
   private final BackgroundExecutor executor;
 
@@ -31,7 +31,6 @@ class DefaultServerCacheFactory implements ServerCacheFactory {
 
   @Override
   public ServerCache createCache(ServerCacheConfig config) {
-
     DefaultServerCache cache;
     if (config.isQueryCache()) {
       // use a server cache aware of extra validation and QueryCacheEntry
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index 7214437cc..562a98371 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -19,18 +19,14 @@ import java.util.Map;
 /**
  * Manages the bean and query caches.
  */
-public class DefaultServerCacheManager implements SpiCacheManager {
+public final 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;
-
   private final boolean localL2Caching;
-
   private final String serverName;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java
index 262aa8bf2..d4a6a247f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java
@@ -8,7 +8,7 @@ import io.ebean.config.DatabaseConfig;
 /**
  * Default implementation of ServerCachePlugin.
  */
-public class DefaultServerCachePlugin implements ServerCachePlugin {
+public final class DefaultServerCachePlugin implements ServerCachePlugin {
 
   /**
    * Creates the default ServerCacheFactory.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
index ef327d69e..21f04704d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
@@ -12,11 +12,10 @@ import java.util.List;
 /**
  * Cache events broadcast across the cluster.
  */
-public class RemoteCacheEvent implements BinaryWritable {
+public final class RemoteCacheEvent implements BinaryWritable {
 
-  private boolean clearAll;
-
-  private List<String> clearCaches;
+  private final boolean clearAll;
+  private final List<String> clearCaches;
 
   /**
    * Clear all the caches.
@@ -57,10 +56,8 @@ public class RemoteCacheEvent implements BinaryWritable {
   }
 
   public static RemoteCacheEvent readBinaryMessage(BinaryReadContext dataInput) throws IOException {
-
     boolean clearAll = dataInput.readBoolean();
     int size = dataInput.readInt();
-
     List<String> clearCache = null;
     if (size > 0) {
       clearCache = new ArrayList<>(size);
@@ -68,7 +65,6 @@ public class RemoteCacheEvent implements BinaryWritable {
         clearCache.add(dataInput.readUTF());
       }
     }
-
     return new RemoteCacheEvent(clearAll, clearCache);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
index ee8e75424..6e12aa31d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
@@ -20,7 +20,7 @@ public final class DefaultChangeLogListener implements ChangeLogListener, Plugin
   /**
    * The usual application specific logger.
    */
-  protected static final Logger logger = LoggerFactory.getLogger(DefaultChangeLogListener.class);
+  private static final Logger logger = LoggerFactory.getLogger(DefaultChangeLogListener.class);
 
   /**
    * The named logger we send the change set payload to. Can be externally configured as desired.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java
index d9f962969..e7a7bf303 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java
@@ -30,20 +30,16 @@ public final class DefaultChangeLogRegister implements ChangeLogRegister {
 
   @Override
   public ChangeLogFilter getChangeFilter(Class<?> beanType) {
-
     ChangeLog changeLog = getChangeLog(beanType);
     if (changeLog == null) {
       return null;
     }
-
     String[] updatesThatInclude = changeLog.updatesThatInclude();
     if (updatesThatInclude.length == 0) {
       return insertModeInclude(changeLog.inserts()) ? INCLUDE_INSERTS : EXCLUDE_INSERTS;
     }
-
     Set<String> updateProps = new HashSet<>();
     Collections.addAll(updateProps, updatesThatInclude);
-
     return new UpdateFilter(insertModeInclude(changeLog.inserts()), updateProps);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java
index dee68efbd..70065f9ec 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java
@@ -10,7 +10,7 @@ import io.ebean.event.readaudit.ReadEvent;
  * the user context information on the readEvent bean (like user id).
  * </p>
  */
-public class DefaultReadAuditPrepare implements ReadAuditPrepare {
+public final class DefaultReadAuditPrepare implements ReadAuditPrepare {
 
   @Override
   public void prepare(ReadEvent readEvent) {

From 9161e1747632b2efe9da69b76e15be7fc10504b0 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 21:39:57 +1200
Subject: [PATCH 409/447] #2318 - Refactor internals - final classes in
 querybean package

---
 ebean-querybean/src/main/java/io/ebean/typequery/PArray.java    | 2 +-
 .../src/main/java/io/ebean/typequery/PBigDecimal.java           | 2 +-
 .../src/main/java/io/ebean/typequery/PBigInteger.java           | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java  | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PClass.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java | 2 +-
 .../src/main/java/io/ebean/typequery/PDayOfWeek.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java   | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PFile.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PInet.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PInetAddress.java          | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java  | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java  | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaDateMidnight.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaDateTime.java         | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaLocalDate.java        | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaLocalDateTime.java    | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaLocalTime.java        | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PJson.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PLocalDate.java            | 2 +-
 .../src/main/java/io/ebean/typequery/PLocalDateTime.java        | 2 +-
 .../src/main/java/io/ebean/typequery/PLocalTime.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java   | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PLong.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java | 2 +-
 .../src/main/java/io/ebean/typequery/POffsetDateTime.java       | 2 +-
 .../src/main/java/io/ebean/typequery/POffsetTime.java           | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java   | 2 +-
 .../src/main/java/io/ebean/typequery/PScalarComparable.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PShort.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java  | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PString.java   | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PTime.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java | 2 +-
 .../src/main/java/io/ebean/typequery/PTimestamp.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUri.java      | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java      | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PYear.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PYearMonth.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java   | 2 +-
 .../src/main/java/io/ebean/typequery/PZoneOffset.java           | 2 +-
 .../src/main/java/io/ebean/typequery/PZonedDateTime.java        | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java    | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java b/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java
index 61d077636..504a4b5d6 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java
@@ -6,7 +6,7 @@ package io.ebean.typequery;
  * @param <R> the root query bean type
  * @param <E> the element type of the DbArray
  */
-public class PArray<R, E> extends TQPropertyBase<R> {
+public final class PArray<R, E> extends TQPropertyBase<R> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java
index c2ab97572..9e68375bd 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java
@@ -6,7 +6,7 @@ import java.math.BigDecimal;
  * BigDecimal property.
  * @param <R> the root query bean type
  */
-public class PBigDecimal<R> extends PBaseNumber<R,BigDecimal> {
+public final class PBigDecimal<R> extends PBaseNumber<R,BigDecimal> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java
index fd96a13dd..b4e20ce94 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java
@@ -7,7 +7,7 @@ import java.math.BigInteger;
  *
  * @param <R> the root query bean type
  */
-public class PBigInteger<R> extends PBaseNumber<R, BigInteger> {
+public final class PBigInteger<R> extends PBaseNumber<R, BigInteger> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java
index bd0f1608a..55707300e 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PBoolean<R> extends PBaseValueEqual<R, Boolean> {
+public final class PBoolean<R> extends PBaseValueEqual<R, Boolean> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java b/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java
index d23acb089..b64ae4f2c 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java
@@ -7,7 +7,7 @@ import java.util.Calendar;
  *
  * @param <R> the root query bean type
  */
-public class PCalendar<R> extends PBaseDate<R,Calendar> {
+public final class PCalendar<R> extends PBaseDate<R,Calendar> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java b/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java
index 78d64fa40..645b5d37b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java
@@ -7,7 +7,7 @@ import io.ebean.types.Cidr;
  *
  * @param <R> the root query bean type
  */
-public class PCidr<R> extends PBaseValueEqual<R, Cidr> {
+public final class PCidr<R> extends PBaseValueEqual<R, Cidr> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java b/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java
index a372e4004..53aa03469 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PClass<R> extends PBaseString<R,Class> {
+public final class PClass<R> extends PBaseString<R,Class> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java b/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java
index 4eec7eacb..5f2ecb65c 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java
@@ -7,7 +7,7 @@ import java.util.Currency;
  *
  * @param <R> the root query bean type
  */
-public class PCurrency<R> extends PBaseValueEqual<R,Currency> {
+public final class PCurrency<R> extends PBaseValueEqual<R,Currency> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java b/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java
index 2c9589831..199e89709 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java
@@ -8,7 +8,7 @@ import java.time.DayOfWeek;
  *
  * @param <R> the root query bean type
  */
-public class PDayOfWeek<R> extends PBaseNumber<R,DayOfWeek> {
+public final class PDayOfWeek<R> extends PBaseNumber<R,DayOfWeek> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java b/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java
index 0b51dc44b..e7cbd8d0f 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PDouble<R> extends PBaseNumber<R,Double> {
+public final class PDouble<R> extends PBaseNumber<R,Double> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java b/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java
index 2eedd97a8..954fe41ef 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java
@@ -8,7 +8,7 @@ import java.time.Duration;
  *
  * @param <R> the root query bean type
  */
-public class PDuration<R> extends PBaseNumber<R,Duration> {
+public final class PDuration<R> extends PBaseNumber<R,Duration> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java b/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java
index 9c5d53fdd..ccd9ff7aa 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java
@@ -6,7 +6,7 @@ package io.ebean.typequery;
  * @param <E> the enum specific type
  * @param <R> the root query bean type
  */
-public class PEnum<R,E> extends PBaseValueEqual<R,E> {
+public final class PEnum<R,E> extends PBaseValueEqual<R,E> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java b/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java
index 5c78fbac7..c1ea4c2d5 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java
@@ -9,7 +9,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PFile<R> extends TQPropertyBase<R> {
+public final class PFile<R> extends TQPropertyBase<R> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java b/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java
index 29f41a32e..e9bb712c5 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PFloat<R> extends PBaseNumber<R,Float> {
+public final class PFloat<R> extends PBaseNumber<R,Float> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java
index d9be07066..d0fd0d8ab 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java
@@ -7,7 +7,7 @@ import io.ebean.types.Inet;
  *
  * @param <R> the root query bean type
  */
-public class PInet<R> extends PBaseValueEqual<R, Inet> {
+public final class PInet<R> extends PBaseValueEqual<R, Inet> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java
index 9a7d958b4..f4a30ca6a 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java
@@ -8,7 +8,7 @@ import java.net.InetAddress;
  * @param <R> the root query bean type
  */
 
-public class PInetAddress<R> extends PBaseValueEqual<R,InetAddress> {
+public final class PInetAddress<R> extends PBaseValueEqual<R,InetAddress> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java
index 371f1bd0a..3387668e0 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java
@@ -8,7 +8,7 @@ import java.time.Instant;
  *
  * @param <R> the root query bean type
  */
-public class PInstant<R> extends PBaseDate<R,Instant> {
+public final class PInstant<R> extends PBaseDate<R,Instant> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
index 8657461be..ea87dbf3f 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PInteger<R> extends PBaseNumber<R,Integer> {
+public final class PInteger<R> extends PBaseNumber<R,Integer> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java
index a2dc96e52..c6f7051e0 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java
@@ -7,7 +7,7 @@ import org.joda.time.DateMidnight;
  *
  * @param <R> the root query bean type
  */
-public class PJodaDateMidnight<R> extends PBaseDate<R,DateMidnight> {
+public final class PJodaDateMidnight<R> extends PBaseDate<R,DateMidnight> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java
index acda95c92..81132e2a2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java
@@ -7,7 +7,7 @@ import org.joda.time.DateTime;
  *
  * @param <R> the root query bean type
  */
-public class PJodaDateTime<R> extends PBaseDate<R,DateTime> {
+public final class PJodaDateTime<R> extends PBaseDate<R,DateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java
index 784832c0f..e6a5f4d52 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java
@@ -7,7 +7,7 @@ import org.joda.time.LocalDate;
  *
  * @param <R> the root query bean type
  */
-public class PJodaLocalDate<R> extends PBaseDate<R,LocalDate> {
+public final class PJodaLocalDate<R> extends PBaseDate<R,LocalDate> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java
index bfac78c04..bad5359e3 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java
@@ -7,7 +7,7 @@ import org.joda.time.LocalDateTime;
  *
  * @param <R> the root query bean type
  */
-public class PJodaLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
+public final class PJodaLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java
index 5c14ffea9..d92165d33 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java
@@ -8,7 +8,7 @@ import org.joda.time.LocalTime;
  *
  * @param <R> the root query bean type
  */
-public class PJodaLocalTime<R> extends PBaseNumber<R,LocalTime> {
+public final class PJodaLocalTime<R> extends PBaseNumber<R,LocalTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java
index 3601811fb..5eddd0196 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java
@@ -17,7 +17,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PJson<R> extends TQPropertyBase<R> {
+public final class PJson<R> extends TQPropertyBase<R> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java
index 6ffd1285a..189b76eba 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java
@@ -7,7 +7,7 @@ import java.time.LocalDate;
  *
  * @param <R> the root query bean type
  */
-public class PLocalDate<R> extends PBaseDate<R,LocalDate> {
+public final class PLocalDate<R> extends PBaseDate<R,LocalDate> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java
index eea2346dc..feb74e659 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java
@@ -7,7 +7,7 @@ import java.time.LocalDateTime;
  *
  * @param <R> the root query bean type
  */
-public class PLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
+public final class PLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java
index 8470518f2..463365e8e 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java
@@ -8,7 +8,7 @@ import java.time.LocalTime;
  *
  * @param <R> the root query bean type
  */
-public class PLocalTime<R> extends PBaseNumber<R,LocalTime> {
+public final class PLocalTime<R> extends PBaseNumber<R,LocalTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java
index f6a17e024..c360682fc 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java
@@ -7,7 +7,7 @@ import java.util.Locale;
  *
  * @param <R> the root query bean type
  */
-public class PLocale<R> extends PBaseString<R, Locale> {
+public final class PLocale<R> extends PBaseString<R, Locale> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
index d8e4cf58b..10aa4d80c 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PLong<R> extends PBaseNumber<R, Long> {
+public final class PLong<R> extends PBaseNumber<R, Long> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java b/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java
index be11e6a2c..0d127d7e7 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java
@@ -7,7 +7,7 @@ import java.time.Month;
  *
  * @param <R> the root query bean type
  */
-public class PMonth<R> extends PBaseDate<R,Month> {
+public final class PMonth<R> extends PBaseDate<R,Month> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java b/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java
index 5c614edca..27b133f47 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java
@@ -7,7 +7,7 @@ import java.time.MonthDay;
  *
  * @param <R> the root query bean type
  */
-public class PMonthDay<R> extends PBaseDate<R,MonthDay> {
+public final class PMonthDay<R> extends PBaseDate<R,MonthDay> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java
index 5a32f07e9..809248b86 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java
@@ -7,7 +7,7 @@ import java.time.OffsetDateTime;
  *
  * @param <R> the root query bean type
  */
-public class POffsetDateTime<R> extends PBaseNumber<R,OffsetDateTime> {
+public final class POffsetDateTime<R> extends PBaseNumber<R,OffsetDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java
index 675b9895a..e6d226971 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java
@@ -7,7 +7,7 @@ import java.time.OffsetTime;
  *
  * @param <R> the root query bean type
  */
-public class POffsetTime<R> extends PBaseNumber<R,OffsetTime> {
+public final class POffsetTime<R> extends PBaseNumber<R,OffsetTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java b/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java
index 4e479bc61..7d109a6fd 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java
@@ -7,7 +7,7 @@ package io.ebean.typequery;
  * @param <R> the root query bean type
  * @param <D> the scalar type
  */
-public class PScalar<R, D> extends PBaseValueEqual<R, D> {
+public final class PScalar<R, D> extends PBaseValueEqual<R, D> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java b/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java
index 9364f9a8f..6da31acb2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java
@@ -8,7 +8,7 @@ package io.ebean.typequery;
  * @param <R> the root query bean type
  * @param <D> the scalar type
  */
-public class PScalarComparable<R, D extends Comparable<D>> extends PBaseCompareable<R, D> {
+public final class PScalarComparable<R, D extends Comparable<D>> extends PBaseCompareable<R, D> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java b/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
index f8ee7bf8a..3d86b63a2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PShort<R> extends PBaseNumber<R, Short> {
+public final class PShort<R> extends PBaseNumber<R, Short> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
index 5e12b2c66..b239dbc34 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
@@ -8,7 +8,7 @@ import java.sql.Date;
  * @param <R> the root query bean type
  */
 
-public class PSqlDate<R> extends PBaseDate<R,Date> {
+public final class PSqlDate<R> extends PBaseDate<R,Date> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PString.java b/ebean-querybean/src/main/java/io/ebean/typequery/PString.java
index 5efdd346b..c37e6e8b2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PString.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PString.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PString<R> extends PBaseCompareable<R, String> {
+public final class PString<R> extends PBaseCompareable<R, String> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java
index 56f07eaf3..62556f480 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java
@@ -8,7 +8,7 @@ import java.sql.Time;
  *
  * @param <R> the root query bean type
  */
-public class PTime<R> extends PBaseNumber<R,Time> {
+public final class PTime<R> extends PBaseNumber<R,Time> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java b/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java
index 9257b7555..8a8352fef 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java
@@ -7,7 +7,7 @@ import java.util.TimeZone;
  *
  * @param <R> the root query bean type
  */
-public class PTimeZone<R> extends PBaseValueEqual<R,TimeZone> {
+public final class PTimeZone<R> extends PBaseValueEqual<R,TimeZone> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java b/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java
index 31ecbca8a..ace329987 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java
@@ -7,7 +7,7 @@ import java.sql.Timestamp;
  *
  * @param <R> the root query bean type
  */
-public class PTimestamp<R> extends PBaseDate<R,Timestamp> {
+public final class PTimestamp<R> extends PBaseDate<R,Timestamp> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java
index 37f369515..564a626b0 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java
@@ -7,7 +7,7 @@ import java.net.URI;
  *
  * @param <R> the root query bean type
  */
-public class PUri<R> extends PBaseString<R,URI> {
+public final class PUri<R> extends PBaseString<R,URI> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java
index f2a1c8c24..bf981e95f 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java
@@ -7,7 +7,7 @@ import java.net.URL;
  *
  * @param <R> the root query bean type
  */
-public class PUrl<R> extends PBaseString<R,URL> {
+public final class PUrl<R> extends PBaseString<R,URL> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java
index a63e1311b..49c410465 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java
@@ -7,7 +7,7 @@ import java.util.Date;
  *
  * @param <R> the root query bean type
  */
-public class PUtilDate<R> extends PBaseDate<R,Date> {
+public final class PUtilDate<R> extends PBaseDate<R,Date> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java
index e6a4e134f..8f08053eb 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java
@@ -7,7 +7,7 @@ import java.util.UUID;
  *
  * @param <R> the root query bean type
  */
-public class PUuid<R> extends PBaseValueEqual<R,UUID> {
+public final class PUuid<R> extends PBaseValueEqual<R,UUID> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java b/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java
index 760e26e5f..a52e13931 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java
@@ -7,7 +7,7 @@ import java.time.Year;
  *
  * @param <R> the root query bean type
  */
-public class PYear<R> extends PBaseNumber<R,Year> {
+public final class PYear<R> extends PBaseNumber<R,Year> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java b/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java
index e4b5634bc..77a34d70b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java
@@ -7,7 +7,7 @@ import java.time.YearMonth;
  *
  * @param <R> the root query bean type
  */
-public class PYearMonth<R> extends PBaseDate<R,YearMonth> {
+public final class PYearMonth<R> extends PBaseDate<R,YearMonth> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java
index b10fb0fe6..b057840d9 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java
@@ -7,7 +7,7 @@ import java.time.ZoneId;
  *
  * @param <R> the root query bean type
  */
-public class PZoneId<R> extends PBaseValueEqual<R,ZoneId> {
+public final class PZoneId<R> extends PBaseValueEqual<R,ZoneId> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java
index 063e32d81..c94a99cc2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java
@@ -7,7 +7,7 @@ import java.time.ZoneOffset;
  *
  * @param <R> the root query bean type
  */
-public class PZoneOffset<R> extends PBaseValueEqual<R,ZoneOffset> {
+public final class PZoneOffset<R> extends PBaseValueEqual<R,ZoneOffset> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
index e233449ef..3aca1d178 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
@@ -7,7 +7,7 @@ import java.time.ZonedDateTime;
  *
  * @param <R> the root query bean type
  */
-public class PZonedDateTime<R> extends PBaseCompareable<R, ZonedDateTime> {
+public final class PZonedDateTime<R> extends PBaseCompareable<R, ZonedDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java
index 6dde7e1c4..409a1ceea 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java
@@ -3,7 +3,7 @@ package io.ebean.typequery;
 /**
  * Helper for adding a path prefix to a property.
  */
-public class TQPath {
+public final class TQPath {
 
   /**
    * Return the full path by adding the prefix to the property name (null safe).

From 96b4fbea4b55adb4ec6feecbc160ac87fb9969e1 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 22:02:57 +1200
Subject: [PATCH 410/447] #2319 - redis - tidy whitespace

---
 .../main/java/io/ebean/redis/DuelCache.java   |  5 +----
 .../src/main/java/io/ebean/redis/ModId.java   |  3 +--
 .../main/java/io/ebean/redis/RedisCache.java  |  9 +--------
 .../io/ebean/redis/RedisCacheFactory.java     | 19 +------------------
 .../main/java/io/ebean/redis/RedisConfig.java | 10 ----------
 .../io/ebean/redis/encode/EncodeBeanData.java |  5 -----
 .../ebean/redis/encode/EncodeManyIdsData.java |  7 -------
 .../ebean/redis/encode/EncodePrefixKey.java   |  4 +---
 .../redis/encode/EncodeSerializable.java      |  3 ---
 .../ebean/redis/topic/DaemonTopicRunner.java  |  5 -----
 10 files changed, 5 insertions(+), 65 deletions(-)

diff --git a/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java b/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
index 80025e7cc..819d0f3f1 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
@@ -9,7 +9,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-public class DuelCache implements ServerCache, NearCacheInvalidate {
+public final class DuelCache implements ServerCache, NearCacheInvalidate {
 
   private final DefaultServerCache near;
   private final RedisCache remote;
@@ -46,10 +46,8 @@ public class DuelCache implements ServerCache, NearCacheInvalidate {
 
   @Override
   public Map<Object, Object> getAll(Set<Object> keys) {
-
     Map<Object, Object> resultMap = near.getAll(keys);
     Set<Object> localKeys = resultMap.keySet();
-
     Set<Object> remainingKeys = new HashSet<>();
     for (Object key : keys) {
       if (!localKeys.contains(key)) {
@@ -64,7 +62,6 @@ public class DuelCache implements ServerCache, NearCacheInvalidate {
         resultMap.putAll(remoteMap);
       }
     }
-
     return resultMap;
   }
 
diff --git a/ebean-redis/src/main/java/io/ebean/redis/ModId.java b/ebean-redis/src/main/java/io/ebean/redis/ModId.java
index f063dea0c..95242742a 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/ModId.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/ModId.java
@@ -20,7 +20,7 @@ import java.util.Base64;
  * Note that this now internally uses java.util.Base64 to encode the values.
  * </p>
  */
-public class ModId {
+public final class ModId {
 
   private static final SecureRandom shortIdSecureRandom = new SecureRandom();
 
@@ -35,7 +35,6 @@ public class ModId {
    * </p>
    */
   public static String id() {
-
     // Random 72 bits
     byte[] randomBytes = new byte[9];
     shortIdSecureRandom.nextBytes(randomBytes);
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
index a69fb6766..a750ac204 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-class RedisCache implements ServerCache {
+final class RedisCache implements ServerCache {
 
   private static final Logger log = LoggerFactory.getLogger(RedisCache.class);
 
@@ -35,7 +35,6 @@ class RedisCache implements ServerCache {
   private final String cacheKey;
   private final Encode keyEncode;
   private final Encode valueEncode;
-
   private final TimedMetric metricGet;
   private final TimedMetric metricGetAll;
   private final TimedMetric metricPut;
@@ -47,7 +46,6 @@ class RedisCache implements ServerCache {
   private final CountMetric missCount;
 
   RedisCache(JedisPool jedisPool, ServerCacheConfig config, Encode valueEncode) {
-
     this.jedisPool = jedisPool;
     this.cacheKey = config.getCacheKey();
     this.keyEncode = new EncodePrefixKey(config.getCacheKey());
@@ -106,10 +104,8 @@ class RedisCache implements ServerCache {
 
   @Override
   public Map<Object, Object> getAll(Set<Object> keys) {
-
     long start = System.nanoTime();
     Map<Object, Object> map = new LinkedHashMap<>();
-
     List<Object> keyList = new ArrayList<>(keys);
     try (Jedis resource = jedisPool.getResource()) {
       List<byte[]> valsAsBytes = resource.mget(keysAsBytes(keyList));
@@ -147,7 +143,6 @@ class RedisCache implements ServerCache {
     }
   }
 
-
   @Override
   public void put(Object id, Object value) {
     long start = System.nanoTime();
@@ -203,7 +198,6 @@ class RedisCache implements ServerCache {
   public void clear() {
     long start = System.nanoTime();
     try (Jedis resource = jedisPool.getResource()) {
-
       ScanParams params = new ScanParams();
       params.match(cacheKey + ":*");
 
@@ -224,7 +218,6 @@ class RedisCache implements ServerCache {
 
         next = SafeEncoder.encode(nextCursor);
       } while (!next.equals("0"));
-
       metricClear.addSinceNanos(start);
     }
   }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
index 93ed840e1..78a946cad 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
@@ -38,14 +38,12 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import static java.util.Arrays.asList;
 
-class RedisCacheFactory implements ServerCacheFactory {
+final class RedisCacheFactory implements ServerCacheFactory {
 
   private static final Logger log = LoggerFactory.getLogger(RedisCacheFactory.class);
 
   private static final Logger queryLogger = LoggerFactory.getLogger("io.ebean.cache.QUERY");
-
   private static final Logger logger = LoggerFactory.getLogger("io.ebean.cache.CACHE");
-
   private static final Logger tableModLogger = LoggerFactory.getLogger("io.ebean.cache.TABLEMODS");
 
   private static final int MSG_NEARCACHE_CLEAR = 1;
@@ -66,30 +64,22 @@ class RedisCacheFactory implements ServerCacheFactory {
   private static final byte[] CHANNEL_NEAR_BYTES = SafeEncoder.encode(CHANNEL_NEAR);
 
   private final ConcurrentHashMap<String, RQueryCache> queryCaches = new ConcurrentHashMap<>();
-
   private final Map<String, NearCacheInvalidate> nearCacheMap = new ConcurrentHashMap<>();
-
   private final EncodeManyIdsData encodeManyIdsData = new EncodeManyIdsData();
   private final EncodeBeanData encodeBeanData = new EncodeBeanData();
   private final EncodeSerializable encodeSerializable = new EncodeSerializable();
 
   private final BackgroundExecutor executor;
-
   private final JedisPool jedisPool;
-
   private final DaemonTopicRunner daemonTopicRunner;
-
   private final NearCacheNotify nearCacheNotify;
-
   private final TimedMetric metricOutNearCache;
   private final TimedMetric metricOutTableMod;
   private final TimedMetric metricOutQueryCache;
   private final TimedMetric metricInNearCache;
   private final TimedMetric metricInTableMod;
   private final TimedMetric metricInQueryCache;
-
   private final String serverId = ModId.id();
-
   private ServerCacheNotify listener;
 
   RedisCacheFactory(DatabaseConfig config, BackgroundExecutor executor) {
@@ -148,7 +138,6 @@ class RedisCacheFactory implements ServerCacheFactory {
   }
 
   private ServerCache createNormalCache(ServerCacheConfig config) {
-
     RedisCache redisCache = createRedisCache(config);
     boolean nearCache = config.getCacheOptions().isNearCache();
     if (!nearCache) {
@@ -156,17 +145,14 @@ class RedisCacheFactory implements ServerCacheFactory {
     }
 
     String cacheKey = config.getCacheKey();
-
     DefaultServerCache near = new DefaultServerCache(new DefaultServerCacheConfig(config));
     near.periodicTrim(executor);
     DuelCache duelCache = new DuelCache(near, redisCache, cacheKey, nearCacheNotify);
     nearCacheMap.put(cacheKey, duelCache);
-
     return duelCache;
   }
 
   private RedisCache createRedisCache(ServerCacheConfig config) {
-
     switch (config.getType()) {
       case NATURAL_KEY:
         return new RedisCache(jedisPool, config, encodeSerializable);
@@ -247,15 +233,12 @@ class RedisCacheFactory implements ServerCacheFactory {
 
     @Override
     public void notify(ServerCacheNotification tableModifications) {
-
       Set<String> dependentTables = tableModifications.getDependentTables();
       if (dependentTables != null && !dependentTables.isEmpty()) {
-
         StringBuilder msg = new StringBuilder(50);
         for (String table : dependentTables) {
           msg.append(table).append(",");
         }
-
         String formattedMsg = msg.toString();
         if (tableModLogger.isDebugEnabled()) {
           tableModLogger.debug("Publish TableMods - {}", formattedMsg);
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java b/ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java
index 1b738cff9..a27fd77b6 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisConfig.java
@@ -11,25 +11,15 @@ import java.util.Properties;
 public class RedisConfig {
 
   private String server = "localhost";
-
   private int port = 6379;
-
   private int maxTotal = 200;
-
   private int maxIdle = 200;
-
   private int minIdle = 1;
-
   private long maxWaitMillis = -1L;
-
   private boolean blockWhenExhausted = true;
-
   private int timeout = 2000;
-
   private String username;
-
   private String password;
-
   private boolean ssl;
 
   /**
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
index 5dd9e31f2..2c12ce05b 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
@@ -12,16 +12,13 @@ public class EncodeBeanData implements Encode {
 
   @Override
   public byte[] encode(Object value) {
-
     try {
       CachedBeanData data = (CachedBeanData) value;
       ByteArrayOutputStream os = new ByteArrayOutputStream();
       ObjectOutputStream oos = new ObjectOutputStream(os);
-
       data.writeExternal(oos);
       oos.flush();
       oos.close();
-
       return os.toByteArray();
 
     } catch (IOException e) {
@@ -31,11 +28,9 @@ public class EncodeBeanData implements Encode {
 
   @Override
   public Object decode(byte[] data) {
-
     try {
       ByteArrayInputStream is = new ByteArrayInputStream(data);
       ObjectInputStream ois = new ObjectInputStream(is);
-
       CachedBeanData read = new CachedBeanData();
       read.readExternal(ois);
       return read;
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
index dc33b3bb4..2be4e76ae 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
@@ -12,18 +12,14 @@ public class EncodeManyIdsData implements Encode {
 
   @Override
   public byte[] encode(Object value) {
-
     try {
       CachedManyIds data = (CachedManyIds) value;
       ByteArrayOutputStream os = new ByteArrayOutputStream();
       ObjectOutputStream oos = new ObjectOutputStream(os);
-
       data.writeExternal(oos);
       oos.flush();
       oos.close();
-
       return os.toByteArray();
-
     } catch (IOException e) {
       throw new RuntimeException("Failed to decode cache data", e);
     }
@@ -31,15 +27,12 @@ public class EncodeManyIdsData implements Encode {
 
   @Override
   public Object decode(byte[] data) {
-
     try {
       ByteArrayInputStream is = new ByteArrayInputStream(data);
       ObjectInputStream ois = new ObjectInputStream(is);
-
       CachedManyIds read = new CachedManyIds();
       read.readExternal(ois);
       return read;
-
     } catch (ClassNotFoundException | IOException e) {
       throw new RuntimeException("Failed to decode cache data", e);
     }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
index fd6605d24..99faa49cd 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
@@ -18,10 +18,8 @@ public class EncodePrefixKey implements Encode {
       if (!(value instanceof String) && !(value instanceof TenantAwareKey.CacheKey)) {
         throw new IllegalStateException("Expecting String keys but got type:" + value.getClass());
       }
-
-      String key = prefix + value.toString();
+      String key = prefix + value;
       return key.getBytes(StandardCharsets.UTF_8);
-
     } catch (Exception e) {
       throw new RuntimeException("Failed to decode cache data", e);
     }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
index 5a63b243c..c41336761 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
@@ -10,15 +10,12 @@ public class EncodeSerializable implements Encode {
 
   @Override
   public byte[] encode(Object value) {
-
     try {
       ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream());
       oos.writeObject(value);
       oos.flush();
       oos.close();
-
       return new ByteArrayOutputStream().toByteArray();
-
     } catch (IOException e) {
       throw new RuntimeException("Failed to decode cache data", e);
     }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
index 2771c0766..9ab2fce9c 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
@@ -23,7 +23,6 @@ public class DaemonTopicRunner {
   private static final long reconnectWaitMillis = 1000;
 
   private final JedisPool jedisPool;
-
   private final DaemonTopic daemonTopic;
 
   public DaemonTopicRunner(JedisPool jedisPool, DaemonTopic daemonTopic) {
@@ -37,11 +36,9 @@ public class DaemonTopicRunner {
   }
 
   private void attemptConnections() {
-
     Timer reloadTimer = new Timer("redis-sub-notify");
     ReloadNotifyTask notifyTask = null;
     int attempts = 1;
-
     while (true) {
       if (notifyTask != null) {
         // we didn't successfully re-connect to redis
@@ -72,11 +69,9 @@ public class DaemonTopicRunner {
     jedis.echo("hi");
     try {
       daemonTopic.subscribe(jedis);
-
     } catch (Exception e) {
       log.error("Lost connection to topic, starting re-connection loop", e);
       attemptConnections();
-
     } finally {
       try {
         jedis.close();

From 3b990fb6e13950588893c177d50bc3abcb0d2eb4 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 22:03:33 +1200
Subject: [PATCH 411/447] #2319 - redis - remove unused PrefixKey

---
 .../java/io/ebean/redis/encode/PrefixKey.java | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java

diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java b/ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java
deleted file mode 100644
index 58aca8375..000000000
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/PrefixKey.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.ebean.redis.encode;
-
-import java.io.Serializable;
-
-public class PrefixKey implements Serializable {
-
-  private final String prefix;
-  private final Object key;
-
-  PrefixKey(String prefix, Object key) {
-    this.prefix = prefix;
-    this.key = key;
-  }
-
-  public String getPrefix() {
-    return prefix;
-  }
-
-  public Object getKey() {
-    return key;
-  }
-}

From ea56ec743539df5cb58858ff74f952261c56b2ef Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 22:06:48 +1200
Subject: [PATCH 412/447] #2319 - redis - final classes

---
 .../src/main/java/io/ebean/redis/encode/EncodeBeanData.java     | 2 +-
 .../src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java  | 2 +-
 .../src/main/java/io/ebean/redis/encode/EncodePrefixKey.java    | 2 +-
 .../src/main/java/io/ebean/redis/encode/EncodeSerializable.java | 2 +-
 .../src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
index 2c12ce05b..0e334b25c 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeBeanData.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-public class EncodeBeanData implements Encode {
+public final class EncodeBeanData implements Encode {
 
   @Override
   public byte[] encode(Object value) {
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
index 2be4e76ae..cd3161940 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-public class EncodeManyIdsData implements Encode {
+public final class EncodeManyIdsData implements Encode {
 
   @Override
   public byte[] encode(Object value) {
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
index 99faa49cd..29bd470bd 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodePrefixKey.java
@@ -4,7 +4,7 @@ import io.ebean.cache.TenantAwareKey;
 
 import java.nio.charset.StandardCharsets;
 
-public class EncodePrefixKey implements Encode {
+public final class EncodePrefixKey implements Encode {
 
   private final String prefix;
 
diff --git a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
index c41336761..775f87737 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/encode/EncodeSerializable.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-public class EncodeSerializable implements Encode {
+public final class EncodeSerializable implements Encode {
 
   @Override
   public byte[] encode(Object value) {
diff --git a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
index 9ab2fce9c..a95802c57 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
@@ -16,7 +16,7 @@ import java.util.TimerTask;
  * notification of when reconnection takes place.
  * </p>
  */
-public class DaemonTopicRunner {
+public final class DaemonTopicRunner {
 
   private static final Logger log = LoggerFactory.getLogger(DaemonTopicRunner.class);
 

From ebadc92f63a6b099453183325606d7add94abfce Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 22:07:31 +1200
Subject: [PATCH 413/447] #2319 - redis - ReentrantLock to replace
 synchronized(this)

---
 .../src/main/java/io/ebean/redis/RedisCacheFactory.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
index 78a946cad..f6ac72f6e 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
@@ -35,6 +35,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static java.util.Arrays.asList;
 
@@ -81,6 +82,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
   private final TimedMetric metricInQueryCache;
   private final String serverId = ModId.id();
   private ServerCacheNotify listener;
+  private final ReentrantLock lock = new ReentrantLock();
 
   RedisCacheFactory(DatabaseConfig config, BackgroundExecutor executor) {
     this.executor = executor;
@@ -166,7 +168,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
   }
 
   private ServerCache createQueryCache(ServerCacheConfig config) {
-    synchronized (this) {
+    lock.lock();
+    try {
       RQueryCache cache = queryCaches.get(config.getCacheKey());
       if (cache == null) {
         logger.debug("create query cache [{}]", config.getCacheKey());
@@ -175,6 +178,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
         queryCaches.put(config.getCacheKey(), cache);
       }
       return cache;
+    } finally {
+      lock.unlock();
     }
   }
 

From 7edfe3607d56dde48de89a83532ec133199bd1e9 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Aug 2021 08:43:06 +1200
Subject: [PATCH 414/447] #2320 - When I use Redis for L2 cache, can I set the
 TTL of the cache key?

---
 .../main/java/io/ebean/redis/RedisCache.java  | 41 +++++++++++++------
 .../src/test/java/org/domain/Person.java      |  2 +
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
index a750ac204..03dd04716 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -2,6 +2,7 @@ package io.ebean.redis;
 
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheConfig;
+import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheStatistics;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.CountMetric;
@@ -11,10 +12,8 @@ import io.ebean.redis.encode.Encode;
 import io.ebean.redis.encode.EncodePrefixKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.ScanParams;
-import redis.clients.jedis.ScanResult;
+import redis.clients.jedis.*;
+import redis.clients.jedis.params.SetParams;
 import redis.clients.jedis.util.SafeEncoder;
 
 import java.util.ArrayList;
@@ -35,6 +34,7 @@ final class RedisCache implements ServerCache {
   private final String cacheKey;
   private final Encode keyEncode;
   private final Encode valueEncode;
+  private final SetParams expiration;
   private final TimedMetric metricGet;
   private final TimedMetric metricGetAll;
   private final TimedMetric metricPut;
@@ -50,7 +50,7 @@ final class RedisCache implements ServerCache {
     this.cacheKey = config.getCacheKey();
     this.keyEncode = new EncodePrefixKey(config.getCacheKey());
     this.valueEncode = valueEncode;
-
+    this.expiration = expiration(config);
     String pre = "l2r.";
     String shortName = config.getShortName();
     MetricFactory factory = MetricFactory.get();
@@ -66,6 +66,17 @@ final class RedisCache implements ServerCache {
     metricClear = factory.createTimedMetric(pre + shortName + ".clear");
   }
 
+  private SetParams expiration(ServerCacheConfig config) {
+    final ServerCacheOptions cacheOptions = config.getCacheOptions();
+    if (cacheOptions != null) {
+      final int maxSecsToLive = cacheOptions.getMaxSecsToLive();
+      if (maxSecsToLive > 0) {
+        return new SetParams().ex((long)maxSecsToLive);
+      }
+    }
+    return null;
+  }
+
   @Override
   public void visit(MetricVisitor visitor) {
     hitCount.visit(visitor);
@@ -147,7 +158,11 @@ final class RedisCache implements ServerCache {
   public void put(Object id, Object value) {
     long start = System.nanoTime();
     try (Jedis resource = jedisPool.getResource()) {
-      resource.set(key(id), value(value));
+      if (expiration == null) {
+        resource.set(key(id), value(value));
+      } else {
+        resource.set(key(id), value(value), expiration);
+      }
       metricPut.addSinceNanos(start);
     }
   }
@@ -156,13 +171,15 @@ final class RedisCache implements ServerCache {
   public void putAll(Map<Object, Object> keyValues) {
     long start = System.nanoTime();
     try (Jedis resource = jedisPool.getResource()) {
-      byte[][] raw = new byte[keyValues.size() * 2][];
-      int pos = 0;
-      for (Map.Entry<Object, Object> entry : keyValues.entrySet()) {
-        raw[pos++] = key(entry.getKey());
-        raw[pos++] = value(entry.getValue());
+      try (final Transaction multi = resource.multi()) {
+        for (Map.Entry<Object, Object> entry : keyValues.entrySet()) {
+          if (expiration == null) {
+            multi.set(key(entry.getKey()), value(entry.getValue()));
+          } else {
+            multi.set(key(entry.getKey()), value(entry.getValue()), expiration);
+          }
+        }
       }
-      resource.mset(raw);
       metricPutAll.addSinceNanos(start);
     }
   }
diff --git a/ebean-redis/src/test/java/org/domain/Person.java b/ebean-redis/src/test/java/org/domain/Person.java
index b2a5d2110..b010fd6d6 100644
--- a/ebean-redis/src/test/java/org/domain/Person.java
+++ b/ebean-redis/src/test/java/org/domain/Person.java
@@ -2,12 +2,14 @@ package org.domain;
 
 
 import io.ebean.annotation.Cache;
+import io.ebean.annotation.CacheBeanTuning;
 import io.ebean.annotation.Index;
 
 import javax.persistence.Entity;
 import java.time.LocalDate;
 
 @Cache(enableQueryCache = true, nearCache = true, naturalKey = "name")
+@CacheBeanTuning(maxSecsToLive = 1)
 @Entity
 public class Person extends EBase {
 

From 965f4c6227e488484fb60621354183d57a88ba57 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Aug 2021 09:05:18 +1200
Subject: [PATCH 415/447] #2320 - Tidy only changes

---
 .../io/ebean/redis/RedisCacheFactory.java     |  5 +----
 .../java/org/integration/ClusterTest.java     | 19 +++++++------------
 .../java/org/integration/IntegrationTest.java |  5 +----
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
index f6ac72f6e..dfe4c846f 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
@@ -72,7 +72,6 @@ final class RedisCacheFactory implements ServerCacheFactory {
 
   private final BackgroundExecutor executor;
   private final JedisPool jedisPool;
-  private final DaemonTopicRunner daemonTopicRunner;
   private final NearCacheNotify nearCacheNotify;
   private final TimedMetric metricOutNearCache;
   private final TimedMetric metricOutTableMod;
@@ -96,11 +95,9 @@ final class RedisCacheFactory implements ServerCacheFactory {
     this.metricInNearCache = factory.createTimedMetric("l2a.inNearKeys");
     if (config.isDisableL2Cache()) {
       this.jedisPool = null;
-      this.daemonTopicRunner = null;
     } else {
       this.jedisPool = getJedisPool(config);
-      this.daemonTopicRunner = new DaemonTopicRunner(jedisPool, new CacheDaemonTopic());
-      daemonTopicRunner.run();
+      new DaemonTopicRunner(jedisPool, new CacheDaemonTopic()).run();
     }
   }
 
diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java
index a6d9515c8..68bf19135 100644
--- a/ebean-redis/src/test/java/org/integration/ClusterTest.java
+++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java
@@ -15,9 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class ClusterTest {
 
-
   private Database createOther(DataSource dataSource) {
-
     DatabaseConfig config = new DatabaseConfig();
     config.setDataSource(dataSource);
     config.loadFromProperties();
@@ -25,7 +23,6 @@ public class ClusterTest {
     config.setName("other");
     config.setDdlGenerate(false);
     config.setDdlRun(false);
-
     return DatabaseFactory.create(config);
   }
 
@@ -47,22 +44,23 @@ public class ClusterTest {
 
     Person fooA = DB.find(Person.class, foo.getId());
     Person fooB = other.find(Person.class, foo.getId());
+
+    DuelCache dualCacheA = (DuelCache) DB.getServerCacheManager().getBeanCache(Person.class);
+    assertCounts(dualCacheA, 0, 1, 1, 0);
     fooA = DB.find(Person.class, foo.getId());
+    assertCounts(dualCacheA, 1, 1, 1, 0);
     fooB = other.find(Person.class, foo.getId());
     fooA = DB.find(Person.class, foo.getId());
+    assertCounts(dualCacheA, 2, 1, 1, 0);
     fooB = other.find(Person.class, foo.getId());
-
-    DuelCache dualCache = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);
-    assertCounts(dualCache, 2, 1, 1, 0);
-
+    DuelCache dualCacheB = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);
+    assertCounts(dualCacheB, 2, 1, 1, 0);
   }
 
   @Test
   public void test() throws InterruptedException {
-
     // ensure the default server exists first
     final Database db = DB.getDefault();
-
     Database other = createOther(db.getPluginApi().getDataSource());
 
     for (int i = 0; i < 10; i++) {
@@ -90,7 +88,6 @@ public class ClusterTest {
     other.find(Person.class, 2);
     assertCounts(dualCache, 3, 2, 0, 2);
 
-
     foo0.setName("name2");
     foo0.save();
     allowAsyncMessaging();
@@ -99,7 +96,6 @@ public class ClusterTest {
     assertThat(foo3.getName()).isEqualTo("name2");
     assertCounts(dualCache, 3, 3, 1, 2);
 
-
     foo0.setName("name3");
     foo0.save();
     allowAsyncMessaging();
@@ -110,7 +106,6 @@ public class ClusterTest {
   }
 
   private void assertCounts(DuelCache dualCache, int nearHits, int nearMiss, int remoteHit, int remoteMiss) {
-
     assertThat(dualCache.getNearHitCount()).isEqualTo(nearHits);
     assertThat(dualCache.getNearMissCount()).isEqualTo(nearMiss);
     assertThat(dualCache.getRemoteHitCount()).isEqualTo(remoteHit);
diff --git a/ebean-redis/src/test/java/org/integration/IntegrationTest.java b/ebean-redis/src/test/java/org/integration/IntegrationTest.java
index 419b8d78c..5fb66aad6 100644
--- a/ebean-redis/src/test/java/org/integration/IntegrationTest.java
+++ b/ebean-redis/src/test/java/org/integration/IntegrationTest.java
@@ -68,15 +68,12 @@ public class IntegrationTest {
     System.out.println("done");
   }
 
-  private List<Person> insertSomePeople() {
-
+  private void insertSomePeople() {
     List<Person> people = new ArrayList<>();
     for (String name : new String[]{"Jack", "John", "Rob", "Moby", "Fiona"}) {
       people.add(new Person(name));
     }
-
     DB.saveAll(people);
-    return people;
   }
 
   private Person findByName(String name) {

From b062ec050c9eaed18dc817030bd8cc7569c7fa51 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Aug 2021 09:05:28 +1200
Subject: [PATCH 416/447] #2320 - Tidy only changes

---
 .../src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
index a95802c57..a6b682bce 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
@@ -31,8 +31,7 @@ public final class DaemonTopicRunner {
   }
 
   public void run() {
-    Thread t = new Thread(() -> attemptConnections(), "redis-sub");
-    t.start();
+    new Thread(this::attemptConnections, "redis-sub").start();
   }
 
   private void attemptConnections() {
@@ -55,6 +54,7 @@ public final class DaemonTopicRunner {
           // wait a little before retrying
           Thread.sleep(reconnectWaitMillis);
         } catch (InterruptedException e1) {
+          Thread.currentThread().interrupt();
           log.warn("Interrupted redis re-connection wait", e1);
         }
       }

From ec340c0abe1e1f81a03268b308723e24ecefcedb Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Aug 2021 09:10:27 +1200
Subject: [PATCH 417/447] #2320 - Tidy only changes

---
 ebean-redis/src/test/java/org/integration/ClusterTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java
index 68bf19135..64c54baaa 100644
--- a/ebean-redis/src/test/java/org/integration/ClusterTest.java
+++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java
@@ -46,12 +46,12 @@ public class ClusterTest {
     Person fooB = other.find(Person.class, foo.getId());
 
     DuelCache dualCacheA = (DuelCache) DB.getServerCacheManager().getBeanCache(Person.class);
-    assertCounts(dualCacheA, 0, 1, 1, 0);
+    assertCounts(dualCacheA, 0, 1, 0, 1);
     fooA = DB.find(Person.class, foo.getId());
-    assertCounts(dualCacheA, 1, 1, 1, 0);
+    assertCounts(dualCacheA, 1, 1, 0, 1);
     fooB = other.find(Person.class, foo.getId());
     fooA = DB.find(Person.class, foo.getId());
-    assertCounts(dualCacheA, 2, 1, 1, 0);
+    assertCounts(dualCacheA, 2, 1, 0, 1);
     fooB = other.find(Person.class, foo.getId());
     DuelCache dualCacheB = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);
     assertCounts(dualCacheB, 2, 1, 1, 0);

From 4b1bb9d1eebf539426f9b1e928a8ed3f6127e6d9 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Aug 2021 09:11:24 +1200
Subject: [PATCH 418/447] #2324 - Bump ebean-datasource to 7.2

---
 ebean-bom/pom.xml | 2 +-
 pom.xml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index cb50c064c..b91e99293 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -17,7 +17,7 @@
     <ebean-migration-auto.version>1.1</ebean-migration-auto.version>
     <ebean-migration.version>12.11.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>
-    <ebean-datasource.version>7.0</ebean-datasource.version>
+    <ebean-datasource.version>7.2</ebean-datasource.version>
     <ebean-agent.version>12.11.0</ebean-agent.version>
     <ebean-maven-plugin.version>12.11.0</ebean-maven-plugin.version>
   </properties>
diff --git a/pom.xml b/pom.xml
index bec194354..717671ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 
   <properties>
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
-    <ebean-datasource.version>7.0</ebean-datasource.version>
+    <ebean-datasource.version>7.2</ebean-datasource.version>
     <jackson.version>2.12.1</jackson.version>
   </properties>
 

From 68a6da22bebf54e089856cc59b551e7707f0ebed Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Aug 2021 09:41:36 +1200
Subject: [PATCH 419/447] Fix imports on test TestQueryExists

---
 .../src/test/java/org/tests/query/TestQueryExists.java |  6 +++---
 .../src/test/java/org/tests/query/TestSubQuery.java    | 10 ++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
index 120d7aaea..6034e16ab 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java
@@ -115,12 +115,12 @@ public class TestQueryExists extends BaseTestCase {
   public void testExistsNoWhere() {
     ResetBasicData.reset();
 
-    Query<Order> subQuery = Ebean.find(Order.class).alias("sq").select("id");
-    Query<Customer> query = Ebean.find(Customer.class).alias("qt").where().notExists(subQuery).query();
+    Query<Order> subQuery = DB.find(Order.class).alias("sq").select("id");
+    Query<Customer> query = DB.find(Customer.class).alias("qt").where().notExists(subQuery).query();
 
     query.findList();
     String sql = query.getGeneratedSql();
 
-    assertThat(sql).contains("not exists (select sq.id from o_order sq)");
+    assertThat(sql).contains("not exists (select 1 from o_order sq)");
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
index 9accb22c4..0eb99f326 100644
--- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
@@ -4,13 +4,7 @@ import io.ebean.BaseTestCase;
 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.OrderDetail;
-import org.tests.model.basic.OrderShipment;
-import org.tests.model.basic.ResetBasicData;
-import org.tests.model.basic.Vehicle;
-import org.tests.model.basic.VehicleDriver;
+import org.tests.model.basic.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -127,7 +121,7 @@ public class TestSubQuery extends BaseTestCase {
     assertThat(query.getGeneratedSql())
         .isEqualTo("select t0.ship_time from or_order_ship t0 where  (t0.id) in (" + debugSq.getGeneratedSql() + ")");
   }
-  
+
   public void testCompositeKey() {
     ResetBasicData.reset();
 

From 01e8b5f4713ed86fdfbb23b828965ba0f7374eb0 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 18 Aug 2021 20:41:09 +1200
Subject: [PATCH 420/447] #2323 - Fallback to database query if redis
 connection fails

---
 .../main/java/io/ebean/redis/RedisCache.java  | 74 +++++++++++--------
 .../io/ebean/redis/RedisCacheFactory.java     |  3 +-
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
index 03dd04716..0eb7588bd 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -16,12 +16,7 @@ import redis.clients.jedis.*;
 import redis.clients.jedis.params.SetParams;
 import redis.clients.jedis.util.SafeEncoder;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 final class RedisCache implements ServerCache {
 
@@ -32,7 +27,7 @@ final class RedisCache implements ServerCache {
 
   private final JedisPool jedisPool;
   private final String cacheKey;
-  private final Encode keyEncode;
+  private final EncodePrefixKey keyEncode;
   private final Encode valueEncode;
   private final SetParams expiration;
   private final TimedMetric metricGet;
@@ -51,19 +46,17 @@ final class RedisCache implements ServerCache {
     this.keyEncode = new EncodePrefixKey(config.getCacheKey());
     this.valueEncode = valueEncode;
     this.expiration = expiration(config);
-    String pre = "l2r.";
-    String shortName = config.getShortName();
+    String namePrefix = "l2r." + config.getShortName();
     MetricFactory factory = MetricFactory.get();
-
-    hitCount = factory.createCountMetric(pre + shortName + ".hit");
-    missCount = factory.createCountMetric(pre + shortName + ".miss");
-    metricGet = factory.createTimedMetric(pre + shortName + ".get");
-    metricGetAll = factory.createTimedMetric(pre + shortName + ".getMany");
-    metricPut = factory.createTimedMetric(pre + shortName + ".put");
-    metricPutAll = factory.createTimedMetric(pre + shortName + ".putMany");
-    metricRemove = factory.createTimedMetric(pre + shortName + ".remove");
-    metricRemoveAll = factory.createTimedMetric(pre + shortName + ".removeMany");
-    metricClear = factory.createTimedMetric(pre + shortName + ".clear");
+    hitCount = factory.createCountMetric(namePrefix + ".hit");
+    missCount = factory.createCountMetric(namePrefix + ".miss");
+    metricGet = factory.createTimedMetric(namePrefix + ".get");
+    metricGetAll = factory.createTimedMetric(namePrefix + ".getMany");
+    metricPut = factory.createTimedMetric(namePrefix + ".put");
+    metricPutAll = factory.createTimedMetric(namePrefix + ".putMany");
+    metricRemove = factory.createTimedMetric(namePrefix + ".remove");
+    metricRemoveAll = factory.createTimedMetric(namePrefix + ".removeMany");
+    metricClear = factory.createTimedMetric(namePrefix + ".clear");
   }
 
   private SetParams expiration(ServerCacheConfig config) {
@@ -113,6 +106,14 @@ final class RedisCache implements ServerCache {
     }
   }
 
+  private void errorOnRead(Exception e) {
+    log.warn("Error when reading redis cache", e);
+  }
+
+  private void errorOnWrite(Exception e) {
+    log.warn("Error when writing redis cache", e);
+  }
+
   @Override
   public Map<Object, Object> getAll(Set<Object> keys) {
     long start = System.nanoTime();
@@ -136,6 +137,9 @@ final class RedisCache implements ServerCache {
       }
       metricGetAll.addSinceNanos(start);
       return map;
+    } catch (Exception e) {
+      errorOnRead(e);
+      return Collections.emptyMap();
     }
   }
 
@@ -151,6 +155,9 @@ final class RedisCache implements ServerCache {
       }
       metricGet.addSinceNanos(start);
       return val;
+    } catch (Exception e) {
+      errorOnRead(e);
+      return null;
     }
   }
 
@@ -164,6 +171,8 @@ final class RedisCache implements ServerCache {
         resource.set(key(id), value(value), expiration);
       }
       metricPut.addSinceNanos(start);
+    } catch (Exception e) {
+      errorOnWrite(e);
     }
   }
 
@@ -181,6 +190,8 @@ final class RedisCache implements ServerCache {
         }
       }
       metricPutAll.addSinceNanos(start);
+    } catch (Exception e) {
+      errorOnWrite(e);
     }
   }
 
@@ -190,6 +201,8 @@ final class RedisCache implements ServerCache {
     try (Jedis resource = jedisPool.getResource()) {
       resource.del(key(id));
       metricRemove.addSinceNanos(start);
+    } catch (Exception e) {
+      errorOnWrite(e);
     }
   }
 
@@ -199,18 +212,11 @@ final class RedisCache implements ServerCache {
     try (Jedis resource = jedisPool.getResource()) {
       resource.del(keysAsBytes(keys));
       metricRemoveAll.addSinceNanos(start);
+    } catch (Exception e) {
+      errorOnWrite(e);
     }
   }
 
-  private byte[][] keysAsBytes(Collection<Object> keys) {
-    byte[][] raw = new byte[keys.size()][];
-    int pos = 0;
-    for (Object id : keys) {
-      raw[pos++] = key(id);
-    }
-    return raw;
-  }
-
   @Override
   public void clear() {
     long start = System.nanoTime();
@@ -232,13 +238,23 @@ final class RedisCache implements ServerCache {
           }
           resource.del(raw);
         }
-
         next = SafeEncoder.encode(nextCursor);
       } while (!next.equals("0"));
       metricClear.addSinceNanos(start);
+    } catch (Exception e) {
+      errorOnWrite(e);
     }
   }
 
+  private byte[][] keysAsBytes(Collection<Object> keys) {
+    byte[][] raw = new byte[keys.size()][];
+    int pos = 0;
+    for (Object id : keys) {
+      raw[pos++] = key(id);
+    }
+    return raw;
+  }
+
   /**
    * Return the count of get hits.
    */
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
index dfe4c846f..cbd562855 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
@@ -69,7 +69,6 @@ final class RedisCacheFactory implements ServerCacheFactory {
   private final EncodeManyIdsData encodeManyIdsData = new EncodeManyIdsData();
   private final EncodeBeanData encodeBeanData = new EncodeBeanData();
   private final EncodeSerializable encodeSerializable = new EncodeSerializable();
-
   private final BackgroundExecutor executor;
   private final JedisPool jedisPool;
   private final NearCacheNotify nearCacheNotify;
@@ -80,8 +79,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
   private final TimedMetric metricInTableMod;
   private final TimedMetric metricInQueryCache;
   private final String serverId = ModId.id();
-  private ServerCacheNotify listener;
   private final ReentrantLock lock = new ReentrantLock();
+  private ServerCacheNotify listener;
 
   RedisCacheFactory(DatabaseConfig config, BackgroundExecutor executor) {
     this.executor = executor;

From 7e4bde8d3437286dec4328ac5303883e61eeff00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Thu, 19 Aug 2021 17:11:31 +0200
Subject: [PATCH 421/447] FIX: Modification of a OneToMany-Relation with
 @OrderColumn was not detected

---
 .../server/deploy/BeanPropertyAssocMany.java  |  6 ++--
 .../org/tests/cascade/TestOrderedList.java    | 33 ++++++++++++++-----
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index c823e9a7e..de13412d9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -471,7 +471,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
       }
     }
 
-    
+
     if (softDelete) {
       String alias = hasJoinTable() ? "x2" : "x";
       sb.append(" and ").append(targetDescriptor.getSoftDeletePredicate(alias));
@@ -606,7 +606,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     if (!manyToMany && childMasterProperty != null) {
       // bidirectional in the sense that the 'master' property
       // exists on the 'detail' bean
-      childMasterProperty.setValue(child, parent);
+      childMasterProperty.setValueIntercept(child, parent);
     }
   }
 
@@ -1072,7 +1072,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   public void bindElementValue(SqlUpdate insert, Object value) {
     targetDescriptor.bindElementValue(insert, value);
   }
-  
+
   /**
    * Returns true, if we must create a m2m join table.
    */
diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java
index 5ccc781f9..0045a502b 100644
--- a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java
+++ b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java
@@ -1,7 +1,7 @@
 package org.tests.cascade;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -22,7 +22,7 @@ public class TestOrderedList extends BaseTestCase {
     }
 
     LoggedSqlCollector.start();
-    Ebean.save(master);
+    DB.save(master);
 
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql.size()).isGreaterThan(1);
@@ -35,7 +35,7 @@ public class TestOrderedList extends BaseTestCase {
     }
 
     // update without any changes
-    Ebean.save(master);
+    DB.save(master);
 
     sql = LoggedSqlCollector.current();
     assertThat(sql).isEmpty();
@@ -43,7 +43,7 @@ public class TestOrderedList extends BaseTestCase {
 
     // update just changing master
     master.setName("m1-mod");
-    Ebean.save(master);
+    DB.save(master);
     sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(1);
     assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
@@ -53,14 +53,14 @@ public class TestOrderedList extends BaseTestCase {
 
   private void fetchAndReorder(Long id) {
 
-    OmOrderedMaster fresh = Ebean.find(OmOrderedMaster.class).setId(id).fetch("details").findOne();
+    OmOrderedMaster fresh = DB.find(OmOrderedMaster.class).setId(id).fetch("details").findOne();
     List<OmOrderedDetail> details1 = fresh.getDetails();
 
     List<String> sql = LoggedSqlCollector.current();
     assertSql(sql.get(0)).contains("order by t0.id, t1.sort_order");
 
     // fetched, not dirty
-    Ebean.save(fresh);
+    DB.save(fresh);
     sql = LoggedSqlCollector.current();
     assertThat(sql).isEmpty();
 
@@ -73,7 +73,7 @@ public class TestOrderedList extends BaseTestCase {
 
     fresh.setName("m1-reorder");
 
-    Ebean.save(fresh);
+    DB.save(fresh);
 
     sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(7);
@@ -82,7 +82,7 @@ public class TestOrderedList extends BaseTestCase {
 
     details1.get(1).setName("was 1");
     fresh.setName("m1-mod3");
-    Ebean.save(fresh);
+    DB.save(fresh);
 
     sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(3);
@@ -90,7 +90,7 @@ public class TestOrderedList extends BaseTestCase {
     assertSql(sql.get(1)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
     assertThat(sql.get(2)).contains("bind(was 1,3,2,");
 
-    Ebean.delete(fresh);
+    DB.delete(fresh);
 
     sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(3);
@@ -98,4 +98,19 @@ public class TestOrderedList extends BaseTestCase {
     assertSqlBind(sql.get(1));
     assertSql(sql.get(2)).contains("delete from om_ordered_master where id=? and version=?");
   }
+
+  @Test
+  public void testAddSavedDetailToMaster() {
+    final OmOrderedMaster master = new OmOrderedMaster("Master");
+    final OmOrderedDetail detail = new OmOrderedDetail("Detail");
+
+    DB.save(master);
+    DB.save(detail);
+
+    master.getDetails().add(detail);
+    DB.save(master);
+
+    final OmOrderedMaster masterDb = DB.find(OmOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).hasSize(1);
+  }
 }

From 932337d83d839ba7387364bbccd2f2cd01d893d0 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 20 Aug 2021 13:09:59 +1200
Subject: [PATCH 422/447] Bump ebean-agent to 12.11.2 relating to fix for #2325

---
 ebean-bom/pom.xml                  | 10 ----------
 ebean-core/pom.xml                 |  2 +-
 ebean-ddl-generator/pom.xml        |  2 +-
 kotlin-querybean-generator/pom.xml |  2 +-
 pom.xml                            |  8 +++++++-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index b91e99293..6468059fe 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -12,16 +12,6 @@
   <artifactId>ebean-bom</artifactId>
   <packaging>pom</packaging>
 
-  <properties>
-    <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
-    <ebean-migration-auto.version>1.1</ebean-migration-auto.version>
-    <ebean-migration.version>12.11.0</ebean-migration.version>
-    <ebean-test-docker.version>4.1</ebean-test-docker.version>
-    <ebean-datasource.version>7.2</ebean-datasource.version>
-    <ebean-agent.version>12.11.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.11.0</ebean-maven-plugin.version>
-  </properties>
-
   <dependencyManagement>
 
     <dependencies>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index bff1574de..66eb107fb 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -293,7 +293,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.10.0</version>
+        <version>${ebean-maven-plugin.version}</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index cbc716413..e454770b8 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.10.0</version>
+        <version>${ebean-maven-plugin.version}</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 7f76d5e09..68601c019 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -165,7 +165,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.10.0</version>
+        <version>${ebean-maven-plugin.version}</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/pom.xml b/pom.xml
index 717671ae9..9e8ae831a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,14 @@
 
   <properties>
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
-    <ebean-datasource.version>7.2</ebean-datasource.version>
     <jackson.version>2.12.1</jackson.version>
+    <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
+    <ebean-migration-auto.version>1.1</ebean-migration-auto.version>
+    <ebean-migration.version>12.11.0</ebean-migration.version>
+    <ebean-test-docker.version>4.1</ebean-test-docker.version>
+    <ebean-datasource.version>7.2</ebean-datasource.version>
+    <ebean-agent.version>12.11.2</ebean-agent.version>
+    <ebean-maven-plugin.version>12.11.2</ebean-maven-plugin.version>
   </properties>
 
   <dependencies>

From 90e321ddbd69d3cee944c4c40ea8dc6d4d141d6c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 20 Aug 2021 16:58:37 +1200
Subject: [PATCH 423/447] #2318 - Refactor internals - trim whitespace in
 deploy package

---
 .../server/deploy/BeanProperty.java           | 91 -------------------
 .../server/deploy/BeanPropertyAssoc.java      | 43 +--------
 .../server/deploy/BeanPropertyAssocMany.java  | 37 +-------
 .../deploy/BeanPropertyAssocManyJsonHelp.java |  3 -
 .../BeanPropertyAssocManyJsonTransient.java   |  4 -
 .../deploy/BeanPropertyAssocManySqlHelp.java  | 27 +-----
 .../server/deploy/BeanPropertyAssocOne.java   | 45 ---------
 .../deploy/BeanQueryAdapterManager.java       |  4 +-
 .../server/deploy/BeanSetHelp.java            |  7 --
 .../server/deploy/BeanTable.java              |  5 -
 .../deploy/ChainedBeanPersistController.java  | 10 +-
 .../deploy/ChainedBeanPersistListener.java    |  4 +-
 .../ChainedBeanPostConstructListener.java     | 14 ++-
 .../server/deploy/ChainedBeanPostLoad.java    | 14 ++-
 .../deploy/ChainedBeanQueryAdapter.java       |  6 --
 .../server/deploy/DbMigrationInfo.java        |  1 -
 16 files changed, 23 insertions(+), 292 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 413d0b460..74e75702a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -69,150 +69,76 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * Flag to mark this is the id property.
    */
   private final boolean id;
-
   private final boolean importedPrimaryKey;
-
   /**
    * Flag to make this as a dummy property for unidirecitonal relationships.
    */
   private final boolean unidirectionalShadow;
-
   /**
    * Flag set if this maps to the inheritance discriminator column
    */
   private final boolean discriminator;
-
   /**
    * Flag to mark the property as embedded. This could be on
    * BeanPropertyAssocOne rather than here. Put it here for checking Id type
    * (embedded or not).
    */
   final boolean embedded;
-
-  /**
-   * Flag indicating if this the version property.
-   */
   private final boolean version;
-
   private final boolean naturalKey;
-
-  /**
-   * Set if this property is nullable.
-   */
   private final boolean nullable;
-
   private final boolean unique;
-
   /**
    * Is this property include in database resultSet.
    */
   private final boolean dbRead;
-
   /**
    * Include in DB insert.
    */
   private final boolean dbInsertable;
-
   /**
    * Include in DB update.
    */
   private final boolean dbUpdatable;
 
-  /**
-   * True if the property is based on a SECONDARY table.
-   */
   private final boolean secondaryTable;
-
   private final TableJoin secondaryTableJoin;
   private final String secondaryTableJoinPrefix;
-
-  /**
-   * The property is inherited from a super class.
-   */
   private final boolean inherited;
-
   private final Class<?> owningType;
-
   private final boolean local;
-
-  /**
-   * True if the property is a Clob, Blob LongVarchar or LongVarbinary.
-   */
   private final boolean lob;
-
   private final boolean fetchEager;
-
   final boolean isTransient;
 
   /**
    * The logical bean property name.
    */
   final String name;
-
   final int propertyIndex;
-
-  /**
-   * The reflected field.
-   */
   private final Field field;
-
-  /**
-   * The bean type.
-   */
   private final Class<?> propertyType;
-
   private final String dbBind;
-
-  /**
-   * The database column. This can include quoted identifiers.
-   */
   final String dbColumn;
-
   private final String elPrefix;
   final String elPlaceHolder;
   final String elPlaceHolderEncrypted;
-
-  /**
-   * Select part of a SQL Formula used to populate this property.
-   */
   private final String sqlFormulaSelect;
-
-  /**
-   * Join part of a SQL Formula.
-   */
   final String sqlFormulaJoin;
-
   private final String aggregation;
-
   private final boolean formula;
-
-  /**
-   * Set to true if stored encrypted.
-   */
   private final boolean dbEncrypted;
-
   private final boolean localEncrypted;
-
   private final int dbEncryptedType;
-
-  /**
-   * The jdbc data type this maps to.
-   */
   private final int dbType;
-
   final boolean excludedFromHistory;
-
   /**
    * Generator for insert or update timestamp etc.
    */
   private final GeneratedProperty generatedProperty;
-
   private final BeanPropertyGetter getter;
-
   private final BeanPropertySetter setter;
-
   final BeanDescriptor<?> descriptor;
-
   /**
    * Used for non-jdbc native types (java.util.Date Enums etc). Converts from
    * logical to jdbc types.
@@ -221,54 +147,39 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   final ScalarType scalarType;
 
   private final DocPropertyOptions docOptions;
-
   /**
    * The length or precision for DB column.
    */
   private final int dbLength;
-
   /**
    * The scale for DB column (decimal).
    */
   private final int dbScale;
-
   /**
    * Deployment defined DB column definition.
    */
   private final String dbColumnDefn;
-
   /**
    * DB Column default value for DDL definition (FALSE, NOW etc).
    */
   private final String dbColumnDefault;
   private final List<DbMigrationInfo> dbMigrationInfos;
-
   /**
    * Database DDL column comment.
    */
   private final String dbComment;
-
   private final DbEncryptFunction dbEncryptFunction;
-
   private int deployOrder;
-
   final boolean jsonSerialize;
   final boolean jsonDeserialize;
   private final boolean unmappedJson;
   private final boolean tenantId;
-
   private final boolean draft;
-
   private final boolean draftOnly;
-
   private final boolean draftDirty;
-
   private final boolean draftReset;
-
   private final boolean softDelete;
-
   private final String softDeleteDbSet;
-
   private final String softDeleteDbPredicate;
 
   public BeanProperty(DeployBeanProperty deploy) {
@@ -574,9 +485,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
       ctx.appendFormulaSelect(aggregation);
     } else if (formula) {
       ctx.appendFormulaSelect(sqlFormulaSelect);
-
     } else if (!isTransient && !ignoreDraftOnlyProperty(ctx.isDraftQuery())) {
-
       if (secondaryTableJoin != null) {
         ctx.pushTableAlias(ctx.getRelativePrefix(secondaryTableJoinPrefix));
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 739021196..33304f5f9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -43,48 +43,34 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * so as to avoid a dependency loop between BeanDescriptors.
    */
   BeanDescriptor<T> targetDescriptor;
-
   IdBinder targetIdBinder;
-
   InheritInfo targetInheritInfo;
-
   String targetIdProperty;
-
   /**
    * Derived list of exported property and matching foreignKey
    */
   ExportedProperty[] exportedProperties;
-
   /**
    * Persist settings.
    */
   final BeanCascadeInfo cascadeInfo;
-
   /**
    * Join between the beans.
    */
   final TableJoin tableJoin;
-
   final PropertyForeignKey foreignKey;
-
   /**
    * The type of the joined bean.
    */
   private final Class<T> targetType;
-
   /**
    * The join table information.
    */
   final BeanTable beanTable;
-
   final String mappedBy;
-
   private final String docStoreDoc;
-
   private final String extraWhere;
-
   private final int fetchPreference;
-
   private boolean saveRecurseSkippable;
 
   /**
@@ -98,7 +84,6 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     this.mappedBy = InternString.intern(deploy.getMappedBy());
     this.docStoreDoc = deploy.getDocStoreDoc();
     this.tableJoin = new TableJoin(deploy.getTableJoin());
-
     this.targetType = deploy.getTargetType();
     this.cascadeInfo = deploy.getCascadeInfo();
     this.fetchPreference = deploy.getFetchPreference();
@@ -173,10 +158,8 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * Create a ElPropertyValue for a *ToOne or *ToMany.
    */
   ElPropertyValue createElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
-
     // associated or embedded bean
     BeanDescriptor<?> embDesc = getTargetDescriptor();
-
     if (chain == null) {
       chain = new ElPropertyChainBuilder(isEmbedded(), propName);
     }
@@ -300,7 +283,6 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * Return true if the unique id properties are all not null for this bean.
    */
   public boolean hasId(EntityBean bean) {
-
     BeanDescriptor<?> targetDesc = getTargetDescriptor();
     BeanProperty idProp = targetDesc.getIdProperty();
     // all the unique properties are non-null
@@ -339,7 +321,6 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    */
   @Override
   public void docStoreInclude(boolean includeByDefault, DocStructure docStructure) {
-
     String embeddedDoc = getDocStoreDoc();
     if (embeddedDoc == null) {
       // not annotated so use include by default
@@ -367,17 +348,14 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
 
   @Override
   public void docStoreMapping(DocMappingBuilder mapping, String prefix) {
-
     if (mapping.includesPath(prefix, name)) {
       String fullName = SplitName.add(prefix, name);
 
       DocPropertyType type = isMany() ? DocPropertyType.LIST : DocPropertyType.OBJECT;
       DocPropertyMapping nested = new DocPropertyMapping(name, type);
-
       mapping.push(nested);
       targetDescriptor.docStoreMapping(mapping, fullName);
       mapping.pop();
-
       if (!nested.getChildren().isEmpty()) {
         mapping.add(nested);
       }
@@ -444,20 +422,16 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * descriptor back to local database columns in the TableJoin.
    */
   ImportedId createImportedId(BeanPropertyAssoc<?> owner, BeanDescriptor<?> target, TableJoin join) {
-
     BeanProperty idProp = target.getIdProperty();
     BeanProperty[] others = target.propertiesBaseScalar();
-
     if (descriptor.isRawSqlBased()) {
       String dbColumn = owner.getDbColumn();
       return new ImportedIdSimple(owner, dbColumn, null, idProp, 0);
     }
-
-    TableJoinColumn[] cols = join.columns();
-
     if (idProp == null) {
       return null;
     }
+    TableJoinColumn[] cols = join.columns();
     if (!idProp.isEmbedded()) {
       // simple single scalar id
       if (cols.length != 1) {
@@ -473,42 +447,34 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
       BeanPropertyAssocOne<?> embProp = (BeanPropertyAssocOne<?>) idProp;
       BeanProperty[] embBaseProps = embProp.getTargetDescriptor().propertiesBaseScalar();
       ImportedIdSimple[] scalars = createImportedList(owner, cols, embBaseProps, others);
-
       return new ImportedIdEmbedded(owner, embProp, scalars);
     }
   }
 
   private ImportedIdSimple[] createImportedList(BeanPropertyAssoc<?> owner, TableJoinColumn[] cols, BeanProperty[] props, BeanProperty[] others) {
-
     ArrayList<ImportedIdSimple> list = new ArrayList<>(cols.length);
-
     for (TableJoinColumn col : cols) {
       list.add(createImportedScalar(owner, col, props, others));
     }
-
     return ImportedIdSimple.sort(list);
   }
 
   private ImportedIdSimple createImportedScalar(BeanPropertyAssoc<?> owner, TableJoinColumn col, BeanProperty[] props, BeanProperty[] others) {
-
     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, 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, insertable, updateable);
       }
     }
-
     String msg = "Error with the Join on [" + getFullBeanName()
       + "]. Could not find the local match for [" + matchColumn + "] "//in table["+searchTable+"]?"
       + " Perhaps an error in a @JoinColumn";
@@ -530,10 +496,8 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   }
 
   private void flatten(List<Object> bindValues, Object parentId) {
-
     if (isExportedSimple()) {
       bindValues.add(parentId);
-
     } else {
       EntityBean parent = (EntityBean) parentId;
       for (ExportedProperty exportedProperty : exportedProperties) {
@@ -543,7 +507,6 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   }
 
   void bindParentIds(DefaultSqlUpdate delete, List<Object> parentIds) {
-
     if (isExportedSimple()) {
       delete.setParameter(new MultiValueWrapper(parentIds));
     } else {
@@ -556,7 +519,6 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   }
 
   void bindParentId(DefaultSqlUpdate sqlUpd, Object parentId) {
-
     if (isExportedSimple()) {
       sqlUpd.setParameter(parentId);
       return;
@@ -595,12 +557,9 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    * 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);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index de13412d9..37e5b7990 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -43,7 +43,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   private static final Logger logger = LoggerFactory.getLogger(BeanPropertyAssocMany.class);
 
   private final BeanPropertyAssocManyJsonHelp jsonHelp;
-
   /**
    * Join for manyToMany intersection table.
    */
@@ -51,72 +50,46 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   private final String intersectionPublishTable;
   private final String intersectionDraftTable;
   private final boolean orphanRemoval;
-
   private IntersectionTable intersectionTable;
-
   /**
    * For ManyToMany this is the Inverse join used to build reference queries.
    */
   final TableJoin inverseJoin;
-
   /**
    * Flag to indicate that this is a unidirectional relationship.
    */
   private final boolean unidirectional;
-
   private final boolean o2mJoinTable;
-
   /**
    * Flag to indicate that the target has a order column to auto populate.
    */
   private final boolean hasOrderColumn;
-
   /**
    * Flag to indicate manyToMany relationship.
    */
   private final boolean manyToMany;
-
   private final boolean elementCollection;
-
   /**
    * Descriptor for the 'target' when the property maps to an element collection.
    */
   final BeanDescriptor<T> elementDescriptor;
-
   /**
    * Order by used when fetch joining the associated many.
    */
   private final String fetchOrderBy;
-
   /**
    * Order by used when lazy loading the associated many.
    */
   private String lazyFetchOrderBy;
-
   private final String mapKey;
-
-  /**
-   * The type of the many, set, list or map.
-   */
   private final ManyType manyType;
-
   private final ModifyListenMode modifyListenMode;
-
   private BeanProperty mapKeyProperty;
-
-  /**
-   * Property on the 'child' bean that links back to the 'master'.
-   */
   private BeanPropertyAssocOne<?> childMasterProperty;
-
   private String childMasterIdProperty;
-
   private boolean embeddedExportedProperties;
-
   private BeanCollectionHelp<T> help;
-
   private ImportedId importedId;
-
   private BeanPropertyAssocManySqlHelp<T> sqlHelp;
 
   /**
@@ -234,6 +207,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Return the underlying collection of beans.
    */
+  @SuppressWarnings("rawtypes")
   public Collection getRawCollection(EntityBean bean) {
     return help.underlying(getVal(bean));
   }
@@ -399,8 +373,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   /**
-   * Return the mode for listening to modifications to collections for this
-   * association.
+   * Return the mode for listening to modifications to collections for this association.
    */
   public ModifyListenMode getModifyListenMode() {
     return modifyListenMode;
@@ -470,8 +443,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
         sb.append(getExtraWhere().replace("${ta}", "x"));
       }
     }
-
-
     if (softDelete) {
       String alias = hasJoinTable() ? "x2" : "x";
       sb.append(" and ").append(targetDescriptor.getSoftDeletePredicate(alias));
@@ -720,7 +691,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    * <p>
    * Note that childMasterProperty will be null if a field is used instead of
    * a ManyToOne bean association.
-   * </p>
    */
   private BeanPropertyAssocOne<?> initChildMasterProperty() {
     if (unidirectional) {
@@ -907,7 +877,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
           // add new relationship (Map not allowed here)
           liveVal.addBean(targetDescriptor.createReference(id, null));
         }
-
       } else {
         // recursively publish the OneToMany child bean
         T newLive = targetDescriptor.publish(bean, liveBean);
@@ -917,7 +886,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
         }
       }
     }
-
     // anything remaining should be deleted (so remove from modify aware collection)
     Collection<T> values = liveBeansAsMap.values();
     for (T value : values) {
@@ -930,7 +898,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     liveVal.size();
     Collection<?> liveBeans = liveVal.getActualDetails();
     Map<Object, T> liveMap = new LinkedHashMap<>();
-
     for (Object liveBean : liveBeans) {
       Object id = targetDescriptor.getId((EntityBean) liveBean);
       liveMap.put(id, (T) liveBean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
index d448c157c..b84889833 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
@@ -17,7 +17,6 @@ class BeanPropertyAssocManyJsonHelp {
    * The associated many property.
    */
   private final BeanPropertyAssocMany<?> many;
-
   /**
    * Helper used to read json for transient 'many' properties.
    */
@@ -36,7 +35,6 @@ class BeanPropertyAssocManyJsonHelp {
    * Read the JSON for this property.
    */
   public void jsonRead(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-
     if (!this.many.jsonDeserialize) {
       return;
     }
@@ -59,7 +57,6 @@ class BeanPropertyAssocManyJsonHelp {
    * Read a Transient property using Jackson ObjectMapper.
    */
   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/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
index 5b05b3261..cc43cb9e7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
@@ -20,9 +20,7 @@ class BeanPropertyAssocManyJsonTransient {
    * Use Jackson ObjectMapper to read the transient 'many' property.
    */
   void jsonReadUsingObjectMapper(BeanPropertyAssocMany<?> many, SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-
     ObjectMapper mapper = readJson.getObjectMapper();
-
     ManyType manyType = many.getManyType();
 
     Object value;
@@ -32,13 +30,11 @@ class BeanPropertyAssocManyJsonTransient {
       JavaType target = typeFactory.constructType(many.getTargetType());
       MapType jacksonType = typeFactory.constructMapType(LinkedHashMap.class, TypeFactory.unknownType(), target);
       value = mapper.readValue(readJson.getParser(), jacksonType);
-
     } else {
       // read list or set using Jackson object mapper
       CollectionType jacksonType = mapper.getTypeFactory().constructCollectionType(manyType.getCollectionType(), many.getTargetType());
       value = mapper.readValue(readJson.getParser(), jacksonType);
     }
-
     many.setValue(parentBean, value);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
index 06a2a2145..8a5eade8b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.server.deploy.visitor.BaseTablePropertyVisitor;
 import io.ebeaninternal.server.deploy.visitor.VisitProperties;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
+import io.ebeaninternal.server.util.Str;
 
 import java.util.List;
 
@@ -44,7 +45,6 @@ class BeanPropertyAssocManySqlHelp<T> {
   }
 
   private String elementCollectionInsert() {
-
     StringBuilder sb = new StringBuilder(200);
     sb.append("insert into ").append(many.targetTable()).append(" (");
     append(sb);
@@ -55,7 +55,6 @@ class BeanPropertyAssocManySqlHelp<T> {
     appendBind(sb, exportedProperties.length, true);
     appendBind(sb, cols.colCount, false);
     sb.append(")");
-
     return sb.toString();
   }
 
@@ -66,7 +65,6 @@ class BeanPropertyAssocManySqlHelp<T> {
   private static class Cols extends BaseTablePropertyVisitor {
 
     int colCount;
-
     private final StringBuilder sb;
 
     private Cols(StringBuilder sb) {
@@ -97,7 +95,6 @@ class BeanPropertyAssocManySqlHelp<T> {
   }
 
   String lazyFetchOrderBy(String fetchOrderBy) {
-
     // derive lazyFetchOrderBy
     StringBuilder sb = new StringBuilder(50);
     for (int i = 0; i < exportedProperties.length; i++) {
@@ -116,21 +113,17 @@ class BeanPropertyAssocManySqlHelp<T> {
    * 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, boolean hard) {
-
     String rawWhere = deriveWhereParentIdSql(false, "");
-
     SpiEbeanServer server = descriptor.getEbeanServer();
     SpiQuery<?> q = many.newQuery(server);
     many.bindParentIdEq(rawWhere, parentId, q);
@@ -140,15 +133,12 @@ class BeanPropertyAssocManySqlHelp<T> {
     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, boolean hard) {
-
     String rawWhere = deriveWhereParentIdSql(true, "");
     String inClause = buildInClauseBinding(parentIds.size(), exportedPropertyBindProto);
-
     String expr = rawWhere + inClause;
 
     SpiEbeanServer server = descriptor.getEbeanServer();
@@ -161,7 +151,6 @@ class BeanPropertyAssocManySqlHelp<T> {
     if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
       q.where().not(q.getExpressionFactory().idIn(excludeDetailIds));
     }
-
     return server.findIds(q, t);
   }
 
@@ -172,12 +161,8 @@ class BeanPropertyAssocManySqlHelp<T> {
   }
 
   SpiSqlUpdate deleteByParentIdList(List<Object> parentIds) {
-
-    StringBuilder sb = new StringBuilder(100);
-    sb.append(deleteByParentIdInSql);
-    sb.append(buildInClauseBinding(parentIds.size(), exportedPropertyBindProto));
-
-    DefaultSqlUpdate delete = new DefaultSqlUpdate(sb.toString());
+    String sql = Str.add(deleteByParentIdInSql, buildInClauseBinding(parentIds.size(), exportedPropertyBindProto));
+    DefaultSqlUpdate delete = new DefaultSqlUpdate(sql);
     many.bindParentIds(delete, parentIds);
     return delete;
   }
@@ -202,17 +187,14 @@ class BeanPropertyAssocManySqlHelp<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(inClause ? "," : " and ");
       }
       sb.append(tableAlias).append(fkColumn);
       if (!inClause) {
@@ -226,7 +208,6 @@ class BeanPropertyAssocManySqlHelp<T> {
   }
 
   private String buildInClauseBinding(int size, String bindProto) {
-
     if (descriptor.isSimpleId()) {
       return descriptor.getIdBinder().getIdInValueExpr(false, size);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 9a69b8c9c..3b3c5946c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -47,16 +47,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   private final boolean primaryKeyJoin;
 
   private AssocOneHelp localHelp;
-
   final BeanProperty[] embeddedProps;
-
   private final HashMap<String, BeanProperty> embeddedPropsMap;
-
   ImportedId importedId;
-
   private String deleteByParentIdSql;
   private String deleteByParentIdInSql;
-
   private BeanPropertyAssocMany<?> relationshipProperty;
   private boolean cacheNotifyRelationship;
 
@@ -72,14 +67,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    */
   public BeanPropertyAssocOne(BeanDescriptorMap owner, BeanDescriptor<?> descriptor,
                               DeployBeanPropertyAssocOne<T> deploy) {
-
     super(descriptor, deploy);
     primaryKeyExport = deploy.isPrimaryKeyExport();
     primaryKeyJoin = deploy.isPrimaryKeyJoin();
     oneToOne = deploy.isOneToOne();
     oneToOneExported = deploy.isOneToOneExported();
     orphanRemoval = deploy.isOrphanRemoval();
-
     if (embedded) {
       // Overriding of the columns and use table alias of owning BeanDescriptor
       BeanEmbeddedMeta overrideMeta = BeanEmbeddedMetaFactory.create(owner, deploy);
@@ -126,7 +119,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   private void initialiseAssocOne(String embeddedPrefix) {
     localHelp = createHelp(embedded, oneToOneExported, embeddedPrefix);
-
     if (!isTransient) {
       //noinspection StatementWithEmptyBody
       if (embedded || descriptor.isDocStoreOnly()) {
@@ -143,10 +135,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
               + " - joining to " + foreignJoinColumn + " and not " + foreignIdColumn);
           }
         }
-
       } else {
         exportedProperties = createExported();
-
         String delStmt = "delete from " + targetDescriptor.getBaseTable() + " where ";
         deleteByParentIdSql = delStmt + deriveWhereParentIdSql(false);
         deleteByParentIdInSql = delStmt + deriveWhereParentIdSql(true);
@@ -198,7 +188,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    * Clear part of the L2 relationship cache for this property.
    */
   void cacheDelete(boolean clear, EntityBean bean, CacheChangeSet changeSet) {
-
     if (cacheNotifyRelationship) {
       if (clear) {
         changeSet.addManyClear(targetDescriptor, relationshipProperty.getName());
@@ -224,7 +213,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   @Override
   public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
-
     if (embedded) {
       BeanProperty embProp = embeddedPropsMap.get(remainder);
       if (embProp == null) {
@@ -236,10 +224,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       }
       chain.add(this);
       chain.setEmbedded(true);
-
       return chain.add(embProp).build();
     }
-
     return createElPropertyValue(propName, remainder, chain, propertyDeploy);
   }
 
@@ -264,7 +250,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   private SqlUpdate deleteByParentId(Object parentId) {
-
     DefaultSqlUpdate delete = new DefaultSqlUpdate(deleteByParentIdSql);
     bindParentId(delete, parentId);
     return delete;
@@ -279,9 +264,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   private List<Object> findIdsByParentId(Object parentId, Transaction t) {
-
     String rawWhere = deriveWhereParentIdSql(false);
-
     SpiEbeanServer server = server();
     Query<?> q = server.find(getPropertyType());
     bindParentIdEq(rawWhere, parentId, q);
@@ -289,15 +272,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   private List<Object> findIdsByParentIdList(List<Object> parentIds, Transaction t) {
-
     String rawWhere = deriveWhereParentIdSql(true);
     String inClause = getIdBinder().getIdInValueExpr(false, parentIds.size());
     String expr = rawWhere + inClause;
-
     SpiEbeanServer server = server();
     Query<?> q = server.find(getPropertyType());
     bindParentIdsIn(expr, parentIds, q);
-
     return server.findIds(q, t);
   }
 
@@ -321,7 +301,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
           BeanProperty idProperty = target.getIdProperty();
           desc.registerColumn(dbColumn, SplitName.add(basePath, idProperty.getName()));
         }
-
         desc.registerTable(target.getBaseTable(), this);
       }
     }
@@ -337,9 +316,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
-
     prefix = SplitName.add(prefix, name);
-
     if (!embedded) {
       InheritInfo inheritInfo = targetDescriptor.getInheritInfo();
       if (inheritInfo != null) {
@@ -355,7 +332,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
           + ". Probably a missing @OneToOne mapping annotation on this relationship?");
       }
       targetIdBinder.buildRawSqlSelectChain(prefix, selectChain);
-
     } else {
       for (BeanProperty embeddedProp : embeddedProps) {
         embeddedProp.buildRawSqlSelectChain(prefix, selectChain);
@@ -387,7 +363,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   @Override
   public void diff(String prefix, Map<String, ValuePair> map, EntityBean newBean, EntityBean oldBean) {
-
     Object newEmb = (newBean == null) ? null : getValue(newBean);
     Object oldEmb = (oldBean == null) ? null : getValue(oldBean);
     if (newEmb == null && oldEmb == null) {
@@ -395,7 +370,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
 
     String nextPrefix = (prefix == null) ? name : prefix + "." + name;
-
     if (embedded) {
       BeanDescriptor<T> targetDescriptor = getTargetDescriptor();
       targetDescriptor.diff(nextPrefix, map, (EntityBean) newEmb, (EntityBean) oldEmb);
@@ -545,7 +519,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return !embedded;
   }
 
-
   /**
    * Create a bean of the target type to be used as an embeddedId
    * value.
@@ -569,9 +542,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   private String deriveWhereParentIdSql(boolean inClause) {
-
     StringBuilder sb = new StringBuilder();
-
     for (int i = 0; i < exportedProperties.length; i++) {
       String fkColumn = exportedProperties[i].getForeignDbColumn();
       if (i > 0) {
@@ -590,13 +561,9 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    * Create the array of ExportedProperty used to build reference objects.
    */
   private ExportedProperty[] createExported() {
-
     BeanProperty idProp = descriptor.getIdProperty();
-
     ArrayList<ExportedProperty> list = new ArrayList<>();
-
     if (idProp != null && idProp.isEmbedded()) {
-
       BeanPropertyAssocOne<?> one = (BeanPropertyAssocOne<?>) idProp;
       BeanDescriptor<?> targetDesc = one.getTargetDescriptor();
       BeanProperty[] emIds = targetDesc.propertiesBaseScalar();
@@ -608,13 +575,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
         // not found as individual scalar properties
         e.printStackTrace();
       }
-
     } else {
       if (idProp != null) {
         list.add(findMatch(false, idProp));
       }
     }
-
     return list.toArray(new ExportedProperty[0]);
   }
 
@@ -622,11 +587,9 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    * Find the matching foreignDbColumn for a given local property.
    */
   private ExportedProperty findMatch(boolean embeddedProp, BeanProperty prop) {
-
     return findMatch(embeddedProp, prop, prop.getDbColumn(), tableJoin);
   }
 
-
   @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
     if (!isTransient) {
@@ -744,7 +707,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    */
   @Override
   public void jsonWriteForInsert(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
-
     if (!jsonSerialize) {
       return;
     }
@@ -763,13 +725,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   private void jsonWriteBean(SpiJsonWriter writeJson, Object value) throws IOException {
-
     if (value instanceof EntityBean) {
       if (embedded) {
         writeJson.writeFieldName(name);
         BeanDescriptor<?> refDesc = descriptor.getBeanDescriptor(value.getClass());
         refDesc.jsonWriteForInsert(writeJson, (EntityBean) value);
-
       } else {
         jsonWriteTargetId(writeJson, (EntityBean) value);
       }
@@ -790,15 +750,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   @Override
   public void jsonWrite(SpiJsonWriter writeJson, EntityBean bean) throws IOException {
-
     if (!jsonSerialize) {
       return;
     }
-
     Object value = getValueIntercept(bean);
     if (value == null) {
       writeJson.writeNullField(name);
-
     } else {
       if (!writeJson.isParentBean(value)) {
         // Hmmm, not writing complex non-entity bean
@@ -829,12 +786,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    * Set the parent bean to the child bean if it has not already been set.
    */
   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/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
index 2f8f05317..dbaecc265 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
@@ -18,8 +18,7 @@ final class BeanQueryAdapterManager {
   private final List<BeanQueryAdapter> list;
 
   BeanQueryAdapterManager(BootupClasses bootupClasses) {
-
-    list = bootupClasses.getBeanQueryAdapters();
+    this.list = bootupClasses.getBeanQueryAdapters();
   }
 
   int getRegisterCount() {
@@ -30,7 +29,6 @@ final class BeanQueryAdapterManager {
    * Return the BeanPersistController for a given entity type.
    */
   void addQueryAdapter(DeployBeanDescriptor<?> deployDesc) {
-
     for (BeanQueryAdapter c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
         logger.debug("BeanQueryAdapter on[{}] {}", deployDesc.getFullName(), c.getClass().getName());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
index 4acc23347..f275d0988 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -40,7 +40,6 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
         beanSet.setActualSet(new LinkedHashSet<>());
       }
       return beanSet;
-
     } else {
       throw new RuntimeException("Unhandled type " + bc);
     }
@@ -62,7 +61,6 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
 
   @Override
   public BeanCollection<T> createReference(EntityBean parentBean) {
-
     BeanSet<T> beanSet = new BeanSet<>(loader, parentBean, propertyName);
     beanSet.setModifyListening(many.getModifyListenMode());
     return beanSet;
@@ -70,18 +68,14 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
 
   @Override
   public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
-
     BeanSet<?> newBeanSet = (BeanSet<?>) server.findSet(query, t);
     refresh(newBeanSet, parentBean);
   }
 
   @Override
   public void refresh(BeanCollection<?> bc, EntityBean parentBean) {
-
     BeanSet<?> newBeanSet = (BeanSet<?>) bc;
-
     Set<?> current = (Set<?>) many.getValue(parentBean);
-
     newBeanSet.setModifyListening(many.getModifyListenMode());
     if (current == null) {
       // the currentList is null?  Not really expecting this...
@@ -101,7 +95,6 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
 
   @Override
   public void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
-
     Set<?> set;
     if (collection instanceof BeanCollection<?>) {
       BeanSet<?> bc = (BeanSet<?>) collection;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index 3ccdb8218..ecd0b7a37 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -85,11 +85,9 @@ public final class BeanTable {
   }
 
   public void createJoinColumn(String foreignKeyPrefix, DeployTableJoin join, boolean reverse, String sqlFormulaSelect) {
-
     if (idProperty == null) {
       return;
     }
-
     if (idProperty instanceof BeanPropertyAssocOne<?>) {
       BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) idProperty;
       BeanProperty[] props = assocOne.getProperties();
@@ -102,13 +100,11 @@ public final class BeanTable {
   }
 
   private void addToJoin(String foreignKeyPrefix, DeployTableJoin join, boolean reverse, String sqlFormulaSelect, boolean complexKey, BeanProperty prop) {
-
     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.
@@ -118,7 +114,6 @@ public final class BeanTable {
     if (sqlFormulaSelect != null) {
       fk = sqlFormulaSelect;
     }
-
     DeployTableJoinColumn joinCol = new DeployTableJoinColumn(lc, fk);
     joinCol.setForeignSqlFormula(sqlFormulaSelect);
     if (reverse) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
index dfb2c302a..6ffbae176 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
@@ -19,7 +19,6 @@ public final class ChainedBeanPersistController implements BeanPersistController
   private static final Sorter SORTER = new Sorter();
 
   private final List<BeanPersistController> list;
-
   private final BeanPersistController[] chain;
 
   /**
@@ -178,15 +177,10 @@ public final class ChainedBeanPersistController implements BeanPersistController
   /**
    * Helper to order the BeanPersistController's in a chain.
    */
-  private static class Sorter implements Comparator<BeanPersistController> {
-
+  private static final class Sorter implements Comparator<BeanPersistController> {
     @Override
     public int compare(BeanPersistController o1, BeanPersistController o2) {
-
-      int i1 = o1.getExecutionOrder();
-      int i2 = o2.getExecutionOrder();
-      return Integer.compare(i1, i2);
+      return Integer.compare(o1.getExecutionOrder(), o2.getExecutionOrder());
     }
-
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
index d49380577..624ac6540 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
@@ -24,7 +24,7 @@ public final class ChainedBeanPersistListener implements BeanPersistListener {
   /**
    * Return the size of the chain.
    */
-  protected int size() {
+  int size() {
     return chain.length;
   }
 
@@ -61,7 +61,6 @@ public final class ChainedBeanPersistListener implements BeanPersistListener {
     } else {
       List<BeanPersistListener> newList = new ArrayList<>(list);
       newList.add(c);
-
       return new ChainedBeanPersistListener(newList);
     }
   }
@@ -75,7 +74,6 @@ public final class ChainedBeanPersistListener implements BeanPersistListener {
     } else {
       List<BeanPersistListener> newList = new ArrayList<>(list);
       newList.remove(c);
-
       return new ChainedBeanPersistListener(newList);
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
index c615f8b20..d8f297628 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
@@ -30,7 +30,6 @@ public final class ChainedBeanPostConstructListener implements BeanPostConstruct
     } else {
       List<BeanPostConstructListener> newList = new ArrayList<>(list);
       newList.add(c);
-
       return new ChainedBeanPostConstructListener(newList);
     }
   }
@@ -44,17 +43,16 @@ public final class ChainedBeanPostConstructListener implements BeanPostConstruct
     } else {
       ArrayList<BeanPostConstructListener> newList = new ArrayList<>(list);
       newList.remove(c);
-
       return new ChainedBeanPostConstructListener(newList);
     }
   }
 
-  /**
-   * Return the size of the chain.
-   */
-  protected int size() {
-    return chain.length;
-  }
+//  /**
+//   * Return the size of the chain.
+//   */
+//  int size() {
+//    return chain.length;
+//  }
 
   @Override
   public boolean isRegisterFor(Class<?> cls) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
index 4d7cff8ef..c3191a151 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
@@ -30,7 +30,6 @@ public final class ChainedBeanPostLoad implements BeanPostLoad {
     } else {
       List<BeanPostLoad> newList = new ArrayList<>(list);
       newList.add(c);
-
       return new ChainedBeanPostLoad(newList);
     }
   }
@@ -44,17 +43,16 @@ public final class ChainedBeanPostLoad implements BeanPostLoad {
     } else {
       List<BeanPostLoad> newList = new ArrayList<>(list);
       newList.remove(c);
-
       return new ChainedBeanPostLoad(newList);
     }
   }
 
-  /**
-   * Return the size of the chain.
-   */
-  protected int size() {
-    return chain.length;
-  }
+//  /**
+//   * Return the size of the chain.
+//   */
+//  int size() {
+//    return chain.length;
+//  }
 
   @Override
   public boolean isRegisterFor(Class<?> cls) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
index ca67a0746..be7c082f6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
@@ -37,7 +37,6 @@ public final class ChainedBeanQueryAdapter implements BeanQueryAdapter {
     } else {
       List<BeanQueryAdapter> newList = new ArrayList<>(list);
       newList.add(c);
-
       return new ChainedBeanQueryAdapter(newList);
     }
   }
@@ -51,12 +50,10 @@ public final class ChainedBeanQueryAdapter implements BeanQueryAdapter {
     } else {
       List<BeanQueryAdapter> newList = new ArrayList<>(list);
       newList.remove(c);
-
       return new ChainedBeanQueryAdapter(newList);
     }
   }
 
-
   /**
    * Return 0 as not used by this Chained adapter.
    */
@@ -75,7 +72,6 @@ public final class ChainedBeanQueryAdapter implements BeanQueryAdapter {
 
   @Override
   public void preQuery(BeanQueryRequest<?> request) {
-
     for (BeanQueryAdapter aChain : chain) {
       aChain.preQuery(request);
     }
@@ -85,11 +81,9 @@ public final class ChainedBeanQueryAdapter implements BeanQueryAdapter {
    * Helper to order the BeanQueryAdapter's in a chain.
    */
   private static class Sorter implements Comparator<BeanQueryAdapter> {
-
     @Override
     public int compare(BeanQueryAdapter o1, BeanQueryAdapter o2) {
       return Integer.compare(o1.getExecutionOrder(), o2.getExecutionOrder());
     }
-
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
index e6e4a3eef..d41f781f5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
@@ -65,5 +65,4 @@ public final class DbMigrationInfo {
     }
   }
 
-
 }

From 6f7efe69224c2af87bd5725bd0ccc8e2a4daedf2 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 20 Aug 2021 17:39:11 +1200
Subject: [PATCH 424/447] #2318 - Refactor internals - trim whitespace in
 deploy package

---
 .../server/deploy/AssocOneHelp.java           |  6 --
 .../server/deploy/AssocOneHelpEmbedded.java   |  3 -
 .../deploy/AssocOneHelpRefExported.java       |  3 -
 .../server/deploy/AssocOneHelpRefInherit.java |  5 -
 .../server/deploy/BaseCollectionHelp.java     |  1 -
 .../server/deploy/BeanCascadeInfo.java        |  2 -
 .../server/deploy/BeanChangeJson.java         |  3 -
 .../deploy/BeanCollectionHelpFactory.java     |  1 -
 .../server/deploy/BeanDescriptor.java         | 99 +++----------------
 .../deploy/BeanDescriptorCacheHelp.java       | 13 ---
 .../deploy/BeanDescriptorDraftHelp.java       | 37 ++-----
 .../server/deploy/BeanDescriptorElement.java  |  1 -
 .../deploy/BeanDescriptorElementEmbedded.java |  3 +-
 .../BeanDescriptorElementEmbeddedMap.java     |  3 -
 .../deploy/BeanDescriptorElementScalar.java   |  2 -
 .../BeanDescriptorElementScalarMap.java       |  2 -
 .../deploy/BeanDescriptorInitContext.java     |  1 -
 .../server/deploy/BeanDescriptorJsonHelp.java |  2 -
 .../server/deploy/BeanDescriptorManager.java  |  8 --
 .../deploy/ChainedBeanPersistController.java  | 40 ++++----
 .../deploy/ChainedBeanPersistListener.java    | 16 +--
 .../ChainedBeanPostConstructListener.java     | 19 ++--
 .../server/deploy/ChainedBeanPostLoad.java    | 11 +--
 .../deploy/ChainedBeanQueryAdapter.java       |  4 +-
 .../server/deploy/DCacheRegion.java           |  1 -
 .../server/deploy/DeployParser.java           | 16 ---
 .../server/deploy/DeployPropertyParser.java   |  4 -
 .../server/deploy/DeployUpdateParser.java     |  5 -
 .../server/deploy/DetermineAggPath.java       |  2 -
 .../DynamicPropertyAggregationFormula.java    |  3 -
 .../DynamicPropertyAggregationFormulaMTO.java |  1 +
 .../server/deploy/ExportedProperty.java       |  2 -
 .../server/deploy/FormulaPropertyPath.java    | 14 +--
 .../server/deploy/InheritInfo.java            |  3 -
 .../server/deploy/TableJoinColumn.java        |  6 --
 35 files changed, 60 insertions(+), 282 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
index 6f7f0bb75..c2ed2a472 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
@@ -14,9 +14,7 @@ import java.sql.SQLException;
 abstract class AssocOneHelp {
 
   final BeanPropertyAssocOne<?> property;
-
   private final BeanDescriptor<?> target;
-
   private final String path;
 
   AssocOneHelp(BeanPropertyAssocOne<?> property) {
@@ -58,19 +56,16 @@ abstract class AssocOneHelp {
    * Read and return the bean.
    */
   Object read(DbReadContext ctx) throws SQLException {
-
     // Support for Inheritance hierarchy on exported OneToOne ?
     Object id = property.targetIdBinder.read(ctx);
     if (id == null) {
       return null;
     }
-
     PersistenceContext pc = ctx.getPersistenceContext();
     Object existing = target.contextGet(pc, id);
     if (existing != null) {
       return existing;
     }
-
     boolean disableLazyLoading = ctx.isDisableLazyLoading();
     Object ref = target.contextRef(pc, ctx.isReadOnly(), disableLazyLoading, id);
     if (!disableLazyLoading) {
@@ -79,7 +74,6 @@ abstract class AssocOneHelp {
     return ref;
   }
 
-
   /**
    * Read setting values into the bean.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
index afc910528..228dbb599 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
@@ -32,7 +32,6 @@ final class AssocOneHelpEmbedded extends AssocOneHelp {
 
   @Override
   Object read(DataReader reader) throws SQLException {
-
     EntityBean embeddedBean = property.targetDescriptor.createEntityBean();
     boolean notNull = false;
     for (BeanProperty property : property.embeddedProps) {
@@ -63,9 +62,7 @@ final class AssocOneHelpEmbedded extends AssocOneHelp {
 
   @Override
   Object read(DbReadContext ctx) throws SQLException {
-
     EntityBean embeddedBean = property.targetDescriptor.createEntityBean();
-
     boolean notNull = false;
     for (BeanProperty property : property.embeddedProps) {
       Object value = property.readSet(ctx, embeddedBean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
index 0aad172c3..cf2f00f28 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
@@ -8,7 +8,6 @@ import io.ebeaninternal.server.query.SqlJoinType;
 final class AssocOneHelpRefExported extends AssocOneHelp {
 
   private final boolean softDelete;
-
   private final String softDeletePredicate;
 
   AssocOneHelpRefExported(BeanPropertyAssocOne<?> property) {
@@ -22,7 +21,6 @@ final class AssocOneHelpRefExported extends AssocOneHelp {
    */
   @Override
   void appendSelect(DbSqlContext ctx, boolean subQuery) {
-
     // set appropriate tableAlias for the exported id columns
     String relativePrefix = ctx.getRelativePrefix(property.getName());
     ctx.pushTableAlias(relativePrefix);
@@ -32,7 +30,6 @@ final class AssocOneHelpRefExported extends AssocOneHelp {
 
   @Override
   void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
-
     String relativePrefix = ctx.getRelativePrefix(property.getName());
     if (softDelete && !ctx.isIncludeSoftDelete()) {
       property.tableJoin.addJoin(joinType, relativePrefix, ctx, softDeletePredicate);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index 7204a2cf1..3018b7e19 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -29,7 +29,6 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
    */
   @Override
   Object read(DbReadContext ctx) throws SQLException {
-
     // read discriminator to determine the type
     InheritInfo rowInheritInfo = inherit.readType(ctx);
     if (rowInheritInfo == null) {
@@ -37,12 +36,10 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
       property.targetIdBinder.loadIgnore(ctx);
       return null;
     }
-
     Object id = property.targetIdBinder.read(ctx);
     if (id == null) {
       return null;
     }
-
     // check transaction context to see if it already exists
     PersistenceContext pc = ctx.getPersistenceContext();
     BeanDescriptor<?> desc = rowInheritInfo.desc();
@@ -50,7 +47,6 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
     if (existing != null) {
       return existing;
     }
-
     // for inheritance hierarchy create the correct type for this row...
     boolean disableLazyLoading = ctx.isDisableLazyLoading();
     Object ref = desc.contextRef(pc, ctx.isReadOnly(), disableLazyLoading, id);
@@ -72,7 +68,6 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
    */
   @Override
   void appendSelect(DbSqlContext ctx, boolean subQuery) {
-
     if (!subQuery) {
       // add discriminator column
       String relativePrefix = ctx.getRelativePrefix(property.getName());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
index f66ad8e4c..a803e1754 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java
@@ -13,7 +13,6 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
   final BeanPropertyAssocMany<T> many;
   private final BeanDescriptor<T> targetDescriptor;
   final String propertyName;
-
   BeanCollectionLoader loader;
 
   BaseCollectionHelp(BeanPropertyAssocMany<T> many) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
index c5df36975..4c0672a35 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java
@@ -11,9 +11,7 @@ import javax.persistence.CascadeType;
 public final class BeanCascadeInfo {
 
   private boolean delete;
-
   private boolean save;
-
   private boolean refresh;
 
   public void setTypes(CascadeType[] types) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
index 2e9b9cc69..a4cb98e94 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanChangeJson.java
@@ -25,7 +25,6 @@ final class BeanChangeJson implements BeanDiffVisitor {
     this.newData = new StringWriter(200);
     this.newJson = descriptor.createJsonWriter(newData);
     newJson.writeStartObject();
-
     if (statelessUpdate) {
       this.oldJson = null;
       this.oldData = null;
@@ -38,7 +37,6 @@ final class BeanChangeJson implements BeanDiffVisitor {
 
   @Override
   public void visit(int position, Object newVal, Object oldVal) {
-
     try {
       BeanProperty prop = descriptor.propertiesIndex[position];
       if (prop.isDbUpdatable()) {
@@ -55,7 +53,6 @@ final class BeanChangeJson implements BeanDiffVisitor {
   @Override
   public void visitPush(int position) {
     stack.push(descriptor);
-
     BeanPropertyAssocOne<?> embedded = (BeanPropertyAssocOne<?>)descriptor.propertiesIndex[position];
     descriptor = embedded.getTargetDescriptor();
     newJson.writeStartObject(embedded.getName());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
index e46bd2908..c3bda06be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
@@ -33,7 +33,6 @@ public final class BeanCollectionHelpFactory {
       default:
         throw new RuntimeException("Invalid type " + manyType);
     }
-
   }
 
   @SuppressWarnings("unchecked")
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 055f2605a..6541cade1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -115,37 +115,23 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanDescriptor.class);
 
-  private final ConcurrentHashMap<String, SpiUpdatePlan> updatePlanCache = new ConcurrentHashMap<>();
-
-  private final ConcurrentHashMap<CQueryPlanKey, CQueryPlan> queryPlanCache = new ConcurrentHashMap<>();
-
-  private final ConcurrentHashMap<String, ElPropertyValue> elCache = new ConcurrentHashMap<>();
-
-  private final ConcurrentHashMap<String, ElPropertyDeploy> elDeployCache = new ConcurrentHashMap<>();
-
-  private final ConcurrentHashMap<String, ElComparator<T>> comparatorCache = new ConcurrentHashMap<>();
-
-  private final ConcurrentHashMap<String, STreeProperty> dynamicProperty = new ConcurrentHashMap<>();
-
-  private final Map<String, SpiRawSql> namedRawSql;
-
-  private final Map<String, String> namedQuery;
-
-  private final boolean multiValueSupported;
-  private boolean batchEscalateOnCascadeInsert;
-  private boolean batchEscalateOnCascadeDelete;
-
-  private final BeanIudMetrics iudMetrics;
-
   public enum EntityType {
     ORM, EMBEDDED, VIEW, SQL, DOC
   }
 
-  /**
-   * The nature/type of this bean.
-   */
+  private final ConcurrentHashMap<String, SpiUpdatePlan> updatePlanCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<CQueryPlanKey, CQueryPlan> queryPlanCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, ElPropertyValue> elCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, ElPropertyDeploy> elDeployCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, ElComparator<T>> comparatorCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, STreeProperty> dynamicProperty = new ConcurrentHashMap<>();
+  private final Map<String, SpiRawSql> namedRawSql;
+  private final Map<String, String> namedQuery;
+  private final boolean multiValueSupported;
+  private boolean batchEscalateOnCascadeInsert;
+  private boolean batchEscalateOnCascadeDelete;
+  private final BeanIudMetrics iudMetrics;
   private final EntityType entityType;
-
   /**
    * Set when Id property is marked with GeneratedValue annotation.
    */
@@ -153,71 +139,39 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   private final PlatformIdGenerator idGenerator;
   private final IdentityMode identityMode;
   private final IdType idType;
-
   /**
    * SQL used to return last inserted id. Used for Identity columns where
    * getGeneratedKeys is not supported.
    */
   private final String selectLastInsertedId;
   private final String selectLastInsertedIdDraft;
-
   private final boolean autoTunable;
-
-  /**
-   * The concurrency mode for beans of this type.
-   */
   private final ConcurrencyMode concurrencyMode;
-
   private final IndexDefinition[] indexDefinitions;
-
   private final String[] dependentTables;
-
-  /**
-   * The base database table.
-   */
   private final String baseTable;
   private final String baseTableAsOf;
   private final String baseTableVersionsBetween;
   private final boolean historySupport;
   private final TableJoin primaryKeyJoin;
-
   private final BeanProperty softDeleteProperty;
   private final boolean softDelete;
-
   private final String draftTable;
-
   private final PartitionMeta partitionMeta;
   private final String storageEngine;
-
-  /**
-   * DB table comment.
-   */
   private final String dbComment;
-
-  /**
-   * Set to true if read auditing is on for this bean type.
-   */
   private final boolean readAuditing;
-
   private final boolean draftable;
-
   private final boolean draftableElement;
-
   private final BeanProperty unmappedJson;
-
   private final BeanProperty tenant;
-
   private final BeanProperty draft;
-
   private final BeanProperty draftDirty;
-
   private final LinkedHashMap<String, BeanProperty> propMap;
-
   /**
    * Map of DB column to property path (for nativeSql mapping).
    */
   private final Map<String, String> columnPath = new HashMap<>();
-
   /**
    * Map of related table to assoc property (for nativeSql mapping).
    */
@@ -235,46 +189,34 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   private final BeanQueryAdapter queryAdapter;
   private final BeanFindController beanFinder;
   private final ChangeLogFilter changeLogFilter;
-
-  /**
-   * Inheritance information. Server side only.
-   */
   final InheritInfo inheritInfo;
-
   private final boolean abstractType;
-
   private final BeanProperty idProperty;
   private final int idPropertyIndex;
-
   private final BeanProperty versionProperty;
   private final int versionPropertyIndex;
   private final BeanProperty whenModifiedProperty;
   private final BeanProperty whenCreatedProperty;
-
   /**
    * Properties that are initialised in the constructor need to be 'unloaded' to support partial object queries.
    */
   private final int[] unloadProperties;
-
   /**
    * Properties local to this type (not from a super type).
    */
   private final BeanProperty[] propertiesLocal;
-
   /**
    * Scalar mutable properties (need to dirty check on update).
    */
   private final BeanProperty[] propertiesMutable;
   private final BeanPropertyAssocOne<?> unidirectional;
   private final BeanProperty orderColumn;
-
   private final BeanProperty[] propertiesNonMany;
   private final BeanProperty[] propertiesAggregate;
   private final BeanPropertyAssocMany<?>[] propertiesMany;
   private final BeanPropertyAssocMany<?>[] propertiesManySave;
   private final BeanPropertyAssocMany<?>[] propertiesManyDelete;
   private final BeanPropertyAssocMany<?>[] propertiesManyToMany;
-
   /**
    * list of properties that are associated beans and not embedded (Derived).
    */
@@ -285,10 +227,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   private final BeanPropertyAssocOne<?>[] propertiesOneExportedSave;
   private final BeanPropertyAssocOne<?>[] propertiesOneExportedDelete;
   private final BeanPropertyAssocOne<?>[] propertiesEmbedded;
-
   private final BeanProperty[] propertiesBaseScalar;
   private final BeanProperty[] propertiesTransient;
-
   /**
    * All non transient properties excluding the id properties.
    */
@@ -300,21 +240,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   private final boolean idOnlyReference;
   private BeanNaturalKey beanNaturalKey;
 
-  /**
-   * The bean class name or the table name for MapBeans.
-   */
+
   private final String fullName;
-
-  /**
-   * Flag used to determine if saves can be skipped.
-   */
   private boolean saveRecurseSkippable;
-
-  /**
-   * Flag used to determine if deletes can be skipped.
-   */
   private boolean deleteRecurseSkippable;
-
   private final EntityBean prototypeEntityBean;
 
   private final IdBinder idBinder;
@@ -629,11 +558,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
       }
       prop.registerColumn(this, null);
     }
-
     if (unidirectional != null) {
       unidirectional.initialise(initContext);
     }
-
     idBinder.initialise();
     idBinderInLHSSql = idBinder.getBindIdInSql(baseTableAlias);
     idBinderIdSql = idBinder.getBindIdSql(baseTableAlias);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 0b547b9a9..61d7366bc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -50,38 +50,27 @@ final class BeanDescriptorCacheHelp<T> {
   private static final Logger natLog = LoggerFactory.getLogger("io.ebean.cache.NATKEY");
 
   private final BeanDescriptor<T> desc;
-
   private final SpiCacheManager cacheManager;
-
   private final CacheOptions cacheOptions;
-
   /**
    * Flag indicating this bean has no relationships.
    */
   private final boolean cacheSharableBeans;
   private final boolean invalidateQueryCache;
-
   private final Class<?> beanType;
-
   private final String cacheName;
-
   private final BeanPropertyAssocOne<?>[] propertiesOneImported;
   private final String[] naturalKey;
-
   private final ServerCache beanCache;
   private final ServerCache naturalKeyCache;
   private final ServerCache queryCache;
-
   private final boolean noCaching;
-
   private final SpiCacheControl cacheControl;
   private final SpiCacheRegion cacheRegion;
-
   /**
    * Set to true if all persist changes need to notify the cache.
    */
   private boolean cacheNotifyOnAll;
-
   /**
    * Set to true if delete changes need to notify cache.
    */
@@ -293,13 +282,11 @@ final class BeanDescriptorCacheHelp<T> {
       // 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
       return false;
     }
-
     EntityBean ownerBean = bc.getOwnerBean();
     EntityBeanIntercept ebi = ownerBean._ebean_getIntercept();
     PersistenceContext persistenceContext = ebi.getPersistenceContext();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
index 4609b3b74..f1433dbde 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
@@ -14,9 +14,7 @@ import java.util.List;
 final class BeanDescriptorDraftHelp<T> {
 
   private final BeanDescriptor<T> desc;
-
   private final BeanProperty draftDirty;
-
   private final BeanProperty[] resetProperties;
 
   BeanDescriptorDraftHelp(BeanDescriptor<T> desc) {
@@ -29,16 +27,12 @@ final class BeanDescriptorDraftHelp<T> {
    * Return the properties that are reset on draft beans after publish.
    */
   private BeanProperty[] resetProperties() {
-
     List<BeanProperty> list = new ArrayList<>();
-
-    BeanProperty[] props = desc.propertiesNonMany();
-    for (BeanProperty prop : props) {
+    for (BeanProperty prop : desc.propertiesNonMany()) {
       if (prop.isDraftReset()) {
         list.add(prop);
       }
     }
-
     return list.toArray(new BeanProperty[0]);
   }
 
@@ -46,19 +40,15 @@ final class BeanDescriptorDraftHelp<T> {
    * Set the value of all the 'reset properties' to null on the draft bean.
    */
   boolean draftReset(T draftBean) {
-
     EntityBean draftEntityBean = (EntityBean) draftBean;
-
     if (draftDirty != null) {
       // set @DraftDirty property to false
       draftDirty.setValueIntercept(draftEntityBean, false);
     }
-
     // set to null on all @DraftReset properties
     for (BeanProperty resetProperty : resetProperties) {
       resetProperty.setValueIntercept(draftEntityBean, null);
     }
-
     // return true if the bean is dirty (and should be persisted)
     return draftEntityBean._ebean_getIntercept().isDirty();
   }
@@ -71,31 +61,23 @@ final class BeanDescriptorDraftHelp<T> {
    */
   @SuppressWarnings("unchecked")
   public T publish(T draftBean, T liveBean) {
-
     if (liveBean == null) {
       liveBean = (T) desc.createEntityBean();
     }
-
     EntityBean draft = (EntityBean) draftBean;
     EntityBean live = (EntityBean) liveBean;
-
     BeanProperty idProperty = desc.getIdProperty();
     if (idProperty != null) {
       idProperty.publish(draft, live);
     }
-
-    BeanProperty[] props = desc.propertiesNonMany();
-    for (BeanProperty prop : props) {
+    for (BeanProperty prop : desc.propertiesNonMany()) {
       prop.publish(draft, live);
     }
-
-    BeanPropertyAssocMany<?>[] many = desc.propertiesMany();
-    for (BeanPropertyAssocMany<?> aMany : many) {
-      if (aMany.getTargetDescriptor().isDraftable()) {
-        aMany.publishMany(draft, live);
+    for (BeanPropertyAssocMany<?> many : desc.propertiesMany()) {
+      if (many.getTargetDescriptor().isDraftable()) {
+        many.publishMany(draft, live);
       }
     }
-
     return liveBean;
   }
 
@@ -103,20 +85,15 @@ final class BeanDescriptorDraftHelp<T> {
    * Fetch draftable element relationships.
    */
   void draftQueryOptimise(Query<T> query) {
-
-    BeanPropertyAssocOne<?>[] one = desc.propertiesOne();
-    for (BeanPropertyAssocOne<?> anOne : one) {
+    for (BeanPropertyAssocOne<?> anOne : desc.propertiesOne()) {
       if (anOne.getTargetDescriptor().isDraftableElement()) {
         query.fetch(anOne.getName());
       }
     }
-
-    BeanPropertyAssocMany<?>[] many = desc.propertiesMany();
-    for (BeanPropertyAssocMany<?> aMany : many) {
+    for (BeanPropertyAssocMany<?> aMany : desc.propertiesMany()) {
       if (aMany.getTargetDescriptor().isDraftableElement()) {
         query.fetch(aMany.getName());
       }
     }
-
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
index 1d541377d..54803369a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java
@@ -15,7 +15,6 @@ import java.util.Arrays;
 abstract class BeanDescriptorElement<T> extends BeanDescriptor<T> {
 
   private final String simpleName;
-
   final ElementHelp elementHelp;
 
   BeanDescriptorElement(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
index c40a1c156..6758d4b09 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java
@@ -12,12 +12,11 @@ import java.io.IOException;
 /**
  * Bean descriptor used with element collection of list/set of embeddable.
  */
+@SuppressWarnings("rawtypes")
 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) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
index 670c0c67d..e0ae85be1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
@@ -18,7 +18,6 @@ import java.util.Map;
 class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<T> {
 
   private final ScalarType scalarTypeKey;
-
   private final boolean stringKey;
 
   BeanDescriptorElementEmbeddedMap(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
@@ -50,7 +49,6 @@ class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<
 
   @Override
   public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-
     JsonParser parser = readJson.getParser();
     ElementCollector add = elementHelp.createCollector();
     do {
@@ -70,7 +68,6 @@ class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<
         add.addKeyValue(key, val);
       }
     } while (true);
-
     return add.collection();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
index 262f7d8be..13833eb77 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
@@ -40,7 +40,6 @@ class BeanDescriptorElementScalar<T> extends BeanDescriptorElement<T> {
 
   @Override
   public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-
     JsonParser parser = readJson.getParser();
     ElementCollector add = elementHelp.createCollector();
     do {
@@ -50,7 +49,6 @@ class BeanDescriptorElementScalar<T> extends BeanDescriptorElement<T> {
       }
       add.addElement(scalarType.jsonRead(parser));
     } while (true);
-
     return add.collection();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
index a9aabce8b..93a2bcb91 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
@@ -49,7 +49,6 @@ class BeanDescriptorElementScalarMap<T> extends BeanDescriptorElement<T> {
 
   @Override
   public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-
     JsonParser parser = readJson.getParser();
     ElementCollector add = elementHelp.createCollector();
     do {
@@ -69,7 +68,6 @@ class BeanDescriptorElementScalarMap<T> extends BeanDescriptorElement<T> {
         add.addKeyValue(key, val);
       }
     } while (true);
-
     return add.collection();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
index ec9c19044..9ce861569 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorInitContext.java
@@ -7,7 +7,6 @@ class BeanDescriptorInitContext {
   private final Map<String, String> withHistoryTables;
   private final Map<String, String> draftTables;
   private final String asOfViewSuffix;
-
   private String embeddedPrefix;
 
   BeanDescriptorInitContext(Map<String, String> withHistoryTables, Map<String, String> draftTables, String asOfViewSuffix) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index d9b56f215..091a5a579 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -133,10 +133,8 @@ final class BeanDescriptorJsonHelp<T> {
           }
           unmappedProperties.put(key, EJson.parse(parser));
         }
-
       } else if (JsonToken.END_OBJECT == event) {
         break;
-
       } else {
         throw new RuntimeException("Unexpected token " + event + " - expecting key or end_object at: " + parser.getCurrentLocation());
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index edeaa397b..6261ab73c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -107,19 +107,16 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private final int queryPlanTTLSeconds;
   private int entityBeanCount;
   private List<BeanDescriptor<?>> immutableDescriptorList;
-
   /**
    * Map of base tables to 'with history views' used to support 'as of' queries.
    */
   private final Map<String, String> asOfTableMap = new HashMap<>();
-
   /**
    * Map of base tables to 'draft' tables.
    */
   private final Map<String, String> draftTableMap = new HashMap<>();
 
   // 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<>();
@@ -297,11 +294,9 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
       readInheritedIdGenerators();
       // creates the BeanDescriptors
       readEntityRelationships();
-
       List<BeanDescriptor<?>> list = new ArrayList<>(descMap.values());
       list.sort(beanDescComparator);
       immutableDescriptorList = Collections.unmodifiableList(list);
-
       initialiseAll();
       readForeignKeys();
       readTableToDescriptor();
@@ -311,12 +306,9 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
       embeddedIdTypes = null;
       embeddedBeans = null;
       deployInfoMap = null;
-
       return asOfTableMap;
-
     } catch (BeanNotEnhancedException e) {
       throw e;
-
     } catch (RuntimeException e) {
       logger.error("Error in deployment", e);
       throw e;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
index 6ffbae176..cdbdf41be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
@@ -51,7 +51,7 @@ public final class ChainedBeanPersistController implements BeanPersistController
   /**
    * Return the size of the chain.
    */
-  protected int size() {
+  int size() {
     return chain.length;
   }
 
@@ -64,7 +64,6 @@ public final class ChainedBeanPersistController implements BeanPersistController
     } else {
       List<BeanPersistController> newList = new ArrayList<>(list);
       newList.add(c);
-
       return new ChainedBeanPersistController(newList);
     }
   }
@@ -78,7 +77,6 @@ public final class ChainedBeanPersistController implements BeanPersistController
     } else {
       List<BeanPersistController> newList = new ArrayList<>(list);
       newList.remove(c);
-
       return new ChainedBeanPersistController(newList);
     }
   }
@@ -101,36 +99,36 @@ public final class ChainedBeanPersistController implements BeanPersistController
 
   @Override
   public void postDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postDelete(request);
+    for (BeanPersistController controller : chain) {
+      controller.postDelete(request);
     }
   }
 
   @Override
   public void postInsert(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postInsert(request);
+    for (BeanPersistController controller : chain) {
+      controller.postInsert(request);
     }
   }
 
   @Override
   public void postUpdate(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postUpdate(request);
+    for (BeanPersistController controller : chain) {
+      controller.postUpdate(request);
     }
   }
 
   @Override
   public void postSoftDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postSoftDelete(request);
+    for (BeanPersistController controller : chain) {
+      controller.postSoftDelete(request);
     }
   }
 
   @Override
   public boolean preDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preDelete(request)) {
+    for (BeanPersistController controller : chain) {
+      if (!controller.preDelete(request)) {
         return false;
       }
     }
@@ -139,8 +137,8 @@ public final class ChainedBeanPersistController implements BeanPersistController
 
   @Override
   public boolean preSoftDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preSoftDelete(request)) {
+    for (BeanPersistController controller : chain) {
+      if (!controller.preSoftDelete(request)) {
         return false;
       }
     }
@@ -149,15 +147,15 @@ public final class ChainedBeanPersistController implements BeanPersistController
 
   @Override
   public void preDelete(BeanDeleteIdRequest request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.preDelete(request);
+    for (BeanPersistController controller : chain) {
+      controller.preDelete(request);
     }
   }
 
   @Override
   public boolean preInsert(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preInsert(request)) {
+    for (BeanPersistController controller : chain) {
+      if (!controller.preInsert(request)) {
         return false;
       }
     }
@@ -166,8 +164,8 @@ public final class ChainedBeanPersistController implements BeanPersistController
 
   @Override
   public boolean preUpdate(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preUpdate(request)) {
+    for (BeanPersistController controller : chain) {
+      if (!controller.preUpdate(request)) {
         return false;
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
index 624ac6540..60b1a8bfe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
@@ -80,29 +80,29 @@ public final class ChainedBeanPersistListener implements BeanPersistListener {
 
   @Override
   public void deleted(Object bean) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.deleted(bean);
+    for (BeanPersistListener listener : chain) {
+      listener.deleted(bean);
     }
   }
 
   @Override
   public void softDeleted(Object bean) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.softDeleted(bean);
+    for (BeanPersistListener listener : chain) {
+      listener.softDeleted(bean);
     }
   }
 
   @Override
   public void inserted(Object bean) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.inserted(bean);
+    for (BeanPersistListener listener : chain) {
+      listener.inserted(bean);
     }
   }
 
   @Override
   public void updated(Object bean, Set<String> updatedProperties) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.updated(bean, updatedProperties);
+    for (BeanPersistListener listener : chain) {
+      listener.updated(bean, updatedProperties);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
index d8f297628..f143cb8a8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
@@ -47,13 +47,6 @@ public final class ChainedBeanPostConstructListener implements BeanPostConstruct
     }
   }
 
-//  /**
-//   * Return the size of the chain.
-//   */
-//  int size() {
-//    return chain.length;
-//  }
-
   @Override
   public boolean isRegisterFor(Class<?> cls) {
     // never called
@@ -65,22 +58,22 @@ public final class ChainedBeanPostConstructListener implements BeanPostConstruct
    */
   @Override
   public void postConstruct(Object bean) {
-    for (BeanPostConstructListener aChain : chain) {
-      aChain.postConstruct(bean);
+    for (BeanPostConstructListener listener : chain) {
+      listener.postConstruct(bean);
     }
   }
 
   @Override
   public void autowire(Object bean) {
-    for (BeanPostConstructListener aChain : chain) {
-      aChain.autowire(bean);
+    for (BeanPostConstructListener listener : chain) {
+      listener.autowire(bean);
     }
   }
 
   @Override
   public void postCreate(Object bean) {
-    for (BeanPostConstructListener aChain : chain) {
-      aChain.postCreate(bean);
+    for (BeanPostConstructListener listener : chain) {
+      listener.postCreate(bean);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
index c3191a151..f5803d81a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
@@ -47,13 +47,6 @@ public final class ChainedBeanPostLoad implements BeanPostLoad {
     }
   }
 
-//  /**
-//   * Return the size of the chain.
-//   */
-//  int size() {
-//    return chain.length;
-//  }
-
   @Override
   public boolean isRegisterFor(Class<?> cls) {
     // never called
@@ -65,8 +58,8 @@ public final class ChainedBeanPostLoad implements BeanPostLoad {
    */
   @Override
   public void postLoad(Object bean) {
-    for (BeanPostLoad aChain : chain) {
-      aChain.postLoad(bean);
+    for (BeanPostLoad postLoad : chain) {
+      postLoad.postLoad(bean);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
index be7c082f6..ef0aea684 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
@@ -72,8 +72,8 @@ public final class ChainedBeanQueryAdapter implements BeanQueryAdapter {
 
   @Override
   public void preQuery(BeanQueryRequest<?> request) {
-    for (BeanQueryAdapter aChain : chain) {
-      aChain.preQuery(request);
+    for (BeanQueryAdapter adapter : chain) {
+      adapter.preQuery(request);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
index 9f1bd5d59..d8867e904 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
@@ -5,7 +5,6 @@ import io.ebeaninternal.api.SpiCacheRegion;
 public final class DCacheRegion implements SpiCacheRegion {
 
   private boolean enabled = true;
-
   private final String name;
 
   public DCacheRegion(String name) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
index 9c5245e21..184e7ad18 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java
@@ -35,21 +35,13 @@ public abstract class DeployParser {
   private static final char OPEN_BRACKET = '(';
 
   boolean encrypted;
-
   private String source;
-
   private StringBuilder sb;
-
   private int sourceLength;
-
   private int pos;
-
   String priorWord;
-
   String word;
-
   private char wordTerminator;
-
   private StringBuilder wordBuffer;
 
   protected abstract String convertWord();
@@ -66,16 +58,13 @@ public abstract class DeployParser {
   }
 
   public String parse(String source) {
-
     if (source == null) {
       return null;
     }
-
     pos = -1;
     this.source = source;
     this.sourceLength = source.length();
     this.sb = new StringBuilder(source.length() + 20);
-
     while (nextWord()) {
       if (skipWordConvert()) {
         sb.append(word);
@@ -94,7 +83,6 @@ public abstract class DeployParser {
         }
       }
     }
-
     return sb.toString();
   }
 
@@ -103,11 +91,9 @@ public abstract class DeployParser {
   }
 
   private boolean nextWord() {
-
     if (!findWordStart()) {
       return false;
     }
-
     wordBuffer = new StringBuilder();
     wordBuffer.append(source.charAt(pos));
     while (++pos < sourceLength) {
@@ -119,9 +105,7 @@ public abstract class DeployParser {
         break;
       }
     }
-
     word = wordBuffer.toString();
-
     return true;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
index bf98172a2..419d1052e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java
@@ -15,15 +15,11 @@ 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<>();
-
   private boolean catchFirst;
-
   private ElPropertyDeploy firstProp;
 
   DeployPropertyParser(BeanDescriptor<?> beanDescriptor) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
index 716820922..638029647 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java
@@ -25,7 +25,6 @@ public final class DeployUpdateParser extends DeployParser {
 
   @Override
   public String convertWord() {
-
     String dbWord = getDeployWord(word);
     if (dbWord != null) {
       return dbWord;
@@ -35,10 +34,8 @@ public final class DeployUpdateParser extends DeployParser {
   }
 
   private String convertSubword(String currentWord) {
-
     int start = 0;
     StringBuilder localBuffer = null;
-
     while (true) {
       int dotPos = currentWord.indexOf('.', start);
       if (start == 0 && dotPos == -1) {
@@ -76,11 +73,9 @@ public final class DeployUpdateParser extends DeployParser {
 
   @Override
   public String getDeployWord(String expression) {
-
     if (expression.equalsIgnoreCase(beanDescriptor.getName())) {
       return beanDescriptor.getBaseTable();
     }
-
     ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression);
     return elProp != null ? elProp.getDbColumn() : null;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
index 5790377db..0349ac196 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
@@ -28,7 +28,6 @@ final class DetermineAggPath {
    * Parse and return the full path for the aggregation.
    */
   static String path(String aggregation) {
-
     // aggregations always have a form of sum(), avg(), max(), count() etc
     // so find the first open bracket
     int start = aggregation.indexOf('(');
@@ -49,7 +48,6 @@ final class DetermineAggPath {
     return ch == '.' || Character.isJavaIdentifierPart(ch);
   }
 
-
   /**
    * Helper class holding aggregation path segments.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index 3bfa064b5..970145632 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -12,11 +12,8 @@ import javax.persistence.PersistenceException;
 class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
   private final String parsedFormula;
-
   private final boolean aggregate;
-
   final BeanProperty asTarget;
-
   private final String alias;
 
   DynamicPropertyAggregationFormula(String name, ScalarType<?> scalarType, String parsedFormula, boolean aggregate, BeanProperty asTarget, String alias) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
index 0021d9636..b9a8f008d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormulaMTO.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebeaninternal.server.query.SqlBeanLoad;
 
+@SuppressWarnings("rawtypes")
 public final class DynamicPropertyAggregationFormulaMTO extends DynamicPropertyAggregationFormula {
 
   private final BeanPropertyAssocOne prop;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
index b8ec305a4..72db83564 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java
@@ -7,7 +7,6 @@ import io.ebeaninternal.server.core.InternString;
  * The Exported foreign key and property.
  * <p>
  * Used to for Assoc Manys to create references etc.
- * </p>
  */
 final class ExportedProperty {
 
@@ -42,7 +41,6 @@ final class ExportedProperty {
    * in preference to a parentProperty.idProperty = value.
    * Just using the foreign database column avoids triggering
    * a join to the 'parent' table.
-   * </p>
    */
   public String getForeignDbColumn() {
     return foreignDbColumn;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index 43c4dc872..bd294d145 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -13,19 +13,12 @@ final class FormulaPropertyPath {
   private static final String DISTINCT_ = "distinct ";
 
   private final BeanDescriptor<?> descriptor;
-
   private final String formula;
-
   private final String outerFunction;
-
   private final String internalExpression;
-
   private final ElPropertyDeploy firstProp;
-
   private final String parsedAggregation;
-
   private boolean countDistinct;
-
   private String cast;
   private String alias;
 
@@ -36,7 +29,6 @@ final class FormulaPropertyPath {
   FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula, String path) {
     this.descriptor = descriptor;
     this.formula = formula;
-
     int openBracket = formula.indexOf('(');
     int closeBracket = formula.lastIndexOf(')');
     if (openBracket == -1 || closeBracket == -1) {
@@ -49,7 +41,6 @@ final class FormulaPropertyPath {
       // ::CastType as foo
       parseSuffix(formula.substring(closeBracket + 1).trim());
     }
-
     DeployPropertyParser parser = descriptor.parser().setCatchFirst(true);
     String parsed = parser.parse(internalExpression);
     if (path != null) {
@@ -105,7 +96,6 @@ final class FormulaPropertyPath {
   }
 
   STreeProperty build() {
-
     if (cast != null) {
       ScalarType<?> scalarType = descriptor.getScalarType(cast);
       if (scalarType == null) {
@@ -122,7 +112,6 @@ final class FormulaPropertyPath {
     if (firstProp == null) {
       throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?");
     }
-
     // determine scalarType based on first property found by parser
     final BeanProperty property = firstProp.getBeanProperty();
     if (!property.isAssocId()) {
@@ -133,13 +122,12 @@ final class FormulaPropertyPath {
   }
 
   private DynamicPropertyAggregationFormula create(ScalarType<?> scalarType) {
-
     String logicalName = logicalName();
     return new DynamicPropertyAggregationFormula(logicalName, scalarType, parsedAggregation, isAggregate(), target(logicalName), alias);
   }
 
+  @SuppressWarnings("rawtypes")
   private DynamicPropertyAggregationFormula createManyToOne(BeanProperty property) {
-
     String logicalName = logicalName();
     return new DynamicPropertyAggregationFormulaMTO((BeanPropertyAssocOne) property, logicalName, parsedAggregation, isAggregate(), target(logicalName), alias);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index 1f3e33797..2985170bf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -46,19 +46,16 @@ public final class InheritInfo {
     this.discriminatorColumn = InternString.intern(deploy.getColumnName(parent));
     this.discriminatorValue = deploy.getDiscriminatorObjectValue();
     this.discriminatorStringValue = deploy.getDiscriminatorStringValue();
-
     this.discriminatorType = deploy.getDiscriminatorType(parent);
     this.discriminatorLength = deploy.getColumnLength(parent);
     this.columnDefn = deploy.getColumnDefn();
     this.where = InternString.intern(deploy.getWhere());
-
     if (r == null) {
       // this is a root node
       root = this;
       discMap = new HashMap<>();
       typeMap = new HashMap<>();
       registerWithRoot(this);
-
     } else {
       this.root = r;
       // register with the root node...
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
index 4878557b2..bc325d2a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java
@@ -12,20 +12,14 @@ public final class TableJoinColumn {
    * The local database column name.
    */
   private final String localDbColumn;
-
   private final String localSqlFormula;
-
   /**
    * The foreign database column name.
    */
   private final String foreignDbColumn;
-
   private final String foreignSqlFormula;
-
   private final boolean insertable;
-
   private final boolean updateable;
-
   /**
    * Hash for including in a query plan
    */

From bf2d75e55e0533018b974e5752c5b759c13f6c32 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 20 Aug 2021 17:51:01 +1200
Subject: [PATCH 425/447] #2318 - Refactor internals - trim whitespace in
 deploy package

---
 .../deploy/meta/DeployBeanDescriptor.java     | 45 ----------------
 .../deploy/meta/DeployBeanProperty.java       | 51 -------------------
 .../deploy/meta/DeployBeanPropertyAssoc.java  |  9 ----
 .../meta/DeployBeanPropertyAssocMany.java     | 12 -----
 .../meta/DeployBeanPropertyAssocOne.java      |  5 --
 .../server/deploy/meta/DeployBeanTable.java   |  2 -
 .../server/deploy/meta/DeployTableJoin.java   |  4 --
 .../deploy/meta/DeployTableJoinColumn.java    |  5 --
 .../deploy/parse/AnnotationAssocManys.java    | 22 --------
 .../deploy/parse/AnnotationAssocOnes.java     |  2 -
 .../server/deploy/parse/AnnotationClass.java  | 17 -------
 .../server/deploy/parse/AnnotationParser.java |  4 --
 .../server/deploy/parse/DeployBeanInfo.java   |  2 -
 .../deploy/parse/DeployCreateProperties.java  | 15 ------
 .../server/deploy/parse/DeployInherit.java    | 17 +------
 .../deploy/parse/DeployInheritInfo.java       |  5 --
 .../server/deploy/parse/DeployUtil.java       | 16 ------
 .../server/deploy/parse/ReadAnnotations.java  |  5 --
 .../deploy/visitor/VisitProperties.java       | 11 +---
 19 files changed, 3 insertions(+), 246 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index f0184948e..8d1a735eb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -70,131 +70,86 @@ public class DeployBeanDescriptor<T> {
   private static final String I_SCALAOBJECT = "scala.ScalaObject";
 
   private final DatabaseConfig config;
-
   private final BeanDescriptorManager manager;
-
   /**
    * Map of BeanProperty Linked so as to preserve order.
    */
   private LinkedHashMap<String, DeployBeanProperty> propMap = new LinkedHashMap<>();
-
   private Map<String, SpiRawSql> namedRawSql;
-
   private Map<String, String> namedQuery;
-
   private EntityType entityType;
-
   private DeployBeanPropertyAssocOne<?> unidirectional;
-
   private DeployBeanProperty orderColumn;
-
   private Class<?> idClass;
-
   private DeployBeanPropertyAssocOne<?> idClassProperty;
-
   private DeployIdentityMode identityMode = DeployIdentityMode.auto();
-
   private PlatformIdGenerator idGenerator;
-
   /**
    * Set true when explicit auto generated Id.
    */
   private boolean idGeneratedValue;
-
   /**
    * Used with Identity columns but no getGeneratedKeys support.
    */
   private String selectLastInsertedId;
   private String selectLastInsertedIdDraft;
-
   /**
    * The concurrency mode for beans of this type.
    */
   private ConcurrencyMode concurrencyMode;
-
   private List<IndexDefinition> indexDefinitions;
-
   private String storageEngine;
-
   /**
    * The base database table.
    */
   private String baseTable;
-
   private String baseTableAsOf;
-
   private String baseTableVersionsBetween;
-
   private String draftTable;
-
   private String[] dependentTables;
-
   private boolean historySupport;
-
   private boolean readAuditing;
-
   private boolean draftable;
-
   private boolean draftableElement;
-
   private TableName baseTableFull;
-
   private String[] properties;
-
   /**
    * The EntityBean type used to create new EntityBeans.
    */
   private final Class<T> beanType;
-
   private final List<BeanPersistController> persistControllers = new ArrayList<>();
   private final List<BeanPersistListener> persistListeners = new ArrayList<>();
   private final List<BeanQueryAdapter> queryAdapters = new ArrayList<>();
   private final List<BeanPostLoad> postLoaders = new ArrayList<>();
   private final List<BeanPostConstructListener> postConstructListeners = new ArrayList<>();
-
   private CacheOptions cacheOptions = CacheOptions.NO_CACHING;
-
   /**
    * If set overrides the find implementation. Server side only.
    */
   private BeanFindController beanFinder;
-
   /**
    * Inheritance information. Server side only.
    */
   private InheritInfo inheritInfo;
-
   private String name;
-
   private ChangeLogFilter changeLogFilter;
-
   private String dbComment;
-
   private PartitionMeta partitionMeta;
-
   /**
    * One of NONE, INDEX or EMBEDDED.
    */
   private boolean docStoreMapped;
-
   private DocStore docStore;
-
   private PathProperties docStorePathProperties;
-
   private String docStoreQueueId;
-
   private String docStoreIndexName;
-
   private String docStoreIndexType;
-
   private DocStoreMode docStorePersist;
   private DocStoreMode docStoreInsert;
   private DocStoreMode docStoreUpdate;
   private DocStoreMode docStoreDelete;
-
   private DeployBeanProperty idProperty;
   private TableJoin primaryKeyJoin;
-
   private Object jacksonAnnotatedClass;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 5e5455b2f..33d1bf266 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -55,170 +55,119 @@ public class DeployBeanProperty {
    * Flag to mark this at part of the unique id.
    */
   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
    * (embedded or not).
    */
   private boolean embedded;
-
   /**
    * Flag indicating if this the version property.
    */
   private boolean versionColumn;
-
   private boolean fetchEager = true;
-
   /**
    * Set if this property is nullable.
    */
   private boolean nullable = true;
-
   private boolean unique;
-
   private boolean discriminator;
-
   /**
    * The length or precision of the DB column.
    */
   private int dbLength;
-
   private int dbScale;
-
   private String dbColumnDefn;
-
   private boolean isTransient;
-
   private boolean localEncrypted;
-
   private boolean jsonSerialize = true;
   private boolean jsonDeserialize = true;
   private MutationDetection mutationDetection;
-
   private boolean dbEncrypted;
   private DbEncryptFunction dbEncryptFunction;
-
   private int dbEncryptedType;
-
   private String dbBind = "?";
-
   /**
    * Is this property include in database resultSet.
    */
   private boolean dbRead;
-
   /**
    * Include this in DB insert.
    */
   private boolean dbInsertable;
-
   /**
    * Include this in a DB update.
    */
   private boolean dbUpdateable;
-
   private DeployTableJoin secondaryTableJoin;
-
   private String secondaryTableJoinPrefix;
-
   /**
    * Set to true if this property is based on a secondary table.
    */
   private String secondaryTable;
-
   /**
    * The type that owns this property.
    */
   private Class<?> owningType;
-
   /**
    * True if the property is a Clob, Blob LongVarchar or LongVarbinary.
    */
   private boolean lob;
-
   private boolean naturalKey;
-
   /**
    * The logical bean property name.
    */
   private String name;
-
   /**
    * The reflected field.
    */
   private Field field;
-
   /**
    * The bean type.
    */
   private final Class<?> propertyType;
-
   private final Type genericType;
-
   /**
    * Set for Non-JDBC types to provide logical to db type conversion.
    */
   private ScalarType<?> scalarType;
-
   /**
    * The database column. This can include quoted identifiers.
    */
   private String dbColumn;
-
   private String aggregationPrefix;
   private String aggregation;
   private String aggregationParsed;
-
   private String sqlFormulaSelect;
   private String sqlFormulaJoin;
-
   /**
    * The jdbc data type this maps to.
    */
   private int dbType;
-
   private final DeployDocPropertyOptions docMapping = new DeployDocPropertyOptions();
-
   private int propertyIndex;
-
   private BeanPropertyGetter getter;
-
   private BeanPropertySetter setter;
-
   /**
    * Generator for insert or update timestamp etc.
    */
   private GeneratedProperty generatedProperty;
-
   final DeployBeanDescriptor<?> desc;
-
   private boolean undirectionalShadow;
-
   private boolean elementProperty;
-
   private int sortOrder;
-
   private boolean excludedFromHistory;
-
   private boolean tenantId;
-
   private boolean draft;
   private boolean draftOnly;
   private boolean draftDirty;
   private boolean draftReset;
-
   private boolean softDelete;
   private boolean unmappedJson;
-
   private String dbComment;
-
   private String dbColumnDefault;
-
   private List<DbMigrationInfo> dbMigrationInfos;
-
   private Set<Annotation> metaAnnotations;
 
   public DeployBeanProperty(DeployBeanDescriptor<?> desc, Class<?> propertyType, ScalarType<?> scalarType, ScalarTypeConverter<?, ?> typeConverter) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
index be4b77aa0..3461be3bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
@@ -13,38 +13,29 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
    * The type of the joined bean.
    */
   Class<T> targetType;
-
   /**
    * Persist settings.
    */
   final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
-
   /**
    * The join table information.
    */
   private BeanTable beanTable;
-
   /**
    * Join between the beans.
    */
   final DeployTableJoin tableJoin = new DeployTableJoin();
-
   /**
    * Literal added to where clause of lazy loading query.
    */
   private String extraWhere;
-
   /**
    * From the deployment mappedBy attribute.
    */
   private String mappedBy;
-
   private String docStoreDoc;
-
   private int fetchPreference = 1000;
-
   private PropertyForeignKey foreignKey;
-
   boolean orphanRemoval;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index 606a6d215..c201308e2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -17,41 +17,29 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
    * The type of the many, set, list or map.
    */
   private final ManyType manyType;
-
   ModifyListenMode modifyListenMode = ModifyListenMode.NONE;
-
   /**
    * Flag to indicate manyToMany relationship.
    */
   private boolean manyToMany;
-
   private boolean o2mJoinTable;
-
   private boolean elementCollection;
-
   /**
    * Flag to indicate this is a unidirectional relationship.
    */
   private boolean unidirectional;
-
   /**
    * Join for manyToMany intersection table.
    */
   private DeployTableJoin intersectionJoin;
-
   /**
    * For ManyToMany this is the Inverse join used to build reference queries.
    */
   private DeployTableJoin inverseJoin;
-
   private String fetchOrderBy;
-
   private String mapKey;
-
   private String intersectionDraftTable;
-
   private DeployOrderColumn orderColumn;
-
   /**
    * Effectively the dynamically created target descriptor (that doesn't have a mapped type/class per say).
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
index 1444c69de..7f41c028c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java
@@ -10,15 +10,10 @@ import javax.persistence.CascadeType;
 public final class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private boolean oneToOne;
-
   private boolean oneToOneExported;
-
   private boolean primaryKeyJoin;
-
   private boolean primaryKeyExport;
-
   private DeployBeanEmbedded deployEmbedded;
-
   private String columnPrefix;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
index 960205e0f..289b5f471 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java
@@ -16,12 +16,10 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 public final class DeployBeanTable {
 
   private final Class<?> beanType;
-
   /**
    * The base table.
    */
   private String baseTable;
-
   private DeployBeanProperty idProperty;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index 2a4608358..8a56e8a82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -21,19 +21,15 @@ public final class DeployTableJoin {
    * The joined table.
    */
   private String table;
-
   /**
    * The type of join. LEFT JOIN etc.
    */
   private SqlJoinType type = SqlJoinType.INNER;
-
   /**
    * The list of join column pairs. Used to generate the on clause.
    */
   private ArrayList<DeployTableJoinColumn> columns = new ArrayList<>(4);
-
   private InheritInfo inheritInfo;
-
   private String extraWhere;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
index df5c4e0d5..7bd82c709 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
@@ -14,24 +14,19 @@ public final class DeployTableJoinColumn {
    * The local database column name.
    */
   private String localDbColumn;
-
   /**
    * SQL formula used for local column
    */
   private String localSqlFormula;
-
   /**
    * The foreign database column name.
    */
   private String foreignDbColumn;
-
   /**
    * SQL formula used for foreign column
    */
   private String foreignSqlFormula;
-
   private boolean insertable;
-
   private boolean updateable;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index a98867a54..804533565 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -69,7 +69,6 @@ final class AnnotationAssocManys extends AnnotationAssoc {
   }
 
   private void read(DeployBeanPropertyAssocMany<?> prop) {
-
     OneToMany oneToMany = get(prop, OneToMany.class);
     if (oneToMany != null) {
       readToOne(oneToMany, prop);
@@ -105,27 +104,22 @@ final class AnnotationAssocManys extends AnnotationAssoc {
     if (get(prop, HistoryExclude.class) != null) {
       prop.setExcludedFromHistory();
     }
-
     OrderBy orderBy = get(prop, OrderBy.class);
     if (orderBy != null) {
       prop.setFetchOrderBy(orderBy.value());
     }
-
     MapKey mapKey = get(prop, MapKey.class);
     if (mapKey != null) {
       prop.setMapKey(mapKey.name());
     }
-
     Where where = prop.getMetaAnnotationWhere(platform);
     if (where != null) {
       prop.setExtraWhere(processFormula(where.clause()));
     }
-
     FetchPreference fetchPreference = get(prop, FetchPreference.class);
     if (fetchPreference != null) {
       prop.setFetchPreference(fetchPreference.value());
     }
-
     // check for manually defined joins
     BeanTable beanTable = prop.getBeanTable();
 
@@ -147,31 +141,24 @@ final class AnnotationAssocManys extends AnnotationAssoc {
     } else if (prop.isManyToMany()) {
       checkSelfManyToMany(prop);
     }
-
     if (prop.getMappedBy() != null) {
       // the join is derived by reversing the join information
       // from the mapped by property.
       // Refer BeanDescriptorManager.readEntityRelationships()
       return;
     }
-
     if (prop.isManyToMany()) {
       manyToManyDefaultJoins(prop);
       return;
     }
-
     if (!prop.getTableJoin().hasJoinColumns() && beanTable != null) {
-
       // use naming convention to define join (based on the bean name for this side of relationship)
       // A unidirectional OneToMany or OneToMany with no mappedBy property
-
       NamingConvention nc = factory.getNamingConvention();
-
       String fkeyPrefix = null;
       if (nc.isUseForeignKeyPrefix()) {
         fkeyPrefix = nc.getColumnFromProperty(descriptor.getBeanType(), descriptor.getName());
       }
-
       // Use the owning bean table to define the join
       BeanTable owningBeanTable = factory.getBeanTable(descriptor.getBeanType());
       owningBeanTable.createJoinColumn(fkeyPrefix, prop.getTableJoin(), false, prop.getSqlFormulaSelect());
@@ -186,7 +173,6 @@ final class AnnotationAssocManys extends AnnotationAssoc {
 
   @SuppressWarnings("unchecked")
   private void readElementCollection(DeployBeanPropertyAssocMany<?> prop, ElementCollection elementCollection) {
-
     prop.setElementCollection();
     if (!elementCollection.targetClass().equals(void.class)) {
       prop.setTargetType(elementCollection.targetClass());
@@ -199,7 +185,6 @@ final class AnnotationAssocManys extends AnnotationAssoc {
     }
 
     CollectionTable collectionTable = get(prop, CollectionTable.class);
-
     String fullTableName = getFullTableName(collectionTable);
     if (fullTableName == null) {
       fullTableName = descriptor.getBaseTable()+"_"+ CamelCaseHelper.toUnderscoreFromCamel(prop.getName());
@@ -288,7 +273,6 @@ final class AnnotationAssocManys extends AnnotationAssoc {
   }
 
   private void setElementProperty(DeployBeanProperty elementProp, String name, String dbColumn, int sortOrder) {
-
     if (dbColumn == null) {
       dbColumn = "value";
     }
@@ -310,7 +294,6 @@ final class AnnotationAssocManys extends AnnotationAssoc {
    * </p>
    */
   private void readJoinTable(JoinTable joinTable, DeployBeanPropertyAssocMany<?> prop) {
-
     String intTableName = getFullTableName(joinTable);
     if (intTableName.isEmpty()) {
       BeanTable localTable = factory.getBeanTable(descriptor.getBeanType());
@@ -369,9 +352,7 @@ final class AnnotationAssocManys extends AnnotationAssoc {
    * </p>
    */
   private void manyToManyDefaultJoins(DeployBeanPropertyAssocMany<?> prop) {
-
     String intTableName = null;
-
     DeployTableJoin intJoin = prop.getIntersectionJoin();
     if (intJoin == null) {
       intJoin = new DeployTableJoin();
@@ -396,8 +377,6 @@ final class AnnotationAssocManys extends AnnotationAssoc {
     }
 
     DeployTableJoin destJoin = prop.getTableJoin();
-
-
     if (intJoin.hasJoinColumns() && destJoin.hasJoinColumns()) {
       // already defined the foreign key columns etc
       return;
@@ -448,7 +427,6 @@ final class AnnotationAssocManys extends AnnotationAssoc {
   }
 
   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);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 727fe7c83..6580d841e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -231,11 +231,9 @@ final class AnnotationAssocOnes extends AnnotationAssoc {
     if (!primaryKeyJoin.referencedColumnName().isEmpty()) {
       log.info("Automatically determining join columns for @PrimaryKeyJoinColumn - Ignoring PrimaryKeyJoinColumn.referencedColumnName attribute [{}] on {}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
     }
-
     BeanTable baseBeanTable = factory.getBeanTable(info.getDescriptor().getBeanType());
     String localPrimaryKey = baseBeanTable.getIdColumn();
     String foreignColumn = getBeanTable(prop).getIdColumn();
-
     prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localPrimaryKey, foreignColumn, false, false));
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 44a9d2113..4bdf03d5b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -41,9 +41,7 @@ final class AnnotationClass extends AnnotationParser {
   private static final Logger logger = LoggerFactory.getLogger(AnnotationClass.class);
 
   private final String asOfViewSuffix;
-
   private final String versionsBetweenSuffix;
-
   private final boolean disableL2Cache;
 
   /**
@@ -88,7 +86,6 @@ final class AnnotationClass extends AnnotationParser {
    * Set the table name if it has not already been set.
    */
   private void setTableName() {
-
     if (descriptor.isBaseTableType()) {
       Class<?> beanType = descriptor.getBeanType();
       InheritInfo inheritInfo = descriptor.getInheritInfo();
@@ -109,7 +106,6 @@ final class AnnotationClass extends AnnotationParser {
       descriptor.setEntityType(EntityType.DOC);
       descriptor.setName(cls.getSimpleName());
     }
-
     Entity entity = typeGet(cls, Entity.class);
     if (entity != null) {
       descriptor.setEntityType(EntityType.ORM);
@@ -119,12 +115,10 @@ final class AnnotationClass extends AnnotationParser {
         descriptor.setName(entity.name());
       }
     }
-
     Identity identity = typeGet(cls, Identity.class);
     if (identity != null) {
       descriptor.setIdentityMode(identity);
     }
-
     IdClass idClass = typeGet(cls, IdClass.class);
     if (idClass != null) {
       descriptor.setIdClass(idClass.value());
@@ -135,7 +129,6 @@ final class AnnotationClass extends AnnotationParser {
       descriptor.setEntityType(EntityType.EMBEDDED);
       descriptor.setName("Embeddable:" + cls.getSimpleName());
     }
-
     for (Index index : annotationClassIndexes(cls)) {
       descriptor.addIndex(new IndexDefinition(convertColumnNames(index.columnNames()), index.name(),
         index.unique(), index.platforms(), index.concurrent(), index.definition()));
@@ -145,7 +138,6 @@ final class AnnotationClass extends AnnotationParser {
     if (uc != null) {
       descriptor.addIndex(new IndexDefinition(convertColumnNames(uc.columnNames())));
     }
-
     View view = typeGet(cls, View.class);
     if (view != null) {
       descriptor.setView(view.name(), view.dependentTables());
@@ -157,42 +149,34 @@ final class AnnotationClass extends AnnotationParser {
         descriptor.addIndex(new IndexDefinition(convertColumnNames(c.columnNames())));
       }
     }
-
     StorageEngine storage = typeGet(cls, StorageEngine.class);
     if (storage != null) {
       descriptor.setStorageEngine(storage.value());
     }
-
     DbPartition partition = typeGet(cls, DbPartition.class);
     if (partition != null) {
       descriptor.setPartitionMeta(new PartitionMeta(partition.mode(), partition.property()));
     }
-
     Draftable draftable = typeGet(cls, Draftable.class);
     if (draftable != null) {
       descriptor.setDraftable();
     }
-
     DraftableElement draftableElement = typeGet(cls, DraftableElement.class);
     if (draftableElement != null) {
       descriptor.setDraftableElement();
     }
-
     ReadAudit readAudit = typeGet(cls, ReadAudit.class);
     if (readAudit != null) {
       descriptor.setReadAuditing();
     }
-
     History history = typeGet(cls, History.class);
     if (history != null) {
       descriptor.setHistorySupport();
     }
-
     DbComment comment = typeGet(cls, DbComment.class);
     if (comment != null) {
       descriptor.setDbComment(comment.value());
     }
-
     if (!disableL2Cache) {
       Cache cache = typeGet(cls, Cache.class);
       if (cache != null) {
@@ -204,7 +188,6 @@ final class AnnotationClass extends AnnotationParser {
         }
       }
     }
-
     for (NamedQuery namedQuery : annotationClassNamedQuery(cls)) {
       descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
index ea880a18b..3e11d738e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
@@ -20,11 +20,8 @@ import java.util.UUID;
 public abstract class AnnotationParser extends AnnotationBase {
 
   final DeployBeanInfo<?> info;
-
   final DeployBeanDescriptor<?> descriptor;
-
   final Class<?> beanType;
-
   final ReadAnnotationConfig readConfig;
 
   AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
@@ -83,7 +80,6 @@ public abstract class AnnotationParser extends AnnotationBase {
    * Read an AttributeOverrides if they exist for this embedded bean.
    */
   void readEmbeddedAttributeOverrides(DeployBeanPropertyAssocOne<?> prop) {
-
     Set<AttributeOverride> attrOverrides = annotationAttributeOverrides(prop);
     if (!attrOverrides.isEmpty()) {
       Map<String, Column> propMap = new HashMap<>(attrOverrides.size());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
index e87ff7754..70a7e666a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java
@@ -12,9 +12,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql;
 public final class DeployBeanInfo<T> {
 
   private final DeployUtil util;
-
   private final DeployBeanDescriptor<T> descriptor;
-
   private DeployBeanPropertyAssoc<?> embeddedId;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index d3d7ddb7d..84a0649a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -40,7 +40,6 @@ public final class DeployCreateProperties {
   private static final Logger logger = LoggerFactory.getLogger(DeployCreateProperties.class);
 
   private final DetermineManyType determineManyType;
-
   private final TypeManager typeManager;
 
   public DeployCreateProperties(TypeManager typeManager) {
@@ -82,15 +81,12 @@ public final class DeployCreateProperties {
    * columns.
    */
   private void createProperties(DeployBeanDescriptor<?> desc, Class<?> beanType, int level) {
-
     if (beanType.equals(Model.class)) {
       // ignore all fields on model (_$dbName)
       return;
     }
-
     try {
       Field[] fields = beanType.getDeclaredFields();
-
       for (int i = 0; i < fields.length; i++) {
         Field field = fields[i];
         if (!ignoreField(field)) {
@@ -112,16 +108,13 @@ public final class DeployCreateProperties {
       }
 
       Class<?> superClass = beanType.getSuperclass();
-
       if (!superClass.equals(Object.class)) {
         // recursively add any properties in the inheritance hierarchy
         // up to the Object.class level...
         createProperties(desc, superClass, level + 1);
       }
-
     } catch (PersistenceException ex) {
       throw ex;
-
     } catch (Exception ex) {
       throw new PersistenceException(ex);
     }
@@ -129,7 +122,6 @@ public final class DeployCreateProperties {
 
   @SuppressWarnings({"unchecked"})
   private DeployBeanProperty createManyType(DeployBeanDescriptor<?> desc, Class<?> targetType, ManyType manyType) {
-
     try {
       ScalarType<?> scalarType = typeManager.getScalarType(targetType);
       if (scalarType != null) {
@@ -143,12 +135,10 @@ public final class DeployCreateProperties {
 
   @SuppressWarnings({"unchecked"})
   private DeployBeanProperty createProp(DeployBeanDescriptor<?> desc, Field field) {
-
     Class<?> propertyType = field.getType();
     if (isSpecialScalarType(field)) {
       return new DeployBeanProperty(desc, propertyType, field.getGenericType());
     }
-
     // check for Collection type (list, set or map)
     ManyType manyType = determineManyType.getManyType(propertyType);
     if (manyType != null) {
@@ -163,16 +153,13 @@ public final class DeployCreateProperties {
       }
       return createManyType(desc, targetType, manyType);
     }
-
     if (propertyType.isEnum() || propertyType.isPrimitive()) {
       return new DeployBeanProperty(desc, propertyType, null, null);
     }
-
     ScalarType<?> scalarType = typeManager.getScalarType(propertyType);
     if (scalarType != null) {
       return new DeployBeanProperty(desc, propertyType, scalarType, null);
     }
-
     if (isTransientField(field)) {
       // return with no ScalarType (still support JSON features)
       return new DeployBeanProperty(desc, propertyType, null, null);
@@ -219,11 +206,9 @@ public final class DeployCreateProperties {
    * ParameterizedType.
    */
   private Class<?> determineTargetType(Field field) {
-
     Type genType = field.getGenericType();
     if (genType instanceof ParameterizedType) {
       ParameterizedType ptype = (ParameterizedType) genType;
-
       Type[] typeArgs = ptype.getActualTypeArguments();
       if (typeArgs.length == 1) {
         // expecting set or list
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
index 7bc0ebd1b..2dd13f993 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
@@ -20,7 +20,6 @@ public final class DeployInherit {
   private final Map<Class<?>, DeployInheritInfo> deployMap = new LinkedHashMap<>();
 
   private final Map<Class<?>, InheritInfo> finalMap = new LinkedHashMap<>();
-
   private final BootupClasses bootupClasses;
 
   /**
@@ -37,26 +36,21 @@ public final class DeployInherit {
   }
 
   private void initialise() {
-    List<Class<?>> entityList = bootupClasses.getEntities();
-
-    findInheritClasses(entityList);
+    findInheritClasses(bootupClasses.getEntities());
     buildDeployTree();
     buildFinalTree();
   }
 
   private void findInheritClasses(List<Class<?>> entityList) {
-
     // go through each class and initialise the info object...
     for (Class<?> cls : entityList) {
       if (isInheritanceClass(cls)) {
-        DeployInheritInfo info = createInfo(cls);
-        deployMap.put(cls, info);
+        deployMap.put(cls, createInfo(cls));
       }
     }
   }
 
   private void buildDeployTree() {
-
     for (DeployInheritInfo info : deployMap.values()) {
       if (!info.isRoot()) {
         DeployInheritInfo parent = getInfo(info.getParent());
@@ -66,7 +60,6 @@ public final class DeployInherit {
   }
 
   private void buildFinalTree() {
-
     for (DeployInheritInfo deploy : deployMap.values()) {
       if (deploy.isRoot()) {
         // build tree top down...
@@ -76,17 +69,14 @@ public final class DeployInherit {
   }
 
   private void createFinalInfo(InheritInfo root, InheritInfo parent, DeployInheritInfo deploy) {
-
     InheritInfo node = new InheritInfo(root, parent, deploy);
     if (parent != null) {
       parent.addChild(node);
     }
     finalMap.put(node.getType(), node);
-
     if (root == null) {
       root = node;
     }
-
     // buildFinalChildren(root, child, deploy);
     for (DeployInheritInfo childDeploy : deploy.children()) {
       createFinalInfo(root, node, childDeploy);
@@ -101,9 +91,7 @@ public final class DeployInherit {
   }
 
   private DeployInheritInfo createInfo(Class<?> cls) {
-
     DeployInheritInfo info = new DeployInheritInfo(cls);
-
     Class<?> parent = findParent(cls);
     if (parent != null) {
       info.setParent(parent);
@@ -121,7 +109,6 @@ public final class DeployInherit {
       info.setColumnLength(da.length());
       info.setColumnDefn(da.columnDefinition());
     }
-
     if (!info.isAbstract()) {
       DiscriminatorValue dv = AnnotationUtil.get(cls, DiscriminatorValue.class); // do not search recursive
       if (dv != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index d1af77c8c..f82daa987 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -21,16 +21,12 @@ public final class DeployInheritInfo {
 
   private String discriminatorStringValue;
   private Object discriminatorObjectValue;
-
   private int columnType;
   private String columnName;
   private int columnLength;
   private String columnDefn;
-
   private final Class<?> type;
-
   private Class<?> parent;
-
   private final ArrayList<DeployInheritInfo> children = new ArrayList<>();
 
   /**
@@ -207,7 +203,6 @@ public final class DeployInheritInfo {
   }
 
   public String getWhere() {
-
     List<Object> discList = new ArrayList<>();
     appendDiscriminator(discList);
     return buildWhereLiteral(discList);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 276ff8d33..74a7bd5b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -42,17 +42,11 @@ public final class DeployUtil {
   private static final int DEFAULT_JSON_VARCHAR_LENGTH = 3000;
 
   private final NamingConvention namingConvention;
-
   private final TypeManager typeManager;
-
   private final DatabasePlatform dbPlatform;
-
   private final EncryptDeployManager encryptDeployManager;
-
   private final EncryptKeyManager encryptKeyManager;
-
   private final Encryptor bytesEncryptor;
-
   private final boolean useValidationNotNull;
 
   public DeployUtil(TypeManager typeMgr, DatabaseConfig config) {
@@ -101,7 +95,6 @@ public final class DeployUtil {
 
   @SuppressWarnings("unchecked")
   void setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
-
     Class<?> enumType = prop.getPropertyType();
     if (!enumType.isEnum()) {
       throw new IllegalArgumentException("Class [" + enumType + "] is Not a Enum?");
@@ -112,7 +105,6 @@ public final class DeployUtil {
       ScalarType<?> scalarType = typeManager.createEnumScalarType(enumClass, type);
       prop.setScalarType(scalarType);
       prop.setDbType(scalarType.getJdbcType());
-
     } catch (IllegalStateException e) {
       throw new PersistenceException("Error mapping property " + prop.getFullBeanName() + " - " + e.getMessage());
     }
@@ -126,13 +118,11 @@ public final class DeployUtil {
    * </p>
    */
   public void setScalarType(DeployBeanProperty property) {
-
     if (property.getScalarType() != null) {
       // already has a ScalarType assigned.
       // this will be an Enum type...
       return;
     }
-
     ScalarType<?> scalarType = getScalarType(property);
     if (scalarType != null) {
       // set the jdbc type this maps to
@@ -143,7 +133,6 @@ public final class DeployUtil {
   }
 
   private ScalarType<?> getScalarType(DeployBeanProperty property) {
-
     // Note that Temporal types already have dbType
     // set via annotations
     Class<?> propType = property.getPropertyType();
@@ -166,7 +155,6 @@ public final class DeployUtil {
    * Map to Postgres HSTORE type (with fallback to JSON storage in VARCHAR).
    */
   void setDbMap(DeployBeanProperty prop, DbMap dbMap) {
-
     ScalarType<?> scalarType = typeManager.getDbMapScalarType();
     int dbType = scalarType.getJdbcType();
     prop.setDbType(dbType);
@@ -183,7 +171,6 @@ public final class DeployUtil {
    * Set the DbArray type (effectively Postgres only).
    */
   void setDbArray(DeployBeanProperty prop, DbArray dbArray) {
-
     Class<?> type = prop.getPropertyType();
     ScalarType<?> scalarType = typeManager.getArrayScalarType(type, dbArray, prop.getGenericType(), prop.isNullable());
     if (scalarType == null) {
@@ -233,7 +220,6 @@ public final class DeployUtil {
    * Return the JDBC type for the JSON storage type.
    */
   private int getDbJsonStorage(DbJsonType dbJsonType) {
-
     switch (dbJsonType) {
       case JSONB:
         return DbPlatformType.JSONB;
@@ -252,9 +238,7 @@ public final class DeployUtil {
    * This property is marked as a Lob object.
    */
   void setLobType(DeployBeanProperty prop) {
-
     ScalarType<?> scalarType = prop.getScalarType();
-
     if (scalarType instanceof ScalarTypeWrapper) {
       int lobType = scalarType.getJdbcType() == Types.VARCHAR ? dbCLOBType : dbBLOBType;
       prop.setDbType(lobType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
index c4ab55a1b..3d8932933 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java
@@ -43,19 +43,14 @@ public final class ReadAnnotations {
    * </p>
    */
   public void readAssociations(DeployBeanInfo<?> info, BeanDescriptorManager factory) {
-
     try {
-
       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, readConfig).parse();
-
       new AnnotationClass(info, readConfig).parseAttributeOverride();
       info.getDescriptor().postAnnotations();
-
     } catch (RuntimeException e) {
       throw new RuntimeException("Error reading annotations for " + info, e);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java
index 5363b0add..70f05a6dc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/visitor/VisitProperties.java
@@ -25,19 +25,15 @@ public class VisitProperties {
     if (idProp != null) {
       visit(propertyVisitor, idProp);
     }
-
     BeanPropertyAssocOne<?> unidirectional = desc.getUnidirectional();
     if (unidirectional != null) {
       visit(propertyVisitor, unidirectional);
     }
-
-    BeanProperty[] propertiesNonTransient = desc.propertiesNonTransient();
-    for (BeanProperty p : propertiesNonTransient) {
+    for (BeanProperty p : desc.propertiesNonTransient()) {
       if (p.isDDLColumn()) {
         visit(propertyVisitor, p);
       }
     }
-
     visitInheritanceProperties(desc, propertyVisitor);
     propertyVisitor.visitEnd();
   }
@@ -46,7 +42,6 @@ public class VisitProperties {
    * Visit the property.
    */
   protected void visit(BeanPropertyVisitor pv, BeanProperty p) {
-
     if (p instanceof BeanPropertyAssocMany<?>) {
       // oneToMany or manyToMany
       pv.visitMany((BeanPropertyAssocMany<?>) p);
@@ -60,16 +55,13 @@ public class VisitProperties {
         for (BeanProperty embProp : embProps) {
           pv.visitEmbeddedScalar(embProp, assocOne);
         }
-
       } else if (assocOne.isOneToOneExported()) {
         // associated one exported
         pv.visitOneExported(assocOne);
-
       } else {
         // associated one imported
         pv.visitOneImported(assocOne);
       }
-
     } else {
       // simple scalar type
       pv.visitScalar(p, true);
@@ -81,7 +73,6 @@ public class VisitProperties {
    * Visit all the other inheritance properties that are not on the root.
    */
   protected void visitInheritanceProperties(BeanDescriptor<?> descriptor, BeanPropertyVisitor pv) {
-
     InheritInfo inheritInfo = descriptor.getInheritInfo();
     if (inheritInfo != null && inheritInfo.isRoot()) {
       // add all properties on the children objects

From 5b10c053de794ad26ad080799a003bd2e067ab40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Fri, 20 Aug 2021 15:13:42 +0200
Subject: [PATCH 426/447] FIX: NPE when accessing mutableNext in EBI

---
 .../io/ebean/bean/EntityBeanIntercept.java    |  3 ++-
 .../org/tests/json/TestJsonNullValues.java    | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
index 527860200..9924bf4f7 100644
--- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
+++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java
@@ -1232,7 +1232,8 @@ public final class EntityBeanIntercept implements Serializable {
     if (mutableNext == null) {
       return null;
     }
-    return mutableNext[propertyIndex].content();
+    final MutableValueNext next = mutableNext[propertyIndex];
+    return next != null ? next.content() : null;
   }
 
 }
diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java
index 533116fd1..7ae086e8d 100644
--- a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java
+++ b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java
@@ -5,6 +5,8 @@ import io.ebean.DB;
 import org.junit.Test;
 import org.tests.model.json.EBasicOldValue;
 
+import java.util.ArrayList;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJsonNullValues extends BaseTestCase {
@@ -39,4 +41,26 @@ public class TestJsonNullValues extends BaseTestCase {
     assertThat(bean.getIntMap()).isEmpty();
   }
 
+  @Test
+  public void testSetOneToNullAnotherToEmpty() {
+    EBasicOldValue bean = new EBasicOldValue();
+    DB.save(bean);
+    bean = DB.find(EBasicOldValue.class, bean.getId());
+
+    bean.setStringList(null);
+    bean.setStringSet(null);
+
+    DB.save(bean);
+    bean = DB.find(EBasicOldValue.class, bean.getId());
+
+    bean.setStringList(new ArrayList<>());
+    bean.setStringSet(null);
+
+    DB.save(bean);
+    bean = DB.find(EBasicOldValue.class, bean.getId());
+
+    assertThat(bean.getStringList()).isEmpty();
+    assertThat(bean.getStringSet()).isEmpty();
+  }
+
 }

From df3eda411acd4e5aee7e3cbca796501e0353944e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 22 Aug 2021 13:59:08 +1200
Subject: [PATCH 427/447] #2318 - Refactor internals - trim whitespace in
 deploy package

---
 .../deploy/generatedproperty/CounterFactory.java      |  1 -
 .../generatedproperty/GeneratedInsertJodaTime.java    |  1 -
 .../generatedproperty/GeneratedPropertyFactory.java   |  9 ++-------
 .../generatedproperty/InsertTimestampFactory.java     |  4 ----
 .../generatedproperty/UpdateTimestampFactory.java     |  5 -----
 .../ebeaninternal/server/deploy/id/IdBinderEmpty.java |  9 +--------
 .../server/deploy/id/IdBinderSimple.java              |  1 -
 .../server/deploy/id/ImportedIdEmbedded.java          | 11 -----------
 .../server/deploy/id/ImportedIdSimple.java            |  6 ------
 9 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
index 999deb121..e08582257 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
@@ -16,7 +16,6 @@ import java.sql.Types;
 final class CounterFactory {
 
   private final GeneratedCounterInteger integerCounter = new GeneratedCounterInteger();
-
   private final GeneratedCounterLong longCounter = new GeneratedCounterLong();
 
    void setCounter(DeployBeanProperty property) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
index 5a4c11550..583a9b02e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
@@ -61,5 +61,4 @@ final class GeneratedInsertJodaTime {
 
   }
 
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
index e876fb379..0f81b4060 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
@@ -45,7 +45,6 @@ public final class GeneratedPropertyFactory {
       generatedWhoCreated = null;
       generatedWhoModified = null;
     }
-
     numberTypes.add(Integer.class.getName());
     numberTypes.add(int.class.getName());
     numberTypes.add(Long.class.getName());
@@ -55,7 +54,6 @@ public final class GeneratedPropertyFactory {
     numberTypes.add(Double.class.getName());
     numberTypes.add(double.class.getName());
     numberTypes.add(BigDecimal.class.getName());
-
     if (idGenerators != null) {
       for (IdGenerator idGenerator : idGenerators) {
         idGeneratorMap.put(idGenerator.getName(), new CustomIdGenerator(idGenerator));
@@ -80,17 +78,14 @@ public final class GeneratedPropertyFactory {
   }
 
   private void setCounter(DeployBeanProperty property) {
-
     counterFactory.setCounter(property);
   }
 
   public void setInsertTimestamp(DeployBeanProperty property) {
-
     insertFactory.setInsertTimestamp(property);
   }
 
   public void setUpdateTimestamp(DeployBeanProperty property) {
-
     updateFactory.setUpdateTimestamp(property);
   }
 
@@ -122,7 +117,7 @@ public final class GeneratedPropertyFactory {
   /**
    * Wraps the custom IdGenerator to implement PlatformIdGenerator.
    */
-  private static class CustomIdGenerator implements PlatformIdGenerator {
+  private static final class CustomIdGenerator implements PlatformIdGenerator {
 
     private final IdGenerator generator;
 
@@ -151,7 +146,7 @@ public final class GeneratedPropertyFactory {
     }
   }
 
-  private static class DummyCurrentUser implements CurrentUserProvider {
+  private static final class DummyCurrentUser implements CurrentUserProvider {
     @Override
     public Object currentUser() {
       throw new RuntimeException("never called");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
index f5083c632..bb9dbc5f9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
@@ -25,7 +25,6 @@ final class InsertTimestampFactory {
     GeneratedInsertLong longTime = new GeneratedInsertLong();
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
-
     map.put(Instant.class, new GeneratedInsertJavaTime.InstantDT());
     map.put(LocalDateTime.class, new GeneratedInsertJavaTime.LocalDT());
     map.put(OffsetDateTime.class, new GeneratedInsertJavaTime.OffsetDT());
@@ -37,7 +36,6 @@ final class InsertTimestampFactory {
   }
 
   void setInsertTimestamp(DeployBeanProperty property) {
-
     property.setGeneratedProperty(createInsertTimestamp(property));
   }
 
@@ -45,13 +43,11 @@ final class InsertTimestampFactory {
    * Create the insert GeneratedProperty depending on the property type.
    */
   GeneratedProperty createInsertTimestamp(DeployBeanProperty property) {
-
     Class<?> propType = property.getPropertyType();
     GeneratedProperty generatedProperty = map.get(propType);
     if (generatedProperty != null) {
       return generatedProperty;
     }
-
     throw new PersistenceException("Generated Insert Timestamp not supported on " + propType.getName());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
index d08b75cc6..f8dc413b9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
@@ -25,12 +25,10 @@ final class UpdateTimestampFactory {
     GeneratedUpdateLong longTime = new GeneratedUpdateLong();
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
-
     map.put(Instant.class, new GeneratedUpdateJavaTime.InstantDT());
     map.put(LocalDateTime.class, new GeneratedUpdateJavaTime.LocalDT());
     map.put(OffsetDateTime.class, new GeneratedUpdateJavaTime.OffsetDT());
     map.put(ZonedDateTime.class, new GeneratedUpdateJavaTime.ZonedDT());
-
     if (classLoadConfig.isJodaTimePresent()) {
       map.put(org.joda.time.LocalDateTime.class, new GeneratedUpdateJodaTime.LocalDT());
       map.put(org.joda.time.DateTime.class, new GeneratedUpdateJodaTime.DateTimeDT());
@@ -38,7 +36,6 @@ final class UpdateTimestampFactory {
   }
 
   void setUpdateTimestamp(DeployBeanProperty property) {
-
     property.setGeneratedProperty(createUpdateTimestamp(property));
   }
 
@@ -46,13 +43,11 @@ final class UpdateTimestampFactory {
    * Create the update GeneratedProperty depending on the property type.
    */
   GeneratedProperty createUpdateTimestamp(DeployBeanProperty property) {
-
     Class<?> propType = property.getPropertyType();
     GeneratedProperty generatedProperty = map.get(propType);
     if (generatedProperty != null) {
       return generatedProperty;
     }
-
     throw new PersistenceException("Generated update Timestamp not supported on " + propType.getName());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
index 3c7785943..af3df49dc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
@@ -16,17 +16,15 @@ import java.util.List;
 /**
  * For beans with no id properties AKA report type beans.
  */
-public final class IdBinderEmpty implements IdBinder {
+final class IdBinderEmpty implements IdBinder {
 
   private static final String bindIdSql = "";
 
   public IdBinderEmpty() {
-
   }
 
   @Override
   public void initialise() {
-
   }
 
   @Override
@@ -121,22 +119,18 @@ public final class IdBinderEmpty implements IdBinder {
 
   @Override
   public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
-
   }
 
   @Override
   public void bindId(DataBind dataBind, Object value) {
-
   }
 
   @Override
   public void addIdInBindValues(DefaultSqlUpdate sqlUpdate, Collection<?> ids) {
-
   }
 
   @Override
   public void addIdInBindValues(SpiExpressionRequest request, Collection<?> ids) {
-
   }
 
   @Override
@@ -174,7 +168,6 @@ public final class IdBinderEmpty implements IdBinder {
 
   @Override
   public void writeData(DataOutput dataOutput, Object idValue) {
-
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index 6541b3fa5..2dd025cb3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -52,7 +52,6 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public String getOrderBy(String pathPrefix, boolean ascending) {
-
     StringBuilder sb = new StringBuilder();
     if (pathPrefix != null) {
       sb.append(pathPrefix).append(".");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
index d0f888582..54581a1be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
@@ -32,9 +32,7 @@ public final class ImportedIdEmbedded implements ImportedId {
 
   @Override
   public void addFkeys(String name) {
-
     BeanProperty[] embeddedProps = foreignAssocOne.getProperties();
-
     for (int i = 0; i < imported.length; i++) {
       String n = name + "." + foreignAssocOne.getName() + "." + embeddedProps[i].getName();
       BeanFkeyProperty fkey = new BeanFkeyProperty(n, imported[i].localDbColumn, foreignAssocOne.getDeployOrder());
@@ -61,7 +59,6 @@ public final class ImportedIdEmbedded implements ImportedId {
 
   @Override
   public void dmlAppend(GenerateDmlRequest request) {
-
     boolean update = request.isUpdate();
     for (ImportedIdSimple anImported : imported) {
       if (anImported.isInclude(update)) {
@@ -72,7 +69,6 @@ public final class ImportedIdEmbedded implements ImportedId {
 
   @Override
   public String importedIdClause() {
-
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < imported.length; i++) {
       if (i > 0) {
@@ -85,9 +81,7 @@ public final class ImportedIdEmbedded implements ImportedId {
 
   @Override
   public int bind(int position, SqlUpdate update, EntityBean bean) {
-
     int pos = position;
-
     EntityBean embedded = (EntityBean) foreignAssocOne.getValue(bean);
     for (ImportedIdSimple anImported : imported) {
       if (anImported.owner.isUpdateable()) {
@@ -100,9 +94,7 @@ public final class ImportedIdEmbedded implements ImportedId {
 
   @Override
   public Object bind(BindableRequest request, EntityBean bean) throws SQLException {
-
     Object embeddedId = (bean == null) ? null : foreignAssocOne.getValue(bean);
-
     boolean update = request.isUpdate();
     if (embeddedId == null) {
       for (ImportedIdSimple anImported : imported) {
@@ -112,7 +104,6 @@ public final class ImportedIdEmbedded implements ImportedId {
       }
       // return anything non-null to skip a derived relationship update
       return Object.class;
-
     } else {
       EntityBean embedded = (EntityBean) embeddedId;
       for (ImportedIdSimple anImported : imported) {
@@ -127,7 +118,6 @@ public final class ImportedIdEmbedded implements ImportedId {
 
   @Override
   public void buildImport(IntersectionRow row, EntityBean other) {
-
     EntityBean embeddedId = (EntityBean) foreignAssocOne.getValue(other);
     if (embeddedId == null) {
       throw new PersistenceException("Foreign Key value null?");
@@ -162,7 +152,6 @@ public final class ImportedIdEmbedded implements ImportedId {
    */
   @Override
   public BeanProperty findMatchImport(String matchDbColumn) {
-
     for (ImportedIdSimple anImported : imported) {
       BeanProperty p = anImported.findMatchImport(matchDbColumn);
       if (p != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 83f615994..362ea51cc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -62,9 +62,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
    * Return the list as an array sorted into the same order as the Bean Properties.
    */
   public static ImportedIdSimple[] sort(List<ImportedIdSimple> list) {
-
     ImportedIdSimple[] importedIds = list.toArray(new ImportedIdSimple[0]);
-
     // sort into the same order as the BeanProperties
     Arrays.sort(importedIds, COMPARATOR);
     return importedIds;
@@ -124,13 +122,11 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   @Override
   public void buildImport(IntersectionRow row, EntityBean other) {
-
     Object value = getIdValue(other);
     if (value == null) {
       String msg = "Foreign Key value null?";
       throw new PersistenceException(msg);
     }
-
     row.put(localDbColumn, value);
   }
 
@@ -162,7 +158,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   @Override
   public Object bind(BindableRequest request, EntityBean bean) throws SQLException {
-
     Object value = null;
     if (bean != null) {
       value = getIdValue(bean);
@@ -173,7 +168,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   @Override
   public BeanProperty findMatchImport(String matchDbColumn) {
-
     if (matchDbColumn.equals(localDbColumn)) {
       return foreignProperty;
     }

From b22791c15be25d86a0c6574a9e6449d201d3e6e3 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 22 Aug 2021 15:29:27 +1200
Subject: [PATCH 428/447] Update ddl review for h2

---
 .../src/test/ddl-review/h2-create-all.sql     | 230 +++++++++++++++++-
 .../src/test/ddl-review/h2-drop-all.sql       |  76 +++++-
 2 files changed, 293 insertions(+), 13 deletions(-)

diff --git a/ebean-core/src/test/ddl-review/h2-create-all.sql b/ebean-core/src/test/ddl-review/h2-create-all.sql
index 50d49a3ac..d6cc91a8f 100644
--- a/ebean-core/src/test/ddl-review/h2-create-all.sql
+++ b/ebean-core/src/test/ddl-review/h2-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2021-02-12T03:32:14.253435800Z
+-- Generated by ebean unknown at 2021-08-20T21:43:22.648422335Z
 create table asimple_bean (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -103,6 +103,18 @@ create table animal_shelter (
   constraint pk_animal_shelter primary key (id)
 );
 
+create table app_config (
+  id                            integer generated by default as identity not null,
+  constraint pk_app_config primary key (id)
+);
+
+create table app_config_control (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  config_id                     integer,
+  constraint pk_app_config_control primary key (id)
+);
+
 create table article (
   id                            integer generated by default as identity not null,
   name                          varchar(255),
@@ -206,6 +218,14 @@ create table bsite_user_d (
   constraint ck_bsite_user_d_access_level check ( access_level in (0,1,2))
 );
 
+create table bsite_user_dmany (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  name                          varchar(255) not null,
+  many                          varchar(255),
+  version                       bigint not null
+);
+
 create table bsite_user_e (
   site_id                       uuid not null,
   user_id                       uuid not null,
@@ -396,6 +416,18 @@ create table coroot (
   constraint pk_coroot primary key (id)
 );
 
+create table calcd_data (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_calcd_data primary key (id)
+);
+
+create table calcd_input (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_calcd_input primary key (id)
+);
+
 create table calculation_result (
   id                            integer generated by default as identity not null,
   charge                        double not null,
@@ -929,6 +961,7 @@ create table earray_set_bean (
   uids                          array,
   other_ids                     array,
   doubs                         array,
+  status                        array,
   version                       bigint not null,
   constraint pk_earray_set_bean primary key (id)
 );
@@ -948,6 +981,7 @@ create table ebasic_change_log (
   name                          varchar(20),
   short_description             varchar(50),
   long_description              varchar(100),
+  plain_bean                    varchar(500),
   who_created                   varchar(255) not null,
   who_modified                  varchar(255) not null,
   when_created                  timestamp not null,
@@ -985,7 +1019,7 @@ create table e_basicenc (
   id                            integer generated by default as identity not null,
   name                          varchar(255),
   description                   varbinary(80),
-  dob                           varbinary(20),
+  dob                           varbinary(80),
   status                        varbinary(20),
   last_update                   timestamp,
   constraint pk_e_basicenc primary key (id)
@@ -1070,6 +1104,8 @@ create table ebasic_json_jackson3 (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
   plain_value                   varchar(500),
+  plain_value2                  varchar(500),
+  plain_value3                  varchar(500),
   version                       bigint not null,
   constraint pk_ebasic_json_jackson3 primary key (id)
 );
@@ -1136,6 +1172,16 @@ create table ebasic_json_map_varchar (
   constraint pk_ebasic_json_map_varchar primary key (id)
 );
 
+create table ebasic_json_multi (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  plain_value1                  varchar(500),
+  plain_value2                  varchar(500),
+  plain_value3                  varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_json_multi primary key (id)
+);
+
 create table ebasic_json_node (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -1196,6 +1242,32 @@ create table ebasic_no_sdchild (
   constraint pk_ebasic_no_sdchild primary key (id)
 );
 
+create table ebasic_old_value (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  string_set                    clob,
+  long_set                      clob,
+  int_set                       clob,
+  string_list                   clob,
+  long_list                     clob,
+  int_list                      clob,
+  object_map                    clob,
+  long_map                      clob,
+  int_map                       clob,
+  json_node                     clob,
+  string_arr                    array,
+  constraint pk_ebasic_old_value primary key (id)
+);
+
+create table ebasic_plain (
+  id                            bigint generated by default as identity not null,
+  attr                          varchar(255),
+  plain_bean                    varchar(500),
+  plain_bean2                   varchar(500),
+  version                       bigint not null,
+  constraint pk_ebasic_plain primary key (id)
+);
+
 create table ebasic_sdchild (
   id                            bigint generated by default as identity not null,
   owner_id                      bigint not null,
@@ -1370,14 +1442,18 @@ create table einvoice (
   invoice_date                  timestamp,
   state                         integer,
   person_id                     bigint,
-  ship_street                   varchar(255) not null,
+  ship_street                   varchar(255),
   ship_suburb                   varchar(255),
   ship_city                     varchar(255),
   ship_status                   varchar(3),
-  bill_street                   varchar(255) not null,
+  ship_jbean                    clob,
+  ship_jraw                     clob,
+  bill_street                   varchar(255),
   bill_suburb                   varchar(255),
   bill_city                     varchar(255),
   bill_status                   varchar(3),
+  bill_jbean                    clob,
+  bill_jraw                     clob,
   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')),
@@ -1450,10 +1526,12 @@ create table eperson (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
   notes                         varchar(255),
-  street                        varchar(255) not null,
+  street                        varchar(255),
   suburb                        varchar(255),
   addr_city                     varchar(255),
   addr_status                   varchar(3),
+  addr_jbean                    clob,
+  jraw                          clob,
   version                       bigint not null,
   constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
@@ -1465,8 +1543,10 @@ create table eperson2 (
   notes                         varchar(255),
   street                        varchar(10),
   suburb                        varchar(100),
-  city                          varchar(255) not null,
-  status                        varchar(3) not null,
+  city                          varchar(255),
+  status                        varchar(3),
+  jbean                         clob,
+  jraw                          clob,
   version                       bigint not null,
   constraint ck_eperson2_status check ( status in ('ONE','TWO')),
   constraint pk_eperson2 primary key (id)
@@ -1479,6 +1559,8 @@ create table eperson3 (
   suburb                        varchar(255),
   city                          varchar(255),
   status                        varchar(3),
+  jbean                         clob,
+  jraw                          clob,
   version                       bigint not null,
   constraint ck_eperson3_status check ( status in ('ONE','TWO')),
   constraint pk_eperson3 primary key (id)
@@ -1594,6 +1676,29 @@ create table esoft_del_user_esoft_del_role (
   constraint pk_esoft_del_user_esoft_del_role primary key (esoft_del_user_id,esoft_del_role_id)
 );
 
+create table esoft_del_x (
+  id                            uuid not null,
+  y_id                          bigint,
+  organization_id               bigint,
+  deleted                       boolean default false not null,
+  constraint uq_esoft_del_x_y_id unique (y_id),
+  constraint pk_esoft_del_x primary key (id)
+);
+
+create table esoft_del_y (
+  id                            bigint generated by default as identity not null,
+  organization_id               bigint,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_y primary key (id)
+);
+
+create table esoft_del_z (
+  id                            bigint generated by default as identity not null,
+  uuid                          uuid,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_z primary key (id)
+);
+
 create table esome_convert_type (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -2594,6 +2699,22 @@ create table mny_c (
   constraint pk_mny_c primary key (id)
 );
 
+create table mny_edge (
+  id                            integer generated by default as identity not null,
+  from_id                       integer,
+  to_id                         integer,
+  flags                         integer not null,
+  constraint uq_mny_edge_from_id_to_id unique (from_id,to_id),
+  constraint uq_mny_edge_to_id_from_id unique (to_id,from_id),
+  constraint pk_mny_edge primary key (id)
+);
+
+create table mny_node (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mny_node primary key (id)
+);
+
 create table mny_topic (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -2835,6 +2956,20 @@ create table om_basic_parent (
   constraint pk_om_basic_parent primary key (id)
 );
 
+create table om_bean_list_child (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_om_bean_list_child primary key (id)
+);
+
+create table om_bean_list_parent (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_om_bean_list_parent primary key (id)
+);
+
 create table om_ordered_detail (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -3418,6 +3553,15 @@ create table person_cache_info (
   constraint pk_person_cache_info primary key (person_id)
 );
 
+create table person_other (
+  id                            varchar(128) not null,
+  email                         varchar(255),
+  when_created                  timestamp not null,
+  when_modified                 timestamp not null,
+  version                       bigint not null,
+  constraint pk_person_other primary key (id)
+);
+
 create table persona (
   id                            bigint generated by default as identity not null,
   persona                       varchar(255),
@@ -3537,6 +3681,12 @@ create table rel_master (
   constraint pk_rel_master primary key (id)
 );
 
+create table app_config_re (
+  id                            integer generated by default as identity not null,
+  config_id                     integer,
+  constraint pk_app_config_re primary key (id)
+);
+
 create table resourcefile (
   id                            varchar(64) not null,
   parentresourcefileid          varchar(64),
@@ -3593,6 +3743,18 @@ create table section (
   constraint pk_section primary key (id)
 );
 
+create table self_many_many (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_self_many_many primary key (id)
+);
+
+create table self_many_bridge (
+  self_1_id                     bigint not null,
+  self_2_id                     bigint not null,
+  constraint pk_self_many_bridge primary key (self_1_id,self_2_id)
+);
+
 create table self_parent (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -3762,7 +3924,7 @@ create table tevent_many (
   id                            bigint generated by default as identity not null,
   description                   varchar(255),
   event_id                      bigint,
-  units                         integer not null,
+  my_units                      integer not null,
   amount                        double not null,
   version                       bigint not null,
   constraint pk_tevent_many primary key (id)
@@ -3890,6 +4052,16 @@ create table test_annotation_base_entity (
   null3                         varchar(255)
 );
 
+create table test_jakarta_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 (
   id                            bigint not null,
   wheel                         bigint,
@@ -4220,8 +4392,8 @@ create index ix_ecsm_values_host_id on ecsm_values (host_id);
 create index ix_order_referenced_parent_type on order_referenced_parent (type);
 create index ix_organization_node_kind on organization_node (kind);
 create index ano_3 on test_annotation_base_entity (direct);
-create index ano_1 on test_annotation_base_entity (direct);
-create index ano_2 on test_annotation_base_entity (direct);
+create index ano_1 on test_jakarta_annotation_base_entity (direct);
+create index ano_2 on test_jakarta_annotation_base_entity (direct);
 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;
 
@@ -4242,6 +4414,9 @@ alter table album add constraint fk_album_cover_id foreign key (cover_id) refere
 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_app_config_control_config_id on app_config_control (config_id);
+alter table app_config_control add constraint fk_app_config_control_config_id foreign key (config_id) references app_config (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;
 
@@ -4269,6 +4444,9 @@ 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_dmany_bsite_user_d on bsite_user_dmany (site_id,user_id);
+alter table bsite_user_dmany add constraint fk_bsite_user_dmany_bsite_user_d foreign key (site_id,user_id) references bsite_user_d (site_id,user_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;
 
@@ -4307,6 +4485,8 @@ alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_
 
 alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (id) on delete restrict on update restrict;
 
+alter table calcd_data add constraint fk_calcd_data_id foreign key (id) references calcd_input (id) on delete cascade 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;
 
@@ -4403,10 +4583,10 @@ alter table dc_detail add constraint fk_dc_detail_master_id foreign key (master_
 alter table defaults_model add constraint fk_defaults_model_id foreign key (id) references defaults_model_draft (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;
+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 restrict;
 
 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 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 restrict;
 
 alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id) on delete restrict on update restrict;
 
@@ -4497,6 +4677,14 @@ alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft
 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;
 
+alter table esoft_del_x add constraint fk_esoft_del_x_y_id foreign key (y_id) references esoft_del_y (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_x_organization_id on esoft_del_x (organization_id);
+alter table esoft_del_x add constraint fk_esoft_del_x_organization_id foreign key (organization_id) references esoft_del_z (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_y_organization_id on esoft_del_y (organization_id);
+alter table esoft_del_y add constraint fk_esoft_del_y_organization_id foreign key (organization_id) references esoft_del_z (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;
 
@@ -4737,6 +4925,12 @@ alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_i
 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_mny_edge_from_id on mny_edge (from_id);
+alter table mny_edge add constraint fk_mny_edge_from_id foreign key (from_id) references mny_node (id) on delete restrict on update restrict;
+
+create index ix_mny_edge_to_id on mny_edge (to_id);
+alter table mny_edge add constraint fk_mny_edge_to_id foreign key (to_id) references mny_node (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;
 
@@ -4791,6 +4985,9 @@ alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_r
 create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
 alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (id) on delete restrict on update restrict;
 
+create index ix_om_bean_list_child_parent_id on om_bean_list_child (parent_id);
+alter table om_bean_list_child add constraint fk_om_bean_list_child_parent_id foreign key (parent_id) references om_bean_list_parent (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;
 
@@ -4944,6 +5141,9 @@ alter table referenced_defaults_model_draft add constraint fk_referenced_default
 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_app_config_re_config_id on app_config_re (config_id);
+alter table app_config_re add constraint fk_app_config_re_config_id foreign key (config_id) references app_config (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;
 
@@ -4964,6 +5164,12 @@ alter table f_second add constraint fk_f_second_first foreign key (first) refere
 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;
 
+create index ix_self_many_bridge_self_many_many_1 on self_many_bridge (self_1_id);
+alter table self_many_bridge add constraint fk_self_many_bridge_self_many_many_1 foreign key (self_1_id) references self_many_many (id) on delete restrict on update restrict;
+
+create index ix_self_many_bridge_self_many_many_2 on self_many_bridge (self_2_id);
+alter table self_many_bridge add constraint fk_self_many_bridge_self_many_many_2 foreign key (self_2_id) references self_many_many (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;
 
diff --git a/ebean-core/src/test/ddl-review/h2-drop-all.sql b/ebean-core/src/test/ddl-review/h2-drop-all.sql
index 52ce28b38..195cc29c0 100644
--- a/ebean-core/src/test/ddl-review/h2-drop-all.sql
+++ b/ebean-core/src/test/ddl-review/h2-drop-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2021-02-12T03:32:14.253435800Z
+-- Generated by ebean unknown at 2021-08-20T21:43:22.648422335Z
 alter table bar drop constraint if exists fk_bar_foo_id;
 drop index if exists ix_bar_foo_id;
 
@@ -19,6 +19,9 @@ alter table album drop constraint if exists fk_album_cover_id;
 alter table animal drop constraint if exists fk_animal_shelter_id;
 drop index if exists ix_animal_shelter_id;
 
+alter table app_config_control drop constraint if exists fk_app_config_control_config_id;
+drop index if exists ix_app_config_control_config_id;
+
 alter table attribute drop constraint if exists fk_attribute_attribute_holder_id;
 drop index if exists ix_attribute_attribute_holder_id;
 
@@ -46,6 +49,9 @@ drop index if exists ix_bsite_user_c_site_uid;
 alter table 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 bsite_user_dmany drop constraint if exists fk_bsite_user_dmany_bsite_user_d;
+drop index if exists ix_bsite_user_dmany_bsite_user_d;
+
 alter table bsite_user_e drop constraint if exists fk_bsite_user_e_site_id;
 drop index if exists ix_bsite_user_e_site_id;
 
@@ -84,6 +90,8 @@ drop index if exists ix_coone_many_coone_id;
 
 alter table coroot drop constraint if exists fk_coroot_one_id;
 
+alter table calcd_data drop constraint if exists fk_calcd_data_id;
+
 alter table calculation_result drop constraint if exists fk_calculation_result_product_configuration_id;
 drop index if exists ix_calculation_result_product_configuration_id;
 
@@ -274,6 +282,14 @@ drop index if exists ix_esoft_del_user_esoft_del_role_esoft_del_user;
 alter table 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 esoft_del_x drop constraint if exists fk_esoft_del_x_y_id;
+
+alter table esoft_del_x drop constraint if exists fk_esoft_del_x_organization_id;
+drop index if exists ix_esoft_del_x_organization_id;
+
+alter table esoft_del_y drop constraint if exists fk_esoft_del_y_organization_id;
+drop index if exists ix_esoft_del_y_organization_id;
+
 alter table rawinherit_uncle drop constraint if exists fk_rawinherit_uncle_parent_id;
 drop index if exists ix_rawinherit_uncle_parent_id;
 
@@ -514,6 +530,12 @@ drop index if exists ix_mny_b_mny_c_mny_b;
 alter table 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 mny_edge drop constraint if exists fk_mny_edge_from_id;
+drop index if exists ix_mny_edge_from_id;
+
+alter table mny_edge drop constraint if exists fk_mny_edge_to_id;
+drop index if exists ix_mny_edge_to_id;
+
 alter table subtopics drop constraint if exists fk_subtopics_mny_topic_1;
 drop index if exists ix_subtopics_mny_topic_1;
 
@@ -568,6 +590,9 @@ drop index if exists ix_om_account_child_dbo_banana_rama_id;
 alter table om_basic_child drop constraint if exists fk_om_basic_child_parent_id;
 drop index if exists ix_om_basic_child_parent_id;
 
+alter table om_bean_list_child drop constraint if exists fk_om_bean_list_child_parent_id;
+drop index if exists ix_om_bean_list_child_parent_id;
+
 alter table om_ordered_detail drop constraint if exists fk_om_ordered_detail_master_id;
 drop index if exists ix_om_ordered_detail_master_id;
 
@@ -721,6 +746,9 @@ drop index if exists ix_referenced_defaults_model_draft_defaults_model_id;
 alter table rel_master drop constraint if exists fk_rel_master_detail_id;
 drop index if exists ix_rel_master_detail_id;
 
+alter table app_config_re drop constraint if exists fk_app_config_re_config_id;
+drop index if exists ix_app_config_re_config_id;
+
 alter table resourcefile drop constraint if exists fk_resourcefile_parentresourcefileid;
 drop index if exists ix_resourcefile_parentresourcefileid;
 
@@ -741,6 +769,12 @@ alter table f_second drop constraint if exists fk_f_second_first;
 alter table section drop constraint if exists fk_section_article_id;
 drop index if exists ix_section_article_id;
 
+alter table self_many_bridge drop constraint if exists fk_self_many_bridge_self_many_many_1;
+drop index if exists ix_self_many_bridge_self_many_many_1;
+
+alter table self_many_bridge drop constraint if exists fk_self_many_bridge_self_many_many_2;
+drop index if exists ix_self_many_bridge_self_many_many_2;
+
 alter table self_parent drop constraint if exists fk_self_parent_parent_id;
 drop index if exists ix_self_parent_parent_id;
 
@@ -893,6 +927,10 @@ drop table if exists animal;
 
 drop table if exists animal_shelter;
 
+drop table if exists app_config;
+
+drop table if exists app_config_control;
+
 drop table if exists article;
 
 drop table if exists attribute;
@@ -919,6 +957,8 @@ drop table if exists bsite_user_c;
 
 drop table if exists bsite_user_d;
 
+drop table if exists bsite_user_dmany;
+
 drop table if exists bsite_user_e;
 
 drop table if exists buser;
@@ -966,6 +1006,10 @@ drop table if exists coone_many;
 
 drop table if exists coroot;
 
+drop table if exists calcd_data;
+
+drop table if exists calcd_input;
+
 drop table if exists calculation_result;
 
 drop table if exists cao_bean;
@@ -1143,6 +1187,8 @@ drop table if exists ebasic_json_map_json_b;
 
 drop table if exists ebasic_json_map_varchar;
 
+drop table if exists ebasic_json_multi;
+
 drop table if exists ebasic_json_node;
 
 drop table if exists ebasic_json_node_blob;
@@ -1159,6 +1205,10 @@ drop table if exists e_basic_ndc;
 
 drop table if exists ebasic_no_sdchild;
 
+drop table if exists ebasic_old_value;
+
+drop table if exists ebasic_plain;
+
 drop table if exists ebasic_sdchild;
 
 drop table if exists ebasic_soft_delete;
@@ -1249,6 +1299,12 @@ drop table if exists esoft_del_user;
 
 drop table if exists esoft_del_user_esoft_del_role;
 
+drop table if exists esoft_del_x;
+
+drop table if exists esoft_del_y;
+
+drop table if exists esoft_del_z;
+
 drop table if exists esome_convert_type;
 
 drop table if exists esome_type;
@@ -1573,6 +1629,10 @@ drop table if exists mny_b_mny_c;
 
 drop table if exists mny_c;
 
+drop table if exists mny_edge;
+
+drop table if exists mny_node;
+
 drop table if exists mny_topic;
 
 drop table if exists subtopics;
@@ -1637,6 +1697,10 @@ drop table if exists om_basic_child;
 
 drop table if exists om_basic_parent;
 
+drop table if exists om_bean_list_child;
+
+drop table if exists om_bean_list_parent;
+
 drop table if exists om_ordered_detail;
 
 drop table if exists om_ordered_master;
@@ -1783,6 +1847,8 @@ drop table if exists person_cache_email;
 
 drop table if exists person_cache_info;
 
+drop table if exists person_other;
+
 drop table if exists persona;
 
 drop table if exists phones;
@@ -1815,6 +1881,8 @@ drop table if exists rel_detail;
 
 drop table if exists rel_master;
 
+drop table if exists app_config_re;
+
 drop table if exists resourcefile;
 
 drop table if exists mt_role;
@@ -1829,6 +1897,10 @@ drop table if exists f_second;
 
 drop table if exists section;
 
+drop table if exists self_many_many;
+
+drop table if exists self_many_bridge;
+
 drop table if exists self_parent;
 
 drop table if exists self_ref_customer;
@@ -1901,6 +1973,8 @@ drop table if exists mt_tenant;
 
 drop table if exists test_annotation_base_entity;
 
+drop table if exists test_jakarta_annotation_base_entity;
+
 drop table if exists tire;
 drop sequence if exists tire_seq;
 

From 09cb5da3d3b0b86cf35099aefe485bcab369c91f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 22 Aug 2021 15:55:08 +1200
Subject: [PATCH 429/447] #2326 - [ddl generator] Primary key constraint not
 generated for @IdClass

---
 .../build/ModelBuildPropertyVisitor.java      |  2 +-
 .../ModelBuild_compound_IdClassTest.java      | 63 +++++++++++++++++++
 .../tests/model/compositekeys/CKEmbId.java    | 53 ++++++++++++++++
 .../tests/model/compositekeys/CKSiteUser.java | 55 ++++++++++++++++
 .../ModelBuild_compound_IdClassTest/apply.sql |  8 +++
 5 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java
 create mode 100644 ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java
 create mode 100644 ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java
 create mode 100644 ebean-ddl-generator/src/test/resources/assert/ModelBuild_compound_IdClassTest/apply.sql

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index 6530611dd..73928a5d0 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -273,7 +273,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
     col.setDraftOnly(p.isDraftOnly());
     col.setHistoryExclude(p.isExcludedFromHistory());
 
-    if (p.isId()) {
+    if (p.isId() || p.isImportedPrimaryKey()) {
       col.setPrimaryKey(true);
       if (p.getBeanDescriptor().isUseIdGenerator()) {
         col.setIdentity(true);
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java
new file mode 100644
index 000000000..fa435937a
--- /dev/null
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java
@@ -0,0 +1,63 @@
+package io.ebeaninternal.dbmigration.model.build;
+
+
+import io.ebean.BaseTestCase;
+import io.ebean.DatabaseFactory;
+import io.ebean.config.DatabaseConfig;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
+import org.junit.Test;
+import org.tests.model.basic.CKeyAssoc;
+import org.tests.model.basic.CKeyDetail;
+import org.tests.model.basic.CKeyParent;
+import org.tests.model.basic.CKeyParentId;
+import org.tests.model.compositekeys.CKEmbId;
+import org.tests.model.compositekeys.CKSiteUser;
+
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ModelBuild_compound_IdClassTest extends BaseTestCase {
+
+  private SpiEbeanServer createServer() {
+    DatabaseConfig config = new DatabaseConfig();
+    config.setName("h2");
+    config.loadFromProperties();
+    config.setName("h2other");
+    config.setDdlGenerate(false);
+    config.setDdlRun(false);
+    config.setDdlExtra(false);
+    config.setDefaultServer(false);
+    config.setRegister(false);
+    config.addClass(CKSiteUser.class);
+    config.addClass(CKEmbId.class);
+    return (SpiEbeanServer) DatabaseFactory.create(config);
+  }
+
+  @Test
+  public void test() throws IOException {
+    SpiEbeanServer ebeanServer = createServer();
+    try {
+      CurrentModel currentModel = new CurrentModel(ebeanServer);
+      ModelContainer model = currentModel.read();
+
+      MTable parent = model.getTable("cksite_user");
+      assertThat(parent).isNotNull();
+      assertThat(parent.primaryKeyColumns()).hasSize(2);
+
+      String apply = Helper.asText(this, "/assert/ModelBuild_compound_IdClassTest/apply.sql");
+
+      String createDdl = currentModel.getCreateDdl();
+      assertThat(createDdl).startsWith("-- Generated by ebean").endsWith(apply);
+
+    } finally {
+      ebeanServer.shutdown();
+    }
+  }
+}
diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java
new file mode 100644
index 000000000..40610428e
--- /dev/null
+++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java
@@ -0,0 +1,53 @@
+package org.tests.model.compositekeys;
+
+import javax.persistence.Embeddable;
+import java.util.Objects;
+import java.util.UUID;
+
+@Embeddable
+public class CKEmbId {
+
+  private UUID siteId;
+  private UUID userId;
+
+  public CKEmbId(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;
+
+    CKEmbId that = (CKEmbId) 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/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java
new file mode 100644
index 000000000..50d7baf14
--- /dev/null
+++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java
@@ -0,0 +1,55 @@
+package org.tests.model.compositekeys;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Version;
+import java.util.UUID;
+
+@Entity
+@IdClass(CKEmbId.class)
+public class CKSiteUser {
+
+  @Id
+  private UUID siteId;
+
+  @Id
+  private UUID userId;
+
+  private String accessLevel;
+
+  @Version
+  private long version;
+
+  public CKSiteUser(String 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 long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+
+}
diff --git a/ebean-ddl-generator/src/test/resources/assert/ModelBuild_compound_IdClassTest/apply.sql b/ebean-ddl-generator/src/test/resources/assert/ModelBuild_compound_IdClassTest/apply.sql
new file mode 100644
index 000000000..3e887a590
--- /dev/null
+++ b/ebean-ddl-generator/src/test/resources/assert/ModelBuild_compound_IdClassTest/apply.sql
@@ -0,0 +1,8 @@
+create table cksite_user (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  access_level                  varchar(255),
+  version                       bigint not null,
+  constraint pk_cksite_user primary key (site_id,user_id)
+);
+

From eacc4b907d1bafcf56975d8eb3b7f1c673c58f86 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 22 Aug 2021 15:55:45 +1200
Subject: [PATCH 430/447] Update ddl review only - for #2326

---
 .../src/test/ddl-review/h2-create-all.sql     |   8 +-
 .../src/test/ddl-review/h2-drop-all.sql       |   2 +-
 .../test/ddl-review/sqlserver-create-all.sql  | 597 +++++++++++++++++-
 .../test/ddl-review/sqlserver-drop-all.sql    | 258 +++++++-
 4 files changed, 828 insertions(+), 37 deletions(-)

diff --git a/ebean-core/src/test/ddl-review/h2-create-all.sql b/ebean-core/src/test/ddl-review/h2-create-all.sql
index d6cc91a8f..ab1dff363 100644
--- a/ebean-core/src/test/ddl-review/h2-create-all.sql
+++ b/ebean-core/src/test/ddl-review/h2-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2021-08-20T21:43:22.648422335Z
+-- Generated by ebean unknown at 2021-08-22T03:33:37.079509Z
 create table asimple_bean (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -215,7 +215,8 @@ create table bsite_user_d (
   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))
+  constraint ck_bsite_user_d_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_d primary key (site_id,user_id)
 );
 
 create table bsite_user_dmany (
@@ -223,7 +224,8 @@ create table bsite_user_dmany (
   user_id                       uuid not null,
   name                          varchar(255) not null,
   many                          varchar(255),
-  version                       bigint not null
+  version                       bigint not null,
+  constraint pk_bsite_user_dmany primary key (site_id,user_id,name)
 );
 
 create table bsite_user_e (
diff --git a/ebean-core/src/test/ddl-review/h2-drop-all.sql b/ebean-core/src/test/ddl-review/h2-drop-all.sql
index 195cc29c0..bc3915d07 100644
--- a/ebean-core/src/test/ddl-review/h2-drop-all.sql
+++ b/ebean-core/src/test/ddl-review/h2-drop-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2021-08-20T21:43:22.648422335Z
+-- Generated by ebean unknown at 2021-08-22T03:33:37.079509Z
 alter table bar drop constraint if exists fk_bar_foo_id;
 drop index if exists ix_bar_foo_id;
 
diff --git a/ebean-core/src/test/ddl-review/sqlserver-create-all.sql b/ebean-core/src/test/ddl-review/sqlserver-create-all.sql
index 40e48e28e..554e79f2c 100644
--- a/ebean-core/src/test/ddl-review/sqlserver-create-all.sql
+++ b/ebean-core/src/test/ddl-review/sqlserver-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2020-03-04T08:21:26.827349Z
+-- Generated by ebean unknown at 2021-08-22T03:36:08.393487Z
 -- init script create procs
 -- Initial script to create stored procedures etc for sqlserver platform
 
@@ -226,6 +226,20 @@ create table animal_shelter (
 );
 create sequence animal_shelter_seq as bigint start with 1 increment by 50;
 
+create table app_config (
+  id                            integer not null,
+  constraint pk_app_config primary key (id)
+);
+create sequence app_config_seq as bigint start with 1 increment by 50;
+
+create table app_config_control (
+  id                            integer not null,
+  name                          nvarchar(255),
+  config_id                     integer,
+  constraint pk_app_config_control primary key (id)
+);
+create sequence app_config_control_seq as bigint start with 1 increment by 50;
+
 create table article (
   id                            integer not null,
   name                          nvarchar(255),
@@ -334,7 +348,17 @@ create table bsite_user_d (
   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))
+  constraint ck_bsite_user_d_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_d primary key (site_id,user_id)
+);
+
+create table bsite_user_dmany (
+  site_id                       uniqueidentifier not null,
+  user_id                       uniqueidentifier not null,
+  name                          nvarchar(255) not null,
+  many                          nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_bsite_user_dmany primary key (site_id,user_id,name)
 );
 
 create table bsite_user_e (
@@ -446,6 +470,31 @@ create table cepproduct_category (
   priority                      integer
 );
 
+create table ciaddress (
+  id                            numeric(19) not null,
+  street_id                     numeric(19),
+  constraint pk_ciaddress primary key (id)
+);
+create sequence ciaddress_seq as bigint start with 1 increment by 50;
+
+create table cicustomer_parent (
+  dtype                         integer not null,
+  id                            numeric(19) not null,
+  address_id                    numeric(19),
+  notes                         nvarchar(255),
+  constraint pk_cicustomer_parent primary key (id)
+);
+create sequence cicustomer_parent_seq as bigint start with 1 increment by 50;
+
+create table cistreet_parent (
+  dtype                         integer not null,
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  num                           nvarchar(255),
+  constraint pk_cistreet_parent primary key (id)
+);
+create sequence cistreet_parent_seq as bigint start with 1 increment by 50;
+
 create table cinh_ref (
   id                            integer not null,
   ref_id                        integer,
@@ -520,6 +569,20 @@ create table coroot (
 create unique nonclustered index uq_coroot_one_id on coroot(one_id) where one_id is not null;
 create sequence coroot_seq as bigint start with 1 increment by 50;
 
+create table calcd_data (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_calcd_data primary key (id)
+);
+create sequence calcd_data_seq as bigint start with 1 increment by 50;
+
+create table calcd_input (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_calcd_input primary key (id)
+);
+create sequence calcd_input_seq as bigint start with 1 increment by 50;
+
 create table calculation_result (
   id                            integer not null,
   charge                        float(32) not null,
@@ -616,6 +679,14 @@ create table child_person (
 );
 create sequence child_person_seq as bigint start with 1 increment by 50;
 
+create table child_with_cache (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  address                       nvarchar(255),
+  constraint pk_child_with_cache primary key (id)
+);
+create sequence child_with_cache_seq as bigint start with 1 increment by 50;
+
 create table cke_client (
   cod_cpny                      integer not null,
   cod_client                    nvarchar(100) not null,
@@ -804,7 +875,7 @@ create table d_machine_aux_use (
   name                          nvarchar(255),
   edate                         date,
   use_secs                      numeric(19) not null,
-  fuel                          numeric(28),
+  fuel                          numeric(16,3),
   version                       numeric(19) not null,
   constraint pk_d_machine_aux_use primary key (id)
 );
@@ -816,8 +887,8 @@ create table d_machine_stats (
   edate                         date,
   total_kms                     numeric(19) not null,
   hours                         numeric(19) not null,
-  rate                          numeric(28),
-  cost                          numeric(28),
+  rate                          numeric(16,3),
+  cost                          numeric(16,3),
   version                       numeric(19) not null,
   constraint pk_d_machine_stats primary key (id)
 );
@@ -829,7 +900,7 @@ create table d_machine_use (
   edate                         date,
   distance_kms                  numeric(19) not null,
   time_secs                     numeric(19) not null,
-  fuel                          numeric(28),
+  fuel                          numeric(9,3),
   version                       numeric(19) not null,
   constraint pk_d_machine_use primary key (id)
 );
@@ -847,7 +918,7 @@ create table dperson (
   id                            numeric(19) not null,
   first_name                    nvarchar(255),
   last_name                     nvarchar(255),
-  salary                        numeric(28),
+  salary                        numeric(16,3),
   constraint pk_dperson primary key (id)
 );
 create sequence dperson_seq as bigint start with 1 increment by 50;
@@ -902,6 +973,18 @@ create table dc_master (
 );
 create sequence dc_master_seq as bigint start with 1 increment by 50;
 
+create table defaults_model (
+  id                            integer not null,
+  constraint pk_defaults_model primary key (id)
+);
+create sequence defaults_model_seq as bigint start with 1 increment by 50;
+
+create table defaults_model_draft (
+  id                            integer not null,
+  constraint pk_defaults_model_draft primary key (id)
+);
+create sequence defaults_model_draft_seq as bigint start with 1 increment by 50;
+
 create table dfk_cascade (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -1077,6 +1160,7 @@ create table earray_set_bean (
   uids                          varchar(1000),
   other_ids                     varchar(1000),
   doubs                         varchar(1000),
+  status                        varchar(1000),
   version                       numeric(19) not null,
   constraint pk_earray_set_bean primary key (id)
 );
@@ -1098,6 +1182,7 @@ create table ebasic_change_log (
   name                          nvarchar(20),
   short_description             nvarchar(50),
   long_description              nvarchar(100),
+  plain_bean                    nvarchar(500),
   who_created                   nvarchar(255) not null,
   who_modified                  nvarchar(255) not null,
   when_created                  datetime2 not null,
@@ -1139,7 +1224,7 @@ create table e_basicenc (
   id                            integer not null,
   name                          nvarchar(255),
   description                   varbinary(80),
-  dob                           varbinary(20),
+  dob                           varbinary(80),
   status                        varbinary(20),
   last_update                   datetime2,
   constraint pk_e_basicenc primary key (id)
@@ -1228,10 +1313,21 @@ create table ebasic_json_jackson2 (
 );
 create sequence ebasic_json_jackson2_seq as bigint start with 1 increment by 50;
 
+create table ebasic_json_jackson3 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  plain_value                   nvarchar(500),
+  plain_value2                  nvarchar(500),
+  plain_value3                  nvarchar(500),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_jackson3 primary key (id)
+);
+create sequence ebasic_json_jackson3_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),
+  beans                         nvarchar(700),
   bean_list                     nvarchar(max),
   bean_map                      nvarchar(700),
   plain_bean                    nvarchar(500),
@@ -1297,6 +1393,17 @@ create table ebasic_json_map_varchar (
 );
 create sequence ebasic_json_map_varchar_seq as bigint start with 1 increment by 50;
 
+create table ebasic_json_multi (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  plain_value1                  nvarchar(500),
+  plain_value2                  nvarchar(500),
+  plain_value3                  nvarchar(500),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_json_multi primary key (id)
+);
+create sequence ebasic_json_multi_seq as bigint start with 1 increment by 50;
+
 create table ebasic_json_node (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -1341,6 +1448,13 @@ create table ebasic_json_unmapped (
 );
 create sequence ebasic_json_unmapped_seq as bigint start with 1 increment by 50;
 
+create table e_basic_log (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_e_basic_log primary key (id)
+);
+create sequence e_basic_log_seq as bigint start with 1 increment by 50;
+
 create table e_basic_ndc (
   id                            integer not null,
   name                          nvarchar(255),
@@ -1358,6 +1472,34 @@ create table ebasic_no_sdchild (
 );
 create sequence ebasic_no_sdchild_seq as bigint start with 1 increment by 50;
 
+create table ebasic_old_value (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  string_set                    nvarchar(max),
+  long_set                      nvarchar(max),
+  int_set                       nvarchar(max),
+  string_list                   nvarchar(max),
+  long_list                     nvarchar(max),
+  int_list                      nvarchar(max),
+  object_map                    nvarchar(max),
+  long_map                      nvarchar(max),
+  int_map                       nvarchar(max),
+  json_node                     nvarchar(max),
+  string_arr                    varchar(1000),
+  constraint pk_ebasic_old_value primary key (id)
+);
+create sequence ebasic_old_value_seq as bigint start with 1 increment by 50;
+
+create table ebasic_plain (
+  id                            numeric(19) not null,
+  attr                          nvarchar(255),
+  plain_bean                    nvarchar(500),
+  plain_bean2                   nvarchar(500),
+  version                       numeric(19) not null,
+  constraint pk_ebasic_plain primary key (id)
+);
+create sequence ebasic_plain_seq as bigint start with 1 increment by 50;
+
 create table ebasic_sdchild (
   id                            numeric(19) not null,
   owner_id                      numeric(19) not null,
@@ -1407,6 +1549,15 @@ create table e_basic_with_ex (
 );
 create sequence e_basic_with_ex_seq as bigint start with 1 increment by 50;
 
+create table e_basic_withlog (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  deleted                       integer default 0 not null,
+  version                       numeric(19) not null,
+  constraint pk_e_basic_withlog primary key (id)
+);
+create sequence e_basic_withlog_seq as bigint start with 1 increment by 50;
+
 create table e_basicverucon (
   id                            integer not null,
   name                          nvarchar(127),
@@ -1540,10 +1691,14 @@ create table einvoice (
   ship_suburb                   nvarchar(255),
   ship_city                     nvarchar(255),
   ship_status                   nvarchar(3),
+  ship_jbean                    nvarchar(max),
+  ship_jraw                     nvarchar(max),
   bill_street                   nvarchar(255),
   bill_suburb                   nvarchar(255),
   bill_city                     nvarchar(255),
   bill_status                   nvarchar(3),
+  bill_jbean                    nvarchar(max),
+  bill_jraw                     nvarchar(max),
   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')),
@@ -1628,12 +1783,45 @@ create table eperson (
   suburb                        nvarchar(255),
   addr_city                     nvarchar(255),
   addr_status                   nvarchar(3),
+  addr_jbean                    nvarchar(max),
+  jraw                          nvarchar(max),
   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 eperson2 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  notes                         nvarchar(255),
+  street                        nvarchar(10),
+  suburb                        nvarchar(100),
+  city                          nvarchar(255),
+  status                        nvarchar(3),
+  jbean                         nvarchar(max),
+  jraw                          nvarchar(max),
+  version                       numeric(19) not null,
+  constraint ck_eperson2_status check ( status in ('ONE','TWO')),
+  constraint pk_eperson2 primary key (id)
+);
+create sequence eperson2_seq as bigint start with 1 increment by 50;
+
+create table eperson3 (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  street                        nvarchar(255),
+  suburb                        nvarchar(255),
+  city                          nvarchar(255),
+  status                        nvarchar(3),
+  jbean                         nvarchar(max),
+  jraw                          nvarchar(max),
+  version                       numeric(19) not null,
+  constraint ck_eperson3_status check ( status in ('ONE','TWO')),
+  constraint pk_eperson3 primary key (id)
+);
+create sequence eperson3_seq as bigint start with 1 increment by 50;
+
 create table e_person_online (
   id                            numeric(19) not null,
   email                         nvarchar(127),
@@ -1754,10 +1942,35 @@ create table esoft_del_user_esoft_del_role (
   constraint pk_esoft_del_user_esoft_del_role primary key (esoft_del_user_id,esoft_del_role_id)
 );
 
+create table esoft_del_x (
+  id                            uniqueidentifier not null,
+  y_id                          numeric(19),
+  organization_id               numeric(19),
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_x primary key (id)
+);
+create unique nonclustered index uq_esoft_del_x_y_id on esoft_del_x(y_id) where y_id is not null;
+
+create table esoft_del_y (
+  id                            numeric(19) not null,
+  organization_id               numeric(19),
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_y primary key (id)
+);
+create sequence esoft_del_y_seq as bigint start with 1 increment by 50;
+
+create table esoft_del_z (
+  id                            numeric(19) not null,
+  uuid                          uniqueidentifier,
+  deleted                       integer default 0 not null,
+  constraint pk_esoft_del_z primary key (id)
+);
+create sequence esoft_del_z_seq as bigint start with 1 increment by 50;
+
 create table esome_convert_type (
   id                            numeric(19) not null,
   name                          nvarchar(255),
-  money                         numeric(28),
+  money                         numeric(16,3),
   constraint pk_esome_convert_type primary key (id)
 );
 create sequence esome_convert_type_seq as bigint start with 1 increment by 50;
@@ -2075,14 +2288,7 @@ create table gen_key_sequence (
   description                   nvarchar(255),
   constraint pk_gen_key_sequence primary key (id)
 );
-create sequence gen_key_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 sequence SEQ_NAME as bigint start with 1 increment by 50;
 
 create table grand_parent_person (
   identifier                    integer not null,
@@ -2115,6 +2321,15 @@ create table c_group (
 );
 create sequence c_group_seq as bigint start with 1 increment by 50;
 
+create table hembi_bean (
+  part                          numeric(19) not null,
+  brand                         nvarchar(20) not null,
+  name                          nvarchar(255),
+  description                   nvarchar(255),
+  version                       numeric(19) not null,
+  constraint pk_hembi_bean primary key (part,brand)
+);
+
 create table he_doc (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -2497,6 +2712,31 @@ create table looney (
 );
 create sequence looney_seq as bigint start with 1 increment by 50;
 
+create table m2_mcache_child (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_m2_mcache_child primary key (id)
+);
+create sequence m2_mcache_child_seq as bigint start with 1 increment by 50;
+
+create table m2_mcache_master (
+  id                            integer not null,
+  constraint pk_m2_mcache_master primary key (id)
+);
+create sequence m2_mcache_master_seq as bigint start with 1 increment by 50;
+
+create table m2mcache_set1 (
+  m2_mcache_master_id           integer not null,
+  m2_mcache_child_id            integer not null,
+  constraint pk_m2mcache_set1 primary key (m2_mcache_master_id,m2_mcache_child_id)
+);
+
+create table m2mcache_set2 (
+  m2_mcache_master_id           integer not null,
+  m2_mcache_child_id            integer not null,
+  constraint pk_m2mcache_set2 primary key (m2_mcache_master_id,m2_mcache_child_id)
+);
+
 create table maddress (
   id                            uniqueidentifier not null,
   street                        nvarchar(255),
@@ -2812,6 +3052,24 @@ create table mny_c (
 );
 create sequence mny_c_seq as bigint start with 1 increment by 50;
 
+create table mny_edge (
+  id                            integer not null,
+  from_id                       integer,
+  to_id                         integer,
+  flags                         integer not null,
+  constraint pk_mny_edge primary key (id)
+);
+create unique nonclustered index uq_mny_edge_from_id_to_id on mny_edge(from_id,to_id) where from_id is not null and to_id is not null;
+create unique nonclustered index uq_mny_edge_to_id_from_id on mny_edge(to_id,from_id) where to_id is not null and from_id is not null;
+create sequence mny_edge_seq as bigint start with 1 increment by 50;
+
+create table mny_node (
+  id                            integer not null,
+  name                          nvarchar(255),
+  constraint pk_mny_node primary key (id)
+);
+create sequence mny_node_seq as bigint start with 1 increment by 50;
+
 create table mny_topic (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -3076,6 +3334,22 @@ create table om_basic_parent (
 );
 create sequence om_basic_parent_seq as bigint start with 1 increment by 50;
 
+create table om_bean_list_child (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  parent_id                     numeric(19),
+  version                       numeric(19) not null,
+  constraint pk_om_bean_list_child primary key (id)
+);
+create sequence om_bean_list_child_seq as bigint start with 1 increment by 50;
+
+create table om_bean_list_parent (
+  id                            numeric(19) not null,
+  version                       numeric(19) not null,
+  constraint pk_om_bean_list_parent primary key (id)
+);
+create sequence om_bean_list_parent_seq as bigint start with 1 increment by 50;
+
 create table om_ordered_detail (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -3094,6 +3368,26 @@ create table om_ordered_master (
 );
 create sequence om_ordered_master_seq as bigint start with 1 increment by 50;
 
+create table oml_bar (
+  id                            numeric(19) not null,
+  constraint pk_oml_bar primary key (id)
+);
+create sequence oml_bar_seq as bigint start with 1 increment by 50;
+
+create table oml_baz (
+  id                            numeric(19) not null,
+  foo_id                        numeric(19) not null,
+  constraint pk_oml_baz primary key (id)
+);
+create sequence oml_baz_seq as bigint start with 1 increment by 50;
+
+create table oml_foo (
+  id                            numeric(19) not null,
+  bar_id                        numeric(19) not null,
+  constraint pk_oml_foo primary key (id)
+);
+create sequence oml_foo_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)
@@ -3136,10 +3430,33 @@ create table s_order_items (
   product_variant_uuid          nvarchar(255),
   order_uuid                    nvarchar(40),
   quantity                      integer not null,
-  amount                        numeric(28),
+  amount                        numeric(16,3),
   constraint pk_s_order_items primary key (uuid)
 );
 
+create table order_master (
+  id                            numeric(19) not null,
+  constraint pk_order_master primary key (id)
+);
+create sequence order_master_seq as bigint start with 1 increment by 50;
+
+create table order_master_inheritance (
+  id                            integer not null,
+  constraint pk_order_master_inheritance primary key (id)
+);
+create sequence order_master_inheritance_seq as bigint start with 1 increment by 50;
+
+create table order_referenced_parent (
+  type                          nvarchar(31) not null,
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  child_name                    nvarchar(255),
+  master_id                     numeric(19),
+  sort_order                    integer,
+  constraint pk_order_referenced_parent primary key (id)
+);
+create sequence order_referenced_parent_seq as bigint start with 1 increment by 50;
+
 create table or_order_ship (
   id                            integer not null,
   order_id                      integer,
@@ -3151,6 +3468,27 @@ create table or_order_ship (
 );
 create sequence or_order_ship_seq as bigint start with 1 increment by 50;
 
+create table order_toy (
+  id                            integer not null,
+  title                         nvarchar(255),
+  child_id                      numeric(19),
+  sort_order                    integer,
+  constraint pk_order_toy primary key (id)
+);
+create sequence order_toy_seq as bigint start with 1 increment by 50;
+
+create table ordered_parent (
+  dtype                         nvarchar(31) not null,
+  id                            integer not null,
+  order_master_inheritance_id   integer not null,
+  common_name                   nvarchar(255),
+  sort_order                    integer,
+  ordered_aname                 nvarchar(255),
+  ordered_bname                 nvarchar(255),
+  constraint pk_ordered_parent primary key (id)
+);
+create sequence ordered_parent_seq as bigint start with 1 increment by 50;
+
 create table organisation (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -3493,6 +3831,21 @@ create table e_save_test_c (
 );
 create sequence e_save_test_c_seq as bigint start with 1 increment by 50;
 
+create table parent_a (
+  id                            numeric(19) not null,
+  child_id                      numeric(19),
+  name                          nvarchar(255),
+  constraint pk_parent_a primary key (id)
+);
+create sequence parent_a_seq as bigint start with 1 increment by 50;
+
+create table parent_b (
+  id                            numeric(19) not null,
+  child_id                      numeric(19),
+  constraint pk_parent_b primary key (id)
+);
+create sequence parent_b_seq as bigint start with 1 increment by 50;
+
 create table parent_person (
   identifier                    integer not null,
   name                          nvarchar(255),
@@ -3636,6 +3989,25 @@ create table person_cache_info (
   constraint pk_person_cache_info primary key (person_id)
 );
 
+create table person_other (
+  id                            nvarchar(128) not null,
+  email                         nvarchar(255),
+  when_created                  datetime2 not null,
+  when_modified                 datetime2 not null,
+  version                       numeric(19) not null,
+  constraint pk_person_other primary key (id)
+);
+
+create table persona (
+  id                            numeric(19) not null,
+  persona                       nvarchar(255),
+  person_oid                    numeric(19),
+  version                       integer not null,
+  constraint pk_persona primary key (id)
+);
+create unique nonclustered index uq_persona_person_oid on persona(person_oid) where person_oid is not null;
+create sequence persona_seq as bigint start with 1 increment by 50;
+
 create table phones (
   id                            numeric(19) not null,
   phone_number                  nvarchar(7) not null,
@@ -3708,6 +4080,22 @@ create table r_orders (
   constraint pk_r_orders primary key (company,order_number)
 );
 
+create table referenced_defaults_model (
+  id                            integer not null,
+  defaults_model_id             integer not null,
+  name                          nvarchar(255),
+  constraint pk_referenced_defaults_model primary key (id)
+);
+create sequence referenced_defaults_model_seq as bigint start with 1 increment by 50;
+
+create table referenced_defaults_model_draft (
+  id                            integer not null,
+  defaults_model_id             integer not null,
+  name                          nvarchar(255),
+  constraint pk_referenced_defaults_model_draft primary key (id)
+);
+create sequence referenced_defaults_model_draft_seq as bigint start with 1 increment by 50;
+
 create table referencing_bean (
   id                            uniqueidentifier not null,
   constraint pk_referencing_bean primary key (id)
@@ -3738,6 +4126,13 @@ create table rel_master (
 );
 create sequence rel_master_seq as bigint start with 1 increment by 50;
 
+create table app_config_re (
+  id                            integer not null,
+  config_id                     integer,
+  constraint pk_app_config_re primary key (id)
+);
+create sequence app_config_re_seq as bigint start with 1 increment by 50;
+
 create table resourcefile (
   id                            nvarchar(64) not null,
   parentresourcefileid          nvarchar(64),
@@ -3797,6 +4192,19 @@ create table section (
 );
 create sequence section_seq as bigint start with 1 increment by 50;
 
+create table self_many_many (
+  id                            numeric(19) not null,
+  name                          nvarchar(255),
+  constraint pk_self_many_many primary key (id)
+);
+create sequence self_many_many_seq as bigint start with 1 increment by 50;
+
+create table self_many_bridge (
+  self_1_id                     numeric(19) not null,
+  self_2_id                     numeric(19) not null,
+  constraint pk_self_many_bridge primary key (self_1_id,self_2_id)
+);
+
 create table self_parent (
   id                            numeric(19) not null,
   name                          nvarchar(255),
@@ -3964,6 +4372,7 @@ 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,
+  deleted                       integer default 0 not null,
   truckload                     numeric(19),
   constraint pk_tcar primary key (plate_no)
 );
@@ -3980,7 +4389,7 @@ create table tevent_many (
   id                            numeric(19) not null,
   description                   nvarchar(255),
   event_id                      numeric(19),
-  units                         integer not null,
+  my_units                      integer not null,
   amount                        float(32) not null,
   version                       numeric(19) not null,
   constraint pk_tevent_many primary key (id)
@@ -4043,7 +4452,7 @@ create table t_detail_with_other_namexxxyy (
   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_detail_with_other_namexxxyy_seq as bigint start with 1 increment by 50;
+create sequence t_atable_detail_seq as bigint start with 1 increment by 50;
 
 create table t_atable_thatisrelatively (
   id                            integer not null,
@@ -4052,7 +4461,7 @@ create table t_atable_thatisrelatively (
   active                        integer default 0 not null,
   constraint pk_t_atable_thatisrelatively primary key (id)
 );
-create sequence t_atable_thatisrelatively_seq as bigint start with 1 increment by 50;
+create sequence t_atable_master_seq as bigint start with 1 increment by 50;
 
 create table ttruck_holder (
   id                            numeric(19) not null,
@@ -4118,6 +4527,16 @@ create table test_annotation_base_entity (
   null3                         nvarchar(255)
 );
 
+create table test_jakarta_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),
@@ -4349,14 +4768,42 @@ create table vehicle_lease (
   active_start                  date,
   active_end                    date,
   version                       numeric(19) not null,
-  bond                          numeric(28),
+  bond                          numeric(16,3),
   min_duration                  integer not null,
-  day_rate                      numeric(28),
+  day_rate                      numeric(16,3),
   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 version_child (
+  id                            integer not null,
+  name                          nvarchar(255),
+  parent_id                     integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_child primary key (id)
+);
+create sequence version_child_seq as bigint start with 1 increment by 50;
+
+create table version_parent (
+  id                            integer not null,
+  name                          nvarchar(255),
+  version                       integer not null,
+  constraint pk_version_parent primary key (id)
+);
+create sequence version_parent_seq as bigint start with 1 increment by 50;
+
+create table version_toy (
+  id                            integer not null,
+  name                          nvarchar(255),
+  child_id                      integer,
+  version                       integer not null,
+  position                      integer,
+  constraint pk_version_toy primary key (id)
+);
+create sequence version_toy_seq as bigint start with 1 increment by 50;
+
 create table warehouses (
   id                            integer not null,
   officezoneid                  integer,
@@ -4442,7 +4889,9 @@ 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_ecsm_values_host_id on ecsm_values (host_id);
+create index ix_order_referenced_parent_type on order_referenced_parent (type);
 create index ix_organization_node_kind on organization_node (kind);
+create index ano_3 on test_annotation_base_entity (direct);
 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);
 
@@ -4463,6 +4912,9 @@ alter table album add constraint fk_album_cover_id foreign key (cover_id) refere
 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_app_config_control_config_id on app_config_control (config_id);
+alter table app_config_control add constraint fk_app_config_control_config_id foreign key (config_id) references app_config (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);
 
@@ -4490,6 +4942,9 @@ 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_dmany_bsite_user_d on bsite_user_dmany (site_id,user_id);
+alter table bsite_user_dmany add constraint fk_bsite_user_dmany_bsite_user_d foreign key (site_id,user_id) references bsite_user_d (site_id,user_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);
 
@@ -4508,6 +4963,12 @@ alter table cepproduct_category add constraint fk_cepproduct_category_category_i
 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_ciaddress_street_id on ciaddress (street_id);
+alter table ciaddress add constraint fk_ciaddress_street_id foreign key (street_id) references cistreet_parent (id);
+
+create index ix_cicustomer_parent_address_id on cicustomer_parent (address_id);
+alter table cicustomer_parent add constraint fk_cicustomer_parent_address_id foreign key (address_id) references ciaddress (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);
 
@@ -4522,6 +4983,8 @@ alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_
 
 alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (id);
 
+alter table calcd_data add constraint fk_calcd_data_id foreign key (id) references calcd_input (id) on delete cascade;
+
 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);
 
@@ -4615,11 +5078,13 @@ alter table drot_drol add constraint fk_drot_drol_drol foreign key (drol_id) ref
 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);
 
+alter table defaults_model add constraint fk_defaults_model_id foreign key (id) references defaults_model_draft (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;
+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_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 dfk_set_null add constraint fk_dfk_set_null_one_id foreign key (one_id) references dfk_one (id) on delete set null;
 
 alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id);
 
@@ -4710,6 +5175,14 @@ alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft
 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);
 
+alter table esoft_del_x add constraint fk_esoft_del_x_y_id foreign key (y_id) references esoft_del_y (id);
+
+create index ix_esoft_del_x_organization_id on esoft_del_x (organization_id);
+alter table esoft_del_x add constraint fk_esoft_del_x_organization_id foreign key (organization_id) references esoft_del_z (id);
+
+create index ix_esoft_del_y_organization_id on esoft_del_y (organization_id);
+alter table esoft_del_y add constraint fk_esoft_del_y_organization_id foreign key (organization_id) references esoft_del_z (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);
 
@@ -4853,6 +5326,18 @@ alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_at
 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_m2mcache_set1_m2_mcache_master on m2mcache_set1 (m2_mcache_master_id);
+alter table m2mcache_set1 add constraint fk_m2mcache_set1_m2_mcache_master foreign key (m2_mcache_master_id) references m2_mcache_master (id);
+
+create index ix_m2mcache_set1_m2_mcache_child on m2mcache_set1 (m2_mcache_child_id);
+alter table m2mcache_set1 add constraint fk_m2mcache_set1_m2_mcache_child foreign key (m2_mcache_child_id) references m2_mcache_child (id);
+
+create index ix_m2mcache_set2_m2_mcache_master on m2mcache_set2 (m2_mcache_master_id);
+alter table m2mcache_set2 add constraint fk_m2mcache_set2_m2_mcache_master foreign key (m2_mcache_master_id) references m2_mcache_master (id);
+
+create index ix_m2mcache_set2_m2_mcache_child on m2mcache_set2 (m2_mcache_child_id);
+alter table m2mcache_set2 add constraint fk_m2mcache_set2_m2_mcache_child foreign key (m2_mcache_child_id) references m2_mcache_child (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);
 
@@ -4938,6 +5423,12 @@ alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_i
 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_mny_edge_from_id on mny_edge (from_id);
+alter table mny_edge add constraint fk_mny_edge_from_id foreign key (from_id) references mny_node (id);
+
+create index ix_mny_edge_to_id on mny_edge (to_id);
+alter table mny_edge add constraint fk_mny_edge_to_id foreign key (to_id) references mny_node (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);
 
@@ -4992,9 +5483,18 @@ alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_r
 create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
 alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (id);
 
+create index ix_om_bean_list_child_parent_id on om_bean_list_child (parent_id);
+alter table om_bean_list_child add constraint fk_om_bean_list_child_parent_id foreign key (parent_id) references om_bean_list_parent (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_oml_baz_foo_id on oml_baz (foo_id);
+alter table oml_baz add constraint fk_oml_baz_foo_id foreign key (foo_id) references oml_foo (id);
+
+create index ix_oml_foo_bar_id on oml_foo (bar_id);
+alter table oml_foo add constraint fk_oml_foo_bar_id foreign key (bar_id) references oml_bar (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);
 
@@ -5007,9 +5507,18 @@ alter table o_order_detail add constraint fk_o_order_detail_product_id foreign k
 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_order_referenced_parent_master_id on order_referenced_parent (master_id);
+alter table order_referenced_parent add constraint fk_order_referenced_parent_master_id foreign key (master_id) references order_master (id);
+
 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);
 
+create index ix_order_toy_child_id on order_toy (child_id);
+alter table order_toy add constraint fk_order_toy_child_id foreign key (child_id) references order_referenced_parent (id);
+
+create index ix_ordered_parent_order_master_inheritance_id on ordered_parent (order_master_inheritance_id);
+alter table ordered_parent add constraint fk_ordered_parent_order_master_inheritance_id foreign key (order_master_inheritance_id) references order_master_inheritance (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);
@@ -5060,6 +5569,12 @@ alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_paren
 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_a_child_id on parent_a (child_id);
+alter table parent_a add constraint fk_parent_a_child_id foreign key (child_id) references child_with_cache (id);
+
+create index ix_parent_b_child_id on parent_b (child_id);
+alter table parent_b add constraint fk_parent_b_child_id foreign key (child_id) references child_with_cache (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);
 
@@ -5093,6 +5608,8 @@ alter table person add constraint fk_person_default_address_oid foreign key (def
 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);
 
+alter table persona add constraint fk_persona_person_oid foreign key (person_oid) references person (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);
 
@@ -5111,9 +5628,20 @@ 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);
 
+alter table referenced_defaults_model add constraint fk_referenced_defaults_model_id foreign key (id) references referenced_defaults_model_draft (id);
+
+create index ix_referenced_defaults_model_defaults_model_id on referenced_defaults_model (defaults_model_id);
+alter table referenced_defaults_model add constraint fk_referenced_defaults_model_defaults_model_id foreign key (defaults_model_id) references defaults_model (id);
+
+create index ix_referenced_defaults_model_draft_defaults_model_id on referenced_defaults_model_draft (defaults_model_id);
+alter table referenced_defaults_model_draft add constraint fk_referenced_defaults_model_draft_defaults_model_id foreign key (defaults_model_id) references defaults_model_draft (id);
+
 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_app_config_re_config_id on app_config_re (config_id);
+alter table app_config_re add constraint fk_app_config_re_config_id foreign key (config_id) references app_config (id);
+
 create index ix_resourcefile_parentresourcefileid on resourcefile (parentresourcefileid);
 alter table resourcefile add constraint fk_resourcefile_parentresourcefileid foreign key (parentresourcefileid) references resourcefile (id);
 
@@ -5134,6 +5662,12 @@ alter table f_second add constraint fk_f_second_first foreign key (first) refere
 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_many_bridge_self_many_many_1 on self_many_bridge (self_1_id);
+alter table self_many_bridge add constraint fk_self_many_bridge_self_many_many_1 foreign key (self_1_id) references self_many_many (id);
+
+create index ix_self_many_bridge_self_many_many_2 on self_many_bridge (self_2_id);
+alter table self_many_bridge add constraint fk_self_many_bridge_self_many_many_2 foreign key (self_2_id) references self_many_many (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);
 
@@ -5232,6 +5766,12 @@ alter table vehicle_driver add constraint fk_vehicle_driver_vehicle_id foreign k
 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_version_child_parent_id on version_child (parent_id);
+alter table version_child add constraint fk_version_child_parent_id foreign key (parent_id) references version_parent (id);
+
+create index ix_version_toy_child_id on version_toy (child_id);
+alter table version_toy add constraint fk_version_toy_child_id foreign key (child_id) references version_child (id);
+
 create index ix_warehouses_officezoneid on warehouses (officezoneid);
 alter table warehouses add constraint fk_warehouses_officezoneid foreign key (officezoneid) references zones (id);
 
@@ -5256,6 +5796,11 @@ alter table g_who_props_otm add constraint fk_g_who_props_otm_who_modified_id fo
 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 hembi_bean
+    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 hembi_bean set (system_versioning = on (history_table=dbo.hembi_bean_history));
 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',
diff --git a/ebean-core/src/test/ddl-review/sqlserver-drop-all.sql b/ebean-core/src/test/ddl-review/sqlserver-drop-all.sql
index 867ef2963..16d8b49fd 100644
--- a/ebean-core/src/test/ddl-review/sqlserver-drop-all.sql
+++ b/ebean-core/src/test/ddl-review/sqlserver-drop-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2020-03-04T08:21:26.827349Z
+-- Generated by ebean unknown at 2021-08-22T03:36:08.393487Z
 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;
 
@@ -20,6 +20,9 @@ IF OBJECT_ID('fk_album_cover_id', 'F') IS NOT NULL alter table album drop constr
 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_app_config_control_config_id', 'F') IS NOT NULL alter table app_config_control drop constraint fk_app_config_control_config_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('app_config_control','U') AND name = 'ix_app_config_control_config_id') drop index ix_app_config_control_config_id ON app_config_control;
+
 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;
 
@@ -47,6 +50,9 @@ 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_dmany_bsite_user_d', 'F') IS NOT NULL alter table bsite_user_dmany drop constraint fk_bsite_user_dmany_bsite_user_d;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('bsite_user_dmany','U') AND name = 'ix_bsite_user_dmany_bsite_user_d') drop index ix_bsite_user_dmany_bsite_user_d ON bsite_user_dmany;
+
 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;
 
@@ -69,6 +75,12 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('cepproduct_
 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_ciaddress_street_id', 'F') IS NOT NULL alter table ciaddress drop constraint fk_ciaddress_street_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ciaddress','U') AND name = 'ix_ciaddress_street_id') drop index ix_ciaddress_street_id ON ciaddress;
+
+IF OBJECT_ID('fk_cicustomer_parent_address_id', 'F') IS NOT NULL alter table cicustomer_parent drop constraint fk_cicustomer_parent_address_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('cicustomer_parent','U') AND name = 'ix_cicustomer_parent_address_id') drop index ix_cicustomer_parent_address_id ON cicustomer_parent;
+
 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;
 
@@ -84,6 +96,8 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('coone_many'
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('coroot','U') AND name = 'uq_coroot_one_id') drop index uq_coroot_one_id ON coroot;
 IF OBJECT_ID('fk_coroot_one_id', 'F') IS NOT NULL alter table coroot drop constraint fk_coroot_one_id;
 
+IF OBJECT_ID('fk_calcd_data_id', 'F') IS NOT NULL alter table calcd_data drop constraint fk_calcd_data_id;
+
 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;
 
@@ -178,6 +192,8 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('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_defaults_model_id', 'F') IS NOT NULL alter table defaults_model drop constraint fk_defaults_model_id;
+
 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;
 
@@ -280,6 +296,15 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_u
 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 EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_x','U') AND name = 'uq_esoft_del_x_y_id') drop index uq_esoft_del_x_y_id ON esoft_del_x;
+IF OBJECT_ID('fk_esoft_del_x_y_id', 'F') IS NOT NULL alter table esoft_del_x drop constraint fk_esoft_del_x_y_id;
+
+IF OBJECT_ID('fk_esoft_del_x_organization_id', 'F') IS NOT NULL alter table esoft_del_x drop constraint fk_esoft_del_x_organization_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_x','U') AND name = 'ix_esoft_del_x_organization_id') drop index ix_esoft_del_x_organization_id ON esoft_del_x;
+
+IF OBJECT_ID('fk_esoft_del_y_organization_id', 'F') IS NOT NULL alter table esoft_del_y drop constraint fk_esoft_del_y_organization_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('esoft_del_y','U') AND name = 'ix_esoft_del_y_organization_id') drop index ix_esoft_del_y_organization_id ON esoft_del_y;
+
 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;
 
@@ -426,6 +451,18 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('la_attr_val
 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_m2mcache_set1_m2_mcache_master', 'F') IS NOT NULL alter table m2mcache_set1 drop constraint fk_m2mcache_set1_m2_mcache_master;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('m2mcache_set1','U') AND name = 'ix_m2mcache_set1_m2_mcache_master') drop index ix_m2mcache_set1_m2_mcache_master ON m2mcache_set1;
+
+IF OBJECT_ID('fk_m2mcache_set1_m2_mcache_child', 'F') IS NOT NULL alter table m2mcache_set1 drop constraint fk_m2mcache_set1_m2_mcache_child;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('m2mcache_set1','U') AND name = 'ix_m2mcache_set1_m2_mcache_child') drop index ix_m2mcache_set1_m2_mcache_child ON m2mcache_set1;
+
+IF OBJECT_ID('fk_m2mcache_set2_m2_mcache_master', 'F') IS NOT NULL alter table m2mcache_set2 drop constraint fk_m2mcache_set2_m2_mcache_master;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('m2mcache_set2','U') AND name = 'ix_m2mcache_set2_m2_mcache_master') drop index ix_m2mcache_set2_m2_mcache_master ON m2mcache_set2;
+
+IF OBJECT_ID('fk_m2mcache_set2_m2_mcache_child', 'F') IS NOT NULL alter table m2mcache_set2 drop constraint fk_m2mcache_set2_m2_mcache_child;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('m2mcache_set2','U') AND name = 'ix_m2mcache_set2_m2_mcache_child') drop index ix_m2mcache_set2_m2_mcache_child ON m2mcache_set2;
+
 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;
 
@@ -517,6 +554,14 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('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 EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mny_edge','U') AND name = 'uq_mny_edge_from_id_to_id') drop index uq_mny_edge_from_id_to_id ON mny_edge;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mny_edge','U') AND name = 'uq_mny_edge_to_id_from_id') drop index uq_mny_edge_to_id_from_id ON mny_edge;
+IF OBJECT_ID('fk_mny_edge_from_id', 'F') IS NOT NULL alter table mny_edge drop constraint fk_mny_edge_from_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mny_edge','U') AND name = 'ix_mny_edge_from_id') drop index ix_mny_edge_from_id ON mny_edge;
+
+IF OBJECT_ID('fk_mny_edge_to_id', 'F') IS NOT NULL alter table mny_edge drop constraint fk_mny_edge_to_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('mny_edge','U') AND name = 'ix_mny_edge_to_id') drop index ix_mny_edge_to_id ON mny_edge;
+
 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;
 
@@ -576,9 +621,18 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('om_account_
 IF OBJECT_ID('fk_om_basic_child_parent_id', 'F') IS NOT NULL alter table om_basic_child drop constraint fk_om_basic_child_parent_id;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('om_basic_child','U') AND name = 'ix_om_basic_child_parent_id') drop index ix_om_basic_child_parent_id ON om_basic_child;
 
+IF OBJECT_ID('fk_om_bean_list_child_parent_id', 'F') IS NOT NULL alter table om_bean_list_child drop constraint fk_om_bean_list_child_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('om_bean_list_child','U') AND name = 'ix_om_bean_list_child_parent_id') drop index ix_om_bean_list_child_parent_id ON om_bean_list_child;
+
 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_oml_baz_foo_id', 'F') IS NOT NULL alter table oml_baz drop constraint fk_oml_baz_foo_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oml_baz','U') AND name = 'ix_oml_baz_foo_id') drop index ix_oml_baz_foo_id ON oml_baz;
+
+IF OBJECT_ID('fk_oml_foo_bar_id', 'F') IS NOT NULL alter table oml_foo drop constraint fk_oml_foo_bar_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('oml_foo','U') AND name = 'ix_oml_foo_bar_id') drop index ix_oml_foo_bar_id ON oml_foo;
+
 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;
 
@@ -591,9 +645,18 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('o_order_det
 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_order_referenced_parent_master_id', 'F') IS NOT NULL alter table order_referenced_parent drop constraint fk_order_referenced_parent_master_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('order_referenced_parent','U') AND name = 'ix_order_referenced_parent_master_id') drop index ix_order_referenced_parent_master_id ON order_referenced_parent;
+
 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_order_toy_child_id', 'F') IS NOT NULL alter table order_toy drop constraint fk_order_toy_child_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('order_toy','U') AND name = 'ix_order_toy_child_id') drop index ix_order_toy_child_id ON order_toy;
+
+IF OBJECT_ID('fk_ordered_parent_order_master_inheritance_id', 'F') IS NOT NULL alter table ordered_parent drop constraint fk_ordered_parent_order_master_inheritance_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('ordered_parent','U') AND name = 'ix_ordered_parent_order_master_inheritance_id') drop index ix_ordered_parent_order_master_inheritance_id ON ordered_parent;
+
 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;
@@ -656,6 +719,12 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('rawinherit_
 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_a_child_id', 'F') IS NOT NULL alter table parent_a drop constraint fk_parent_a_child_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('parent_a','U') AND name = 'ix_parent_a_child_id') drop index ix_parent_a_child_id ON parent_a;
+
+IF OBJECT_ID('fk_parent_b_child_id', 'F') IS NOT NULL alter table parent_b drop constraint fk_parent_b_child_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('parent_b','U') AND name = 'ix_parent_b_child_id') drop index ix_parent_b_child_id ON parent_b;
+
 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;
 
@@ -690,6 +759,9 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('person','U'
 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 EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('persona','U') AND name = 'uq_persona_person_oid') drop index uq_persona_person_oid ON persona;
+IF OBJECT_ID('fk_persona_person_oid', 'F') IS NOT NULL alter table persona drop constraint fk_persona_person_oid;
+
 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;
 
@@ -708,9 +780,20 @@ 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_referenced_defaults_model_id', 'F') IS NOT NULL alter table referenced_defaults_model drop constraint fk_referenced_defaults_model_id;
+
+IF OBJECT_ID('fk_referenced_defaults_model_defaults_model_id', 'F') IS NOT NULL alter table referenced_defaults_model drop constraint fk_referenced_defaults_model_defaults_model_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('referenced_defaults_model','U') AND name = 'ix_referenced_defaults_model_defaults_model_id') drop index ix_referenced_defaults_model_defaults_model_id ON referenced_defaults_model;
+
+IF OBJECT_ID('fk_referenced_defaults_model_draft_defaults_model_id', 'F') IS NOT NULL alter table referenced_defaults_model_draft drop constraint fk_referenced_defaults_model_draft_defaults_model_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('referenced_defaults_model_draft','U') AND name = 'ix_referenced_defaults_model_draft_defaults_model_id') drop index ix_referenced_defaults_model_draft_defaults_model_id ON referenced_defaults_model_draft;
+
 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_app_config_re_config_id', 'F') IS NOT NULL alter table app_config_re drop constraint fk_app_config_re_config_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('app_config_re','U') AND name = 'ix_app_config_re_config_id') drop index ix_app_config_re_config_id ON app_config_re;
+
 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;
 
@@ -732,6 +815,12 @@ IF OBJECT_ID('fk_f_second_first', 'F') IS NOT NULL alter table f_second drop con
 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_many_bridge_self_many_many_1', 'F') IS NOT NULL alter table self_many_bridge drop constraint fk_self_many_bridge_self_many_many_1;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('self_many_bridge','U') AND name = 'ix_self_many_bridge_self_many_many_1') drop index ix_self_many_bridge_self_many_many_1 ON self_many_bridge;
+
+IF OBJECT_ID('fk_self_many_bridge_self_many_many_2', 'F') IS NOT NULL alter table self_many_bridge drop constraint fk_self_many_bridge_self_many_many_2;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('self_many_bridge','U') AND name = 'ix_self_many_bridge_self_many_many_2') drop index ix_self_many_bridge_self_many_many_2 ON self_many_bridge;
+
 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;
 
@@ -837,6 +926,12 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('vehicle_dri
 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_version_child_parent_id', 'F') IS NOT NULL alter table version_child drop constraint fk_version_child_parent_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('version_child','U') AND name = 'ix_version_child_parent_id') drop index ix_version_child_parent_id ON version_child;
+
+IF OBJECT_ID('fk_version_toy_child_id', 'F') IS NOT NULL alter table version_toy drop constraint fk_version_toy_child_id;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('version_toy','U') AND name = 'ix_version_toy_child_id') drop index ix_version_toy_child_id ON version_toy;
+
 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;
 
@@ -904,6 +999,12 @@ 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('app_config', 'U') IS NOT NULL drop table app_config;
+IF OBJECT_ID('app_config_seq', 'SO') IS NOT NULL drop sequence app_config_seq;
+
+IF OBJECT_ID('app_config_control', 'U') IS NOT NULL drop table app_config_control;
+IF OBJECT_ID('app_config_control_seq', 'SO') IS NOT NULL drop sequence app_config_control_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;
 
@@ -938,6 +1039,8 @@ 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_dmany', 'U') IS NOT NULL drop table bsite_user_dmany;
+
 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;
@@ -971,6 +1074,15 @@ 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('ciaddress', 'U') IS NOT NULL drop table ciaddress;
+IF OBJECT_ID('ciaddress_seq', 'SO') IS NOT NULL drop sequence ciaddress_seq;
+
+IF OBJECT_ID('cicustomer_parent', 'U') IS NOT NULL drop table cicustomer_parent;
+IF OBJECT_ID('cicustomer_parent_seq', 'SO') IS NOT NULL drop sequence cicustomer_parent_seq;
+
+IF OBJECT_ID('cistreet_parent', 'U') IS NOT NULL drop table cistreet_parent;
+IF OBJECT_ID('cistreet_parent_seq', 'SO') IS NOT NULL drop sequence cistreet_parent_seq;
+
 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;
 
@@ -994,6 +1106,12 @@ IF OBJECT_ID('coone_many_seq', 'SO') IS NOT NULL drop sequence coone_many_seq;
 IF OBJECT_ID('coroot', 'U') IS NOT NULL drop table coroot;
 IF OBJECT_ID('coroot_seq', 'SO') IS NOT NULL drop sequence coroot_seq;
 
+IF OBJECT_ID('calcd_data', 'U') IS NOT NULL drop table calcd_data;
+IF OBJECT_ID('calcd_data_seq', 'SO') IS NOT NULL drop sequence calcd_data_seq;
+
+IF OBJECT_ID('calcd_input', 'U') IS NOT NULL drop table calcd_input;
+IF OBJECT_ID('calcd_input_seq', 'SO') IS NOT NULL drop sequence calcd_input_seq;
+
 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;
 
@@ -1024,6 +1142,9 @@ IF OBJECT_ID('e_save_test_d_seq', 'SO') IS NOT NULL drop sequence e_save_test_d_
 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('child_with_cache', 'U') IS NOT NULL drop table child_with_cache;
+IF OBJECT_ID('child_with_cache_seq', 'SO') IS NOT NULL drop sequence child_with_cache_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;
@@ -1113,6 +1234,12 @@ 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('defaults_model', 'U') IS NOT NULL drop table defaults_model;
+IF OBJECT_ID('defaults_model_seq', 'SO') IS NOT NULL drop sequence defaults_model_seq;
+
+IF OBJECT_ID('defaults_model_draft', 'U') IS NOT NULL drop table defaults_model_draft;
+IF OBJECT_ID('defaults_model_draft_seq', 'SO') IS NOT NULL drop sequence defaults_model_draft_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;
 
@@ -1208,6 +1335,9 @@ IF OBJECT_ID('ebasic_json_jackson_seq', 'SO') IS NOT NULL drop sequence ebasic_j
 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_jackson3', 'U') IS NOT NULL drop table ebasic_json_jackson3;
+IF OBJECT_ID('ebasic_json_jackson3_seq', 'SO') IS NOT NULL drop sequence ebasic_json_jackson3_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;
 
@@ -1229,6 +1359,9 @@ IF OBJECT_ID('ebasic_json_map_json_b_seq', 'SO') IS NOT NULL drop sequence ebasi
 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_multi', 'U') IS NOT NULL drop table ebasic_json_multi;
+IF OBJECT_ID('ebasic_json_multi_seq', 'SO') IS NOT NULL drop sequence ebasic_json_multi_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;
 
@@ -1244,12 +1377,21 @@ IF OBJECT_ID('ebasic_json_node_varchar_seq', 'SO') IS NOT NULL drop sequence eba
 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_log', 'U') IS NOT NULL drop table e_basic_log;
+IF OBJECT_ID('e_basic_log_seq', 'SO') IS NOT NULL drop sequence e_basic_log_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_old_value', 'U') IS NOT NULL drop table ebasic_old_value;
+IF OBJECT_ID('ebasic_old_value_seq', 'SO') IS NOT NULL drop sequence ebasic_old_value_seq;
+
+IF OBJECT_ID('ebasic_plain', 'U') IS NOT NULL drop table ebasic_plain;
+IF OBJECT_ID('ebasic_plain_seq', 'SO') IS NOT NULL drop sequence ebasic_plain_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;
 
@@ -1265,6 +1407,9 @@ IF OBJECT_ID('e_basic_withlife_seq', 'SO') IS NOT NULL drop sequence e_basic_wit
 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_basic_withlog', 'U') IS NOT NULL drop table e_basic_withlog;
+IF OBJECT_ID('e_basic_withlog_seq', 'SO') IS NOT NULL drop sequence e_basic_withlog_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;
 
@@ -1327,6 +1472,12 @@ 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;
 
+IF OBJECT_ID('eperson2', 'U') IS NOT NULL drop table eperson2;
+IF OBJECT_ID('eperson2_seq', 'SO') IS NOT NULL drop sequence eperson2_seq;
+
+IF OBJECT_ID('eperson3', 'U') IS NOT NULL drop table eperson3;
+IF OBJECT_ID('eperson3_seq', 'SO') IS NOT NULL drop sequence eperson3_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;
 
@@ -1365,6 +1516,14 @@ IF OBJECT_ID('esoft_del_user_seq', 'SO') IS NOT NULL drop sequence esoft_del_use
 
 IF OBJECT_ID('esoft_del_user_esoft_del_role', 'U') IS NOT NULL drop table esoft_del_user_esoft_del_role;
 
+IF OBJECT_ID('esoft_del_x', 'U') IS NOT NULL drop table esoft_del_x;
+
+IF OBJECT_ID('esoft_del_y', 'U') IS NOT NULL drop table esoft_del_y;
+IF OBJECT_ID('esoft_del_y_seq', 'SO') IS NOT NULL drop sequence esoft_del_y_seq;
+
+IF OBJECT_ID('esoft_del_z', 'U') IS NOT NULL drop table esoft_del_z;
+IF OBJECT_ID('esoft_del_z_seq', 'SO') IS NOT NULL drop sequence esoft_del_z_seq;
+
 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;
 
@@ -1476,10 +1635,7 @@ 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('gen_key_sequence_seq', 'SO') IS NOT NULL drop sequence gen_key_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('SEQ_NAME', 'SO') IS NOT NULL drop sequence SEQ_NAME;
 
 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;
@@ -1490,6 +1646,10 @@ IF OBJECT_ID('survey_group_seq', 'SO') IS NOT NULL drop sequence survey_group_se
 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('hembi_bean', 'U') IS NOT NULL alter table hembi_bean set (system_versioning = off);
+IF OBJECT_ID('hembi_bean_history', 'U') IS NOT NULL drop table hembi_bean_history;
+IF OBJECT_ID('hembi_bean', 'U') IS NOT NULL drop table hembi_bean;
+
 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;
 
@@ -1626,6 +1786,16 @@ IF OBJECT_ID('la_attr_value_attribute', 'U') IS NOT NULL drop table la_attr_valu
 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('m2_mcache_child', 'U') IS NOT NULL drop table m2_mcache_child;
+IF OBJECT_ID('m2_mcache_child_seq', 'SO') IS NOT NULL drop sequence m2_mcache_child_seq;
+
+IF OBJECT_ID('m2_mcache_master', 'U') IS NOT NULL drop table m2_mcache_master;
+IF OBJECT_ID('m2_mcache_master_seq', 'SO') IS NOT NULL drop sequence m2_mcache_master_seq;
+
+IF OBJECT_ID('m2mcache_set1', 'U') IS NOT NULL drop table m2mcache_set1;
+
+IF OBJECT_ID('m2mcache_set2', 'U') IS NOT NULL drop table m2mcache_set2;
+
 IF OBJECT_ID('maddress', 'U') IS NOT NULL drop table maddress;
 
 IF OBJECT_ID('mcontact', 'U') IS NOT NULL drop table mcontact;
@@ -1723,6 +1893,12 @@ 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_edge', 'U') IS NOT NULL drop table mny_edge;
+IF OBJECT_ID('mny_edge_seq', 'SO') IS NOT NULL drop sequence mny_edge_seq;
+
+IF OBJECT_ID('mny_node', 'U') IS NOT NULL drop table mny_node;
+IF OBJECT_ID('mny_node_seq', 'SO') IS NOT NULL drop sequence mny_node_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;
 
@@ -1810,12 +1986,27 @@ IF OBJECT_ID('om_basic_child_seq', 'SO') IS NOT NULL drop sequence om_basic_chil
 IF OBJECT_ID('om_basic_parent', 'U') IS NOT NULL drop table om_basic_parent;
 IF OBJECT_ID('om_basic_parent_seq', 'SO') IS NOT NULL drop sequence om_basic_parent_seq;
 
+IF OBJECT_ID('om_bean_list_child', 'U') IS NOT NULL drop table om_bean_list_child;
+IF OBJECT_ID('om_bean_list_child_seq', 'SO') IS NOT NULL drop sequence om_bean_list_child_seq;
+
+IF OBJECT_ID('om_bean_list_parent', 'U') IS NOT NULL drop table om_bean_list_parent;
+IF OBJECT_ID('om_bean_list_parent_seq', 'SO') IS NOT NULL drop sequence om_bean_list_parent_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('oml_bar', 'U') IS NOT NULL drop table oml_bar;
+IF OBJECT_ID('oml_bar_seq', 'SO') IS NOT NULL drop sequence oml_bar_seq;
+
+IF OBJECT_ID('oml_baz', 'U') IS NOT NULL drop table oml_baz;
+IF OBJECT_ID('oml_baz_seq', 'SO') IS NOT NULL drop sequence oml_baz_seq;
+
+IF OBJECT_ID('oml_foo', 'U') IS NOT NULL drop table oml_foo;
+IF OBJECT_ID('oml_foo_seq', 'SO') IS NOT NULL drop sequence oml_foo_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;
 
@@ -1829,9 +2020,24 @@ 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('order_master', 'U') IS NOT NULL drop table order_master;
+IF OBJECT_ID('order_master_seq', 'SO') IS NOT NULL drop sequence order_master_seq;
+
+IF OBJECT_ID('order_master_inheritance', 'U') IS NOT NULL drop table order_master_inheritance;
+IF OBJECT_ID('order_master_inheritance_seq', 'SO') IS NOT NULL drop sequence order_master_inheritance_seq;
+
+IF OBJECT_ID('order_referenced_parent', 'U') IS NOT NULL drop table order_referenced_parent;
+IF OBJECT_ID('order_referenced_parent_seq', 'SO') IS NOT NULL drop sequence order_referenced_parent_seq;
+
 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('order_toy', 'U') IS NOT NULL drop table order_toy;
+IF OBJECT_ID('order_toy_seq', 'SO') IS NOT NULL drop sequence order_toy_seq;
+
+IF OBJECT_ID('ordered_parent', 'U') IS NOT NULL drop table ordered_parent;
+IF OBJECT_ID('ordered_parent_seq', 'SO') IS NOT NULL drop sequence ordered_parent_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;
 
@@ -1940,6 +2146,12 @@ IF OBJECT_ID('rawinherit_parent_rawinherit_data', 'U') IS NOT NULL drop table ra
 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_a', 'U') IS NOT NULL drop table parent_a;
+IF OBJECT_ID('parent_a_seq', 'SO') IS NOT NULL drop sequence parent_a_seq;
+
+IF OBJECT_ID('parent_b', 'U') IS NOT NULL drop table parent_b;
+IF OBJECT_ID('parent_b_seq', 'SO') IS NOT NULL drop sequence parent_b_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;
 
@@ -1982,6 +2194,11 @@ IF OBJECT_ID('person_cache_email', 'U') IS NOT NULL drop table person_cache_emai
 
 IF OBJECT_ID('person_cache_info', 'U') IS NOT NULL drop table person_cache_info;
 
+IF OBJECT_ID('person_other', 'U') IS NOT NULL drop table person_other;
+
+IF OBJECT_ID('persona', 'U') IS NOT NULL drop table persona;
+IF OBJECT_ID('persona_seq', 'SO') IS NOT NULL drop sequence persona_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;
 
@@ -2004,6 +2221,12 @@ 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('referenced_defaults_model', 'U') IS NOT NULL drop table referenced_defaults_model;
+IF OBJECT_ID('referenced_defaults_model_seq', 'SO') IS NOT NULL drop sequence referenced_defaults_model_seq;
+
+IF OBJECT_ID('referenced_defaults_model_draft', 'U') IS NOT NULL drop table referenced_defaults_model_draft;
+IF OBJECT_ID('referenced_defaults_model_draft_seq', 'SO') IS NOT NULL drop sequence referenced_defaults_model_draft_seq;
+
 IF OBJECT_ID('referencing_bean', 'U') IS NOT NULL drop table referencing_bean;
 
 IF OBJECT_ID('region', 'U') IS NOT NULL drop table region;
@@ -2014,6 +2237,9 @@ IF OBJECT_ID('rel_detail_seq', 'SO') IS NOT NULL drop sequence rel_detail_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('app_config_re', 'U') IS NOT NULL drop table app_config_re;
+IF OBJECT_ID('app_config_re_seq', 'SO') IS NOT NULL drop sequence app_config_re_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;
@@ -2031,6 +2257,11 @@ 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_many_many', 'U') IS NOT NULL drop table self_many_many;
+IF OBJECT_ID('self_many_many_seq', 'SO') IS NOT NULL drop sequence self_many_many_seq;
+
+IF OBJECT_ID('self_many_bridge', 'U') IS NOT NULL drop table self_many_bridge;
+
 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;
 
@@ -2103,10 +2334,10 @@ 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_detail_with_other_namexxxyy_seq', 'SO') IS NOT NULL drop sequence t_detail_with_other_namexxxyy_seq;
+IF OBJECT_ID('t_atable_detail_seq', 'SO') IS NOT NULL drop sequence t_atable_detail_seq;
 
 IF OBJECT_ID('t_atable_thatisrelatively', 'U') IS NOT NULL drop table t_atable_thatisrelatively;
-IF OBJECT_ID('t_atable_thatisrelatively_seq', 'SO') IS NOT NULL drop sequence t_atable_thatisrelatively_seq;
+IF OBJECT_ID('t_atable_master_seq', 'SO') IS NOT NULL drop sequence t_atable_master_seq;
 
 IF OBJECT_ID('ttruck_holder', 'U') IS NOT NULL drop table ttruck_holder;
 IF OBJECT_ID('ttruck_holder_seq', 'SO') IS NOT NULL drop sequence ttruck_holder_seq;
@@ -2128,6 +2359,8 @@ 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('test_jakarta_annotation_base_entity', 'U') IS NOT NULL drop table test_jakarta_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;
 
@@ -2199,6 +2432,15 @@ IF OBJECT_ID('vehicle_driver_seq', 'SO') IS NOT NULL drop sequence vehicle_drive
 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('version_child', 'U') IS NOT NULL drop table version_child;
+IF OBJECT_ID('version_child_seq', 'SO') IS NOT NULL drop sequence version_child_seq;
+
+IF OBJECT_ID('version_parent', 'U') IS NOT NULL drop table version_parent;
+IF OBJECT_ID('version_parent_seq', 'SO') IS NOT NULL drop sequence version_parent_seq;
+
+IF OBJECT_ID('version_toy', 'U') IS NOT NULL drop table version_toy;
+IF OBJECT_ID('version_toy_seq', 'SO') IS NOT NULL drop sequence version_toy_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;
 
@@ -2231,4 +2473,6 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('contact','U
 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('ecsm_values','U') AND name = 'ix_ecsm_values_host_id') drop index ix_ecsm_values_host_id ON ecsm_values;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('order_referenced_parent','U') AND name = 'ix_order_referenced_parent_type') drop index ix_order_referenced_parent_type ON order_referenced_parent;
 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;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('test_annotation_base_entity','U') AND name = 'ano_3') drop index ano_3 ON test_annotation_base_entity;

From 0345ca9f18f9cb7a7a8d121f6cfa51e13864b061 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 22 Aug 2021 16:38:50 +1200
Subject: [PATCH 431/447] Update ddl review only - for #2326

---
 .../src/test/ddl-review/pg-create-all.sql     | 395 +++++++++++++++++-
 .../src/test/ddl-review/pg-drop-all.sql       | 131 +++++-
 2 files changed, 509 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/test/ddl-review/pg-create-all.sql b/ebean-core/src/test/ddl-review/pg-create-all.sql
index 5b4bc24dd..3299399c4 100644
--- a/ebean-core/src/test/ddl-review/pg-create-all.sql
+++ b/ebean-core/src/test/ddl-review/pg-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2020-08-24T21:02:32.420817Z
+-- Generated by ebean unknown at 2021-08-22T04:36:53.704559Z
 create table asimple_bean (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -103,6 +103,18 @@ create table animal_shelter (
   constraint pk_animal_shelter primary key (id)
 );
 
+create table app_config (
+  id                            integer generated by default as identity not null,
+  constraint pk_app_config primary key (id)
+);
+
+create table app_config_control (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  config_id                     integer,
+  constraint pk_app_config_control primary key (id)
+);
+
 create table article (
   id                            integer generated by default as identity not null,
   name                          varchar(255),
@@ -203,7 +215,17 @@ create table bsite_user_d (
   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))
+  constraint ck_bsite_user_d_access_level check ( access_level in (0,1,2)),
+  constraint pk_bsite_user_d primary key (site_id,user_id)
+);
+
+create table bsite_user_dmany (
+  site_id                       uuid not null,
+  user_id                       uuid not null,
+  name                          varchar(255) not null,
+  many                          varchar(255),
+  version                       bigint not null,
+  constraint pk_bsite_user_dmany primary key (site_id,user_id,name)
 );
 
 create table bsite_user_e (
@@ -396,6 +418,18 @@ create table coroot (
   constraint pk_coroot primary key (id)
 );
 
+create table calcd_data (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_calcd_data primary key (id)
+);
+
+create table calcd_input (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_calcd_input primary key (id)
+);
+
 create table calculation_result (
   id                            integer generated by default as identity not null,
   charge                        float not null,
@@ -486,6 +520,13 @@ create table child_person (
   constraint pk_child_person primary key (identifier)
 );
 
+create table child_with_cache (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  address                       varchar(255),
+  constraint pk_child_with_cache primary key (id)
+);
+
 create table cke_client (
   cod_cpny                      integer not null,
   cod_client                    varchar(100) not null,
@@ -922,6 +963,7 @@ create table earray_set_bean (
   uids                          uuid[],
   other_ids                     bigint[],
   doubs                         float[],
+  status                        integer[],
   version                       bigint not null,
   constraint pk_earray_set_bean primary key (id)
 );
@@ -941,6 +983,7 @@ create table ebasic_change_log (
   name                          varchar(20),
   short_description             varchar(50),
   long_description              varchar(100),
+  plain_bean                    json,
   who_created                   varchar(255) not null,
   who_modified                  varchar(255) not null,
   when_created                  timestamptz not null,
@@ -1059,10 +1102,20 @@ create table ebasic_json_jackson2 (
   constraint pk_ebasic_json_jackson2 primary key (id)
 );
 
+create table ebasic_json_jackson3 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  plain_value                   json,
+  plain_value2                  json,
+  plain_value3                  json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_jackson3 primary key (id)
+);
+
 create table ebasic_json_list (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
-  bean_set                      json,
+  beans                         json,
   bean_list                     jsonb,
   bean_map                      json,
   plain_bean                    json,
@@ -1121,6 +1174,16 @@ create table ebasic_json_map_varchar (
   constraint pk_ebasic_json_map_varchar primary key (id)
 );
 
+create table ebasic_json_multi (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  plain_value1                  json,
+  plain_value2                  json,
+  plain_value3                  json,
+  version                       bigint not null,
+  constraint pk_ebasic_json_multi primary key (id)
+);
+
 create table ebasic_json_node (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -1160,6 +1223,12 @@ create table ebasic_json_unmapped (
   constraint pk_ebasic_json_unmapped primary key (id)
 );
 
+create table e_basic_log (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_e_basic_log primary key (id)
+);
+
 create table e_basic_ndc (
   id                            integer generated by default as identity not null,
   name                          varchar(255),
@@ -1175,6 +1244,32 @@ create table ebasic_no_sdchild (
   constraint pk_ebasic_no_sdchild primary key (id)
 );
 
+create table ebasic_old_value (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  string_set                    json,
+  long_set                      json,
+  int_set                       json,
+  string_list                   json,
+  long_list                     json,
+  int_list                      json,
+  object_map                    json,
+  long_map                      json,
+  int_map                       json,
+  json_node                     json,
+  string_arr                    varchar[],
+  constraint pk_ebasic_old_value primary key (id)
+);
+
+create table ebasic_plain (
+  id                            bigint generated by default as identity not null,
+  attr                          varchar(255),
+  plain_bean                    json,
+  plain_bean2                   json,
+  version                       bigint not null,
+  constraint pk_ebasic_plain primary key (id)
+);
+
 create table ebasic_sdchild (
   id                            bigint generated by default as identity not null,
   owner_id                      bigint not null,
@@ -1219,6 +1314,14 @@ create table e_basic_with_ex (
   constraint pk_e_basic_with_ex primary key (id)
 );
 
+create table e_basic_withlog (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  deleted                       boolean default false not null,
+  version                       bigint not null,
+  constraint pk_e_basic_withlog primary key (id)
+);
+
 create table e_basicverucon (
   id                            integer generated by default as identity not null,
   name                          varchar(127),
@@ -1345,10 +1448,14 @@ create table einvoice (
   ship_suburb                   varchar(255),
   ship_city                     varchar(255),
   ship_status                   varchar(3),
+  ship_jbean                    json,
+  ship_jraw                     json,
   bill_street                   varchar(255),
   bill_suburb                   varchar(255),
   bill_city                     varchar(255),
   bill_status                   varchar(3),
+  bill_jbean                    json,
+  bill_jraw                     json,
   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')),
@@ -1425,11 +1532,42 @@ create table eperson (
   suburb                        varchar(255),
   addr_city                     varchar(255),
   addr_status                   varchar(3),
+  addr_jbean                    json,
+  jraw                          json,
   version                       bigint not null,
   constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')),
   constraint pk_eperson primary key (id)
 );
 
+create table eperson2 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  notes                         varchar(255),
+  street                        varchar(10),
+  suburb                        varchar(100),
+  city                          varchar(255),
+  status                        varchar(3),
+  jbean                         json,
+  jraw                          json,
+  version                       bigint not null,
+  constraint ck_eperson2_status check ( status in ('ONE','TWO')),
+  constraint pk_eperson2 primary key (id)
+);
+
+create table eperson3 (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  street                        varchar(255),
+  suburb                        varchar(255),
+  city                          varchar(255),
+  status                        varchar(3),
+  jbean                         json,
+  jraw                          json,
+  version                       bigint not null,
+  constraint ck_eperson3_status check ( status in ('ONE','TWO')),
+  constraint pk_eperson3 primary key (id)
+);
+
 create table e_person_online (
   id                            bigint generated by default as identity not null,
   email                         varchar(127),
@@ -1540,6 +1678,29 @@ create table esoft_del_user_esoft_del_role (
   constraint pk_esoft_del_user_esoft_del_role primary key (esoft_del_user_id,esoft_del_role_id)
 );
 
+create table esoft_del_x (
+  id                            uuid not null,
+  y_id                          bigint,
+  organization_id               bigint,
+  deleted                       boolean default false not null,
+  constraint uq_esoft_del_x_y_id unique (y_id),
+  constraint pk_esoft_del_x primary key (id)
+);
+
+create table esoft_del_y (
+  id                            bigint generated by default as identity not null,
+  organization_id               bigint,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_y primary key (id)
+);
+
+create table esoft_del_z (
+  id                            bigint generated by default as identity not null,
+  uuid                          uuid,
+  deleted                       boolean default false not null,
+  constraint pk_esoft_del_z primary key (id)
+);
+
 create table esome_convert_type (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -1863,6 +2024,15 @@ create table c_group (
   constraint pk_c_group primary key (id)
 );
 
+create table hembi_bean (
+  part                          bigint not null,
+  brand                         varchar(20) not null,
+  name                          varchar(255),
+  description                   varchar(255),
+  version                       bigint not null,
+  constraint pk_hembi_bean primary key (part,brand)
+);
+
 create table he_doc (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -2214,6 +2384,29 @@ create table looney (
   constraint pk_looney primary key (id)
 );
 
+create table m2_mcache_child (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_m2_mcache_child primary key (id)
+);
+
+create table m2_mcache_master (
+  id                            integer generated by default as identity not null,
+  constraint pk_m2_mcache_master primary key (id)
+);
+
+create table m2mcache_set1 (
+  m2_mcache_master_id           integer not null,
+  m2_mcache_child_id            integer not null,
+  constraint pk_m2mcache_set1 primary key (m2_mcache_master_id,m2_mcache_child_id)
+);
+
+create table m2mcache_set2 (
+  m2_mcache_master_id           integer not null,
+  m2_mcache_child_id            integer not null,
+  constraint pk_m2mcache_set2 primary key (m2_mcache_master_id,m2_mcache_child_id)
+);
+
 create table maddress (
   id                            uuid not null,
   street                        varchar(255),
@@ -2508,6 +2701,22 @@ create table mny_c (
   constraint pk_mny_c primary key (id)
 );
 
+create table mny_edge (
+  id                            integer generated by default as identity not null,
+  from_id                       integer,
+  to_id                         integer,
+  flags                         integer not null,
+  constraint uq_mny_edge_from_id_to_id unique (from_id,to_id),
+  constraint uq_mny_edge_to_id_from_id unique (to_id,from_id),
+  constraint pk_mny_edge primary key (id)
+);
+
+create table mny_node (
+  id                            integer generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_mny_node primary key (id)
+);
+
 create table mny_topic (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -2749,6 +2958,20 @@ create table om_basic_parent (
   constraint pk_om_basic_parent primary key (id)
 );
 
+create table om_bean_list_child (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  parent_id                     bigint,
+  version                       bigint not null,
+  constraint pk_om_bean_list_child primary key (id)
+);
+
+create table om_bean_list_parent (
+  id                            bigint generated by default as identity not null,
+  version                       bigint not null,
+  constraint pk_om_bean_list_parent primary key (id)
+);
+
 create table om_ordered_detail (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -3188,6 +3411,19 @@ create table e_save_test_c (
   constraint pk_e_save_test_c primary key (id)
 );
 
+create table parent_a (
+  id                            bigint generated by default as identity not null,
+  child_id                      bigint,
+  name                          varchar(255),
+  constraint pk_parent_a primary key (id)
+);
+
+create table parent_b (
+  id                            bigint generated by default as identity not null,
+  child_id                      bigint,
+  constraint pk_parent_b primary key (id)
+);
+
 create table parent_person (
   identifier                    integer generated by default as identity not null,
   name                          varchar(255),
@@ -3319,6 +3555,24 @@ create table person_cache_info (
   constraint pk_person_cache_info primary key (person_id)
 );
 
+create table person_other (
+  id                            varchar(128) not null,
+  email                         varchar(255),
+  when_created                  timestamptz not null,
+  when_modified                 timestamptz not null,
+  version                       bigint not null,
+  constraint pk_person_other primary key (id)
+);
+
+create table persona (
+  id                            bigint generated by default as identity not null,
+  persona                       varchar(255),
+  person_oid                    bigint,
+  version                       integer not null,
+  constraint uq_persona_person_oid unique (person_oid),
+  constraint pk_persona primary key (id)
+);
+
 create table phones (
   id                            bigint generated by default as identity not null,
   phone_number                  varchar(7) not null,
@@ -3429,6 +3683,12 @@ create table rel_master (
   constraint pk_rel_master primary key (id)
 );
 
+create table app_config_re (
+  id                            integer generated by default as identity not null,
+  config_id                     integer,
+  constraint pk_app_config_re primary key (id)
+);
+
 create table resourcefile (
   id                            varchar(64) not null,
   parentresourcefileid          varchar(64),
@@ -3485,6 +3745,18 @@ create table section (
   constraint pk_section primary key (id)
 );
 
+create table self_many_many (
+  id                            bigint generated by default as identity not null,
+  name                          varchar(255),
+  constraint pk_self_many_many primary key (id)
+);
+
+create table self_many_bridge (
+  self_1_id                     bigint not null,
+  self_2_id                     bigint not null,
+  constraint pk_self_many_bridge primary key (self_1_id,self_2_id)
+);
+
 create table self_parent (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -3638,6 +3910,7 @@ create table tbytes_only (
 create table tcar (
   type                          varchar(31) not null,
   plate_no                      varchar(32) not null,
+  deleted                       boolean default false not null,
   truckload                     bigint,
   constraint pk_tcar primary key (plate_no)
 );
@@ -3653,7 +3926,7 @@ create table tevent_many (
   id                            bigint generated by default as identity not null,
   description                   varchar(255),
   event_id                      bigint,
-  units                         integer not null,
+  my_units                      integer not null,
   amount                        float not null,
   version                       bigint not null,
   constraint pk_tevent_many primary key (id)
@@ -3781,6 +4054,16 @@ create table test_annotation_base_entity (
   null3                         varchar(255)
 );
 
+create table test_jakarta_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 (
   id                            bigint not null,
   wheel                         bigint,
@@ -4104,17 +4387,17 @@ create table zones (
   constraint pk_zones primary key (id)
 );
 
-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_ecsm_values_host_id on ecsm_values (host_id);
-create index ix_order_referenced_parent_type on order_referenced_parent (type);
-create index ix_organization_node_kind on organization_node (kind);
-create unique index concurrently ix_t_detail_with_other_namexxxyy_lowername on t_detail_with_other_namexxxyy (lower(name));
+create index if not exists ix_contact_last_name_first_name on contact (last_name,first_name);
+create index if not exists ix_e_basic_name on e_basic (name);
+create index if not exists ix_efile2_no_fk_owner_id on efile2_no_fk (owner_id);
+create index if not exists ix_ecsm_values_host_id on ecsm_values (host_id);
+create index if not exists ix_order_referenced_parent_type on order_referenced_parent (type);
+create index if not exists ix_organization_node_kind on organization_node (kind);
+create unique index concurrently if not exists ix_t_detail_with_other_namexxxyy_lowername on t_detail_with_other_namexxxyy (lower(name));
 create index ix_t_detail_with_other_namexxxyy_defn on t_detail_with_other_namexxxyy using hash (lower(name)) where lower(name) like 'r%';
-create index ano_3 on test_annotation_base_entity (direct);
-create index ano_1 on test_annotation_base_entity (direct);
-create index ano_2 on test_annotation_base_entity (direct);
+create index if not exists ano_3 on test_annotation_base_entity (direct);
+create index if not exists ano_1 on test_jakarta_annotation_base_entity (direct);
+create index if not exists ano_2 on test_jakarta_annotation_base_entity (direct);
 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;
 
@@ -4135,6 +4418,9 @@ alter table album add constraint fk_album_cover_id foreign key (cover_id) refere
 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_app_config_control_config_id on app_config_control (config_id);
+alter table app_config_control add constraint fk_app_config_control_config_id foreign key (config_id) references app_config (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;
 
@@ -4162,6 +4448,9 @@ 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_dmany_bsite_user_d on bsite_user_dmany (site_id,user_id);
+alter table bsite_user_dmany add constraint fk_bsite_user_dmany_bsite_user_d foreign key (site_id,user_id) references bsite_user_d (site_id,user_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;
 
@@ -4200,6 +4489,8 @@ alter table coone_many add constraint fk_coone_many_coone_id foreign key (coone_
 
 alter table coroot add constraint fk_coroot_one_id foreign key (one_id) references coone (id) on delete restrict on update restrict;
 
+alter table calcd_data add constraint fk_calcd_data_id foreign key (id) references calcd_input (id) on delete cascade 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;
 
@@ -4296,10 +4587,10 @@ alter table dc_detail add constraint fk_dc_detail_master_id foreign key (master_
 alter table defaults_model add constraint fk_defaults_model_id foreign key (id) references defaults_model_draft (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;
+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 restrict;
 
 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 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 restrict;
 
 alter table doc add constraint fk_doc_id foreign key (id) references doc_draft (id) on delete restrict on update restrict;
 
@@ -4390,6 +4681,14 @@ alter table esoft_del_user_esoft_del_role add constraint fk_esoft_del_user_esoft
 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;
 
+alter table esoft_del_x add constraint fk_esoft_del_x_y_id foreign key (y_id) references esoft_del_y (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_x_organization_id on esoft_del_x (organization_id);
+alter table esoft_del_x add constraint fk_esoft_del_x_organization_id foreign key (organization_id) references esoft_del_z (id) on delete restrict on update restrict;
+
+create index ix_esoft_del_y_organization_id on esoft_del_y (organization_id);
+alter table esoft_del_y add constraint fk_esoft_del_y_organization_id foreign key (organization_id) references esoft_del_z (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;
 
@@ -4533,6 +4832,18 @@ alter table la_attr_value_attribute add constraint fk_la_attr_value_attribute_at
 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_m2mcache_set1_m2_mcache_master on m2mcache_set1 (m2_mcache_master_id);
+alter table m2mcache_set1 add constraint fk_m2mcache_set1_m2_mcache_master foreign key (m2_mcache_master_id) references m2_mcache_master (id) on delete restrict on update restrict;
+
+create index ix_m2mcache_set1_m2_mcache_child on m2mcache_set1 (m2_mcache_child_id);
+alter table m2mcache_set1 add constraint fk_m2mcache_set1_m2_mcache_child foreign key (m2_mcache_child_id) references m2_mcache_child (id) on delete restrict on update restrict;
+
+create index ix_m2mcache_set2_m2_mcache_master on m2mcache_set2 (m2_mcache_master_id);
+alter table m2mcache_set2 add constraint fk_m2mcache_set2_m2_mcache_master foreign key (m2_mcache_master_id) references m2_mcache_master (id) on delete restrict on update restrict;
+
+create index ix_m2mcache_set2_m2_mcache_child on m2mcache_set2 (m2_mcache_child_id);
+alter table m2mcache_set2 add constraint fk_m2mcache_set2_m2_mcache_child foreign key (m2_mcache_child_id) references m2_mcache_child (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;
 
@@ -4618,6 +4929,12 @@ alter table mny_b_mny_c add constraint fk_mny_b_mny_c_mny_b foreign key (mny_b_i
 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_mny_edge_from_id on mny_edge (from_id);
+alter table mny_edge add constraint fk_mny_edge_from_id foreign key (from_id) references mny_node (id) on delete restrict on update restrict;
+
+create index ix_mny_edge_to_id on mny_edge (to_id);
+alter table mny_edge add constraint fk_mny_edge_to_id foreign key (to_id) references mny_node (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;
 
@@ -4672,6 +4989,9 @@ alter table om_account_child_dbo add constraint fk_om_account_child_dbo_banana_r
 create index ix_om_basic_child_parent_id on om_basic_child (parent_id);
 alter table om_basic_child add constraint fk_om_basic_child_parent_id foreign key (parent_id) references om_basic_parent (id) on delete restrict on update restrict;
 
+create index ix_om_bean_list_child_parent_id on om_bean_list_child (parent_id);
+alter table om_bean_list_child add constraint fk_om_bean_list_child_parent_id foreign key (parent_id) references om_bean_list_parent (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;
 
@@ -4755,6 +5075,12 @@ alter table rawinherit_parent_rawinherit_data add constraint fk_rawinherit_paren
 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_parent_a_child_id on parent_a (child_id);
+alter table parent_a add constraint fk_parent_a_child_id foreign key (child_id) references child_with_cache (id) on delete restrict on update restrict;
+
+create index ix_parent_b_child_id on parent_b (child_id);
+alter table parent_b add constraint fk_parent_b_child_id foreign key (child_id) references child_with_cache (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;
 
@@ -4788,6 +5114,8 @@ alter table person add constraint fk_person_default_address_oid foreign key (def
 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;
 
+alter table persona add constraint fk_persona_person_oid foreign key (person_oid) references person (oid) 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;
 
@@ -4817,6 +5145,9 @@ alter table referenced_defaults_model_draft add constraint fk_referenced_default
 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_app_config_re_config_id on app_config_re (config_id);
+alter table app_config_re add constraint fk_app_config_re_config_id foreign key (config_id) references app_config (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;
 
@@ -4837,6 +5168,12 @@ alter table f_second add constraint fk_f_second_first foreign key (first) refere
 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;
 
+create index ix_self_many_bridge_self_many_many_1 on self_many_bridge (self_1_id);
+alter table self_many_bridge add constraint fk_self_many_bridge_self_many_many_1 foreign key (self_1_id) references self_many_many (id) on delete restrict on update restrict;
+
+create index ix_self_many_bridge_self_many_many_2 on self_many_bridge (self_2_id);
+alter table self_many_bridge add constraint fk_self_many_bridge_self_many_many_2 foreign key (self_2_id) references self_many_many (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;
 
@@ -4965,6 +5302,10 @@ alter table g_who_props_otm add constraint fk_g_who_props_otm_who_modified_id fo
 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 hembi_bean add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+create table hembi_bean_history(like hembi_bean);
+create view hembi_bean_with_history as select * from hembi_bean union all select * from hembi_bean_history;
+
 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);
@@ -5014,6 +5355,28 @@ 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 hembi_bean_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 hembi_bean_history (sys_period,part, brand, name, description, version) values (tstzrange(lowerTs,upperTs), OLD.part, OLD.brand, OLD.name, OLD.description, OLD.version);
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into hembi_bean_history (sys_period,part, brand, name, description, version) values (tstzrange(lowerTs,upperTs), OLD.part, OLD.brand, OLD.name, OLD.description, OLD.version);
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger hembi_bean_history_upd
+  before update or delete on hembi_bean
+  for each row execute procedure hembi_bean_history_version();
+
 create or replace function hx_link_history_version() returns trigger as $$
 declare
   lowerTs timestamptz;
diff --git a/ebean-core/src/test/ddl-review/pg-drop-all.sql b/ebean-core/src/test/ddl-review/pg-drop-all.sql
index e3fbd4432..bcf680914 100644
--- a/ebean-core/src/test/ddl-review/pg-drop-all.sql
+++ b/ebean-core/src/test/ddl-review/pg-drop-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2020-08-24T21:02:32.420817Z
+-- Generated by ebean unknown at 2021-08-22T04:36:53.704559Z
 alter table if exists bar drop constraint if exists fk_bar_foo_id;
 drop index if exists ix_bar_foo_id;
 
@@ -19,6 +19,9 @@ alter table if exists album drop constraint if exists fk_album_cover_id;
 alter table if exists animal drop constraint if exists fk_animal_shelter_id;
 drop index if exists ix_animal_shelter_id;
 
+alter table if exists app_config_control drop constraint if exists fk_app_config_control_config_id;
+drop index if exists ix_app_config_control_config_id;
+
 alter table if exists attribute drop constraint if exists fk_attribute_attribute_holder_id;
 drop index if exists ix_attribute_attribute_holder_id;
 
@@ -46,6 +49,9 @@ 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_dmany drop constraint if exists fk_bsite_user_dmany_bsite_user_d;
+drop index if exists ix_bsite_user_dmany_bsite_user_d;
+
 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;
 
@@ -84,6 +90,8 @@ drop index if exists ix_coone_many_coone_id;
 
 alter table if exists coroot drop constraint if exists fk_coroot_one_id;
 
+alter table if exists calcd_data drop constraint if exists fk_calcd_data_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;
 
@@ -274,6 +282,14 @@ drop index if exists ix_esoft_del_user_esoft_del_role_esoft_del_user;
 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 if exists esoft_del_x drop constraint if exists fk_esoft_del_x_y_id;
+
+alter table if exists esoft_del_x drop constraint if exists fk_esoft_del_x_organization_id;
+drop index if exists ix_esoft_del_x_organization_id;
+
+alter table if exists esoft_del_y drop constraint if exists fk_esoft_del_y_organization_id;
+drop index if exists ix_esoft_del_y_organization_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;
 
@@ -417,6 +433,18 @@ 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 m2mcache_set1 drop constraint if exists fk_m2mcache_set1_m2_mcache_master;
+drop index if exists ix_m2mcache_set1_m2_mcache_master;
+
+alter table if exists m2mcache_set1 drop constraint if exists fk_m2mcache_set1_m2_mcache_child;
+drop index if exists ix_m2mcache_set1_m2_mcache_child;
+
+alter table if exists m2mcache_set2 drop constraint if exists fk_m2mcache_set2_m2_mcache_master;
+drop index if exists ix_m2mcache_set2_m2_mcache_master;
+
+alter table if exists m2mcache_set2 drop constraint if exists fk_m2mcache_set2_m2_mcache_child;
+drop index if exists ix_m2mcache_set2_m2_mcache_child;
+
 alter table if exists mcontact drop constraint if exists fk_mcontact_customer_id;
 drop index if exists ix_mcontact_customer_id;
 
@@ -502,6 +530,12 @@ drop index if exists ix_mny_b_mny_c_mny_b;
 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 if exists mny_edge drop constraint if exists fk_mny_edge_from_id;
+drop index if exists ix_mny_edge_from_id;
+
+alter table if exists mny_edge drop constraint if exists fk_mny_edge_to_id;
+drop index if exists ix_mny_edge_to_id;
+
 alter table if exists subtopics drop constraint if exists fk_subtopics_mny_topic_1;
 drop index if exists ix_subtopics_mny_topic_1;
 
@@ -556,6 +590,9 @@ drop index if exists ix_om_account_child_dbo_banana_rama_id;
 alter table if exists om_basic_child drop constraint if exists fk_om_basic_child_parent_id;
 drop index if exists ix_om_basic_child_parent_id;
 
+alter table if exists om_bean_list_child drop constraint if exists fk_om_bean_list_child_parent_id;
+drop index if exists ix_om_bean_list_child_parent_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;
 
@@ -639,6 +676,12 @@ 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_a drop constraint if exists fk_parent_a_child_id;
+drop index if exists ix_parent_a_child_id;
+
+alter table if exists parent_b drop constraint if exists fk_parent_b_child_id;
+drop index if exists ix_parent_b_child_id;
+
 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;
 
@@ -672,6 +715,8 @@ 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 persona drop constraint if exists fk_persona_person_oid;
+
 alter table if exists phones drop constraint if exists fk_phones_person_id;
 drop index if exists ix_phones_person_id;
 
@@ -701,6 +746,9 @@ drop index if exists ix_referenced_defaults_model_draft_defaults_model_id;
 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 app_config_re drop constraint if exists fk_app_config_re_config_id;
+drop index if exists ix_app_config_re_config_id;
+
 alter table if exists resourcefile drop constraint if exists fk_resourcefile_parentresourcefileid;
 drop index if exists ix_resourcefile_parentresourcefileid;
 
@@ -721,6 +769,12 @@ 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_many_bridge drop constraint if exists fk_self_many_bridge_self_many_many_1;
+drop index if exists ix_self_many_bridge_self_many_many_1;
+
+alter table if exists self_many_bridge drop constraint if exists fk_self_many_bridge_self_many_many_2;
+drop index if exists ix_self_many_bridge_self_many_many_2;
+
 alter table if exists self_parent drop constraint if exists fk_self_parent_parent_id;
 drop index if exists ix_self_parent_parent_id;
 
@@ -873,6 +927,10 @@ drop table if exists animal cascade;
 
 drop table if exists animal_shelter cascade;
 
+drop table if exists app_config cascade;
+
+drop table if exists app_config_control cascade;
+
 drop table if exists article cascade;
 
 drop table if exists attribute cascade;
@@ -899,6 +957,8 @@ drop table if exists bsite_user_c cascade;
 
 drop table if exists bsite_user_d cascade;
 
+drop table if exists bsite_user_dmany cascade;
+
 drop table if exists bsite_user_e cascade;
 
 drop table if exists buser cascade;
@@ -946,6 +1006,10 @@ drop table if exists coone_many cascade;
 
 drop table if exists coroot cascade;
 
+drop table if exists calcd_data cascade;
+
+drop table if exists calcd_input cascade;
+
 drop table if exists calculation_result cascade;
 
 drop table if exists cao_bean cascade;
@@ -970,6 +1034,8 @@ drop table if exists e_save_test_d cascade;
 
 drop table if exists child_person cascade;
 
+drop table if exists child_with_cache cascade;
+
 drop table if exists cke_client cascade;
 
 drop table if exists cke_user cascade;
@@ -1105,6 +1171,8 @@ drop table if exists ebasic_json_jackson cascade;
 
 drop table if exists ebasic_json_jackson2 cascade;
 
+drop table if exists ebasic_json_jackson3 cascade;
+
 drop table if exists ebasic_json_list cascade;
 
 drop table if exists ebasic_json_map cascade;
@@ -1119,6 +1187,8 @@ drop table if exists ebasic_json_map_json_b cascade;
 
 drop table if exists ebasic_json_map_varchar cascade;
 
+drop table if exists ebasic_json_multi cascade;
+
 drop table if exists ebasic_json_node cascade;
 
 drop table if exists ebasic_json_node_blob cascade;
@@ -1129,10 +1199,16 @@ drop table if exists ebasic_json_node_varchar cascade;
 
 drop table if exists ebasic_json_unmapped cascade;
 
+drop table if exists e_basic_log cascade;
+
 drop table if exists e_basic_ndc cascade;
 
 drop table if exists ebasic_no_sdchild cascade;
 
+drop table if exists ebasic_old_value cascade;
+
+drop table if exists ebasic_plain cascade;
+
 drop table if exists ebasic_sdchild cascade;
 
 drop table if exists ebasic_soft_delete cascade;
@@ -1143,6 +1219,8 @@ drop table if exists e_basic_withlife cascade;
 
 drop table if exists e_basic_with_ex cascade;
 
+drop table if exists e_basic_withlog cascade;
+
 drop table if exists e_basicverucon cascade;
 
 drop table if exists ecache_child cascade;
@@ -1189,6 +1267,10 @@ drop table if exists eper_addr cascade;
 
 drop table if exists eperson cascade;
 
+drop table if exists eperson2 cascade;
+
+drop table if exists eperson3 cascade;
+
 drop table if exists e_person_online cascade;
 
 drop table if exists esimple cascade;
@@ -1217,6 +1299,12 @@ drop table if exists esoft_del_user cascade;
 
 drop table if exists esoft_del_user_esoft_del_role cascade;
 
+drop table if exists esoft_del_x cascade;
+
+drop table if exists esoft_del_y cascade;
+
+drop table if exists esoft_del_z cascade;
+
 drop table if exists esome_convert_type cascade;
 
 drop table if exists esome_type cascade;
@@ -1308,6 +1396,15 @@ drop table if exists survey_group cascade;
 
 drop table if exists c_group cascade;
 
+drop trigger if exists hembi_bean_history_upd on hembi_bean cascade;
+drop function if exists hembi_bean_history_version();
+
+drop view hembi_bean_with_history;
+alter table hembi_bean drop column sys_period;
+drop table hembi_bean_history;
+
+drop table if exists hembi_bean cascade;
+
 drop table if exists he_doc cascade;
 
 drop trigger if exists hx_link_history_upd on hx_link cascade;
@@ -1458,6 +1555,14 @@ drop table if exists la_attr_value_attribute cascade;
 
 drop table if exists looney cascade;
 
+drop table if exists m2_mcache_child cascade;
+
+drop table if exists m2_mcache_master cascade;
+
+drop table if exists m2mcache_set1 cascade;
+
+drop table if exists m2mcache_set2 cascade;
+
 drop table if exists maddress cascade;
 
 drop table if exists mcontact cascade;
@@ -1534,6 +1639,10 @@ drop table if exists mny_b_mny_c cascade;
 
 drop table if exists mny_c cascade;
 
+drop table if exists mny_edge cascade;
+
+drop table if exists mny_node cascade;
+
 drop table if exists mny_topic cascade;
 
 drop table if exists subtopics cascade;
@@ -1598,6 +1707,10 @@ drop table if exists om_basic_child cascade;
 
 drop table if exists om_basic_parent cascade;
 
+drop table if exists om_bean_list_child cascade;
+
+drop table if exists om_bean_list_parent cascade;
+
 drop table if exists om_ordered_detail cascade;
 
 drop table if exists om_ordered_master cascade;
@@ -1710,6 +1823,10 @@ drop table if exists rawinherit_parent_rawinherit_data cascade;
 
 drop table if exists e_save_test_c cascade;
 
+drop table if exists parent_a cascade;
+
+drop table if exists parent_b cascade;
+
 drop table if exists parent_person cascade;
 
 drop table if exists c_participation cascade;
@@ -1740,6 +1857,10 @@ drop table if exists person_cache_email cascade;
 
 drop table if exists person_cache_info cascade;
 
+drop table if exists person_other cascade;
+
+drop table if exists persona cascade;
+
 drop table if exists phones cascade;
 
 drop table if exists e_position cascade;
@@ -1770,6 +1891,8 @@ drop table if exists rel_detail cascade;
 
 drop table if exists rel_master cascade;
 
+drop table if exists app_config_re cascade;
+
 drop table if exists resourcefile cascade;
 
 drop table if exists mt_role cascade;
@@ -1784,6 +1907,10 @@ drop table if exists f_second cascade;
 
 drop table if exists section cascade;
 
+drop table if exists self_many_many cascade;
+
+drop table if exists self_many_bridge cascade;
+
 drop table if exists self_parent cascade;
 
 drop table if exists self_ref_customer cascade;
@@ -1856,6 +1983,8 @@ drop table if exists mt_tenant cascade;
 
 drop table if exists test_annotation_base_entity cascade;
 
+drop table if exists test_jakarta_annotation_base_entity cascade;
+
 drop table if exists tire cascade;
 drop sequence if exists tire_seq;
 

From 3556f9a42be1ccb147477b12b7d3232bbcb8bc17 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 22 Aug 2021 16:39:44 +1200
Subject: [PATCH 432/447] Rename test helper StartPostgres (start docker
 postgres)

---
 .../java/main/{StartPostgres9.java => StartPostgres.java} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename ebean-core/src/test/java/main/{StartPostgres9.java => StartPostgres.java} (73%)

diff --git a/ebean-core/src/test/java/main/StartPostgres9.java b/ebean-core/src/test/java/main/StartPostgres.java
similarity index 73%
rename from ebean-core/src/test/java/main/StartPostgres9.java
rename to ebean-core/src/test/java/main/StartPostgres.java
index 9965d7831..5b107d2dc 100644
--- a/ebean-core/src/test/java/main/StartPostgres9.java
+++ b/ebean-core/src/test/java/main/StartPostgres.java
@@ -3,16 +3,16 @@ package main;
 import io.ebean.docker.commands.PostgresConfig;
 import io.ebean.docker.commands.PostgresContainer;
 
-public class StartPostgres9 {
+public class StartPostgres {
 
   public static void main(String[] args) {
 
-    PostgresConfig config = new PostgresConfig("9.6");
-    config.setPort(9432);
+    PostgresConfig config = new PostgresConfig("13");
+    config.setPort(5432);
     config.setDbName("unit");
     config.setUser("unit");
     config.setPassword("unit");
-    config.setContainerName("pg9");
+    config.setContainerName("pg13x");
     config.setExtensions("hstore,pgcrypto");
 
     PostgresContainer container = new PostgresContainer(config);

From b392db866ccbdddb6ccd55f2b5aa3a015814e25d Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Sun, 22 Aug 2021 17:48:19 +1200
Subject: [PATCH 433/447] Update tests for multi-platform testing

---
 .../java/org/tests/json/TestDbJson_List.java  |  2 +-
 .../tests/model/array/TestDbArray_basic.java  | 41 +++++++++----------
 .../java/org/tests/model/m2m/MnyNode.java     |  2 +
 .../org/tests/query/TestQueryFilterMany.java  | 16 ++++++--
 .../java/org/tests/query/TestSubQuery.java    | 16 +++++---
 .../org/tests/query/TestWhereRawClause.java   |  6 +--
 .../query/cancel/SqlQueryCancelTest.java      |  4 +-
 7 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
index 647aa6eff..e20beb1d8 100644
--- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
+++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java
@@ -113,7 +113,7 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    // plain_bean=?, no longer included with MD5 dirty detection
+    // plain_bean=?, no longer included with dirty detection
     assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, version=? where");
   }
 
diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
index 69796b6a3..a3b5ad3d0 100644
--- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -2,7 +2,6 @@ package org.tests.model.array;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.SqlRow;
 import io.ebean.annotation.ForPlatform;
@@ -24,14 +23,14 @@ import static org.junit.Assert.assertNull;
 
 public class TestDbArray_basic extends BaseTestCase {
 
-  private EArrayBean bean = new EArrayBean();
+  private final EArrayBean bean = new EArrayBean();
 
   private EArrayBean found;
 
   @Test
   @IgnorePlatform(Platform.HANA)
   public void insert() throws SQLException {
-
+    DB.find(EArrayBean.class).delete();
     bean.setName("some stuff");
     assertThat(bean.getStatuses()).as("DbArray is auto initialised").isNotNull();
 
@@ -62,14 +61,14 @@ public class TestDbArray_basic extends BaseTestCase {
     bean.getStatus2().add(EArrayBean.Status.TWO);
     bean.getStatus2().add(EArrayBean.Status.ONE);
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    found = Ebean.find(EArrayBean.class, bean.getId());
+    found = DB.find(EArrayBean.class, bean.getId());
 
     assertThat(found.getPhoneNumbers()).containsExactly("4321", "9823");
 
     if (isPostgres()) {
-      Query<EArrayBean> query = Ebean.find(EArrayBean.class)
+      Query<EArrayBean> query = DB.find(EArrayBean.class)
         .where()
         .arrayContains("otherIds", 96L, 97L)
         .arrayContains("uids", bean.getUids().get(0))
@@ -100,7 +99,7 @@ public class TestDbArray_basic extends BaseTestCase {
       assertSql(query).contains(" coalesce(cardinality(t0.phone_numbers),0) <> 0");
       assertThat(list).hasSize(1);
 
-      query = Ebean.find(EArrayBean.class)
+      query = DB.find(EArrayBean.class)
         .where()
         .arrayIsEmpty("otherIds")
         .arrayNotContains("uids", bean.getUids().get(0))
@@ -128,11 +127,11 @@ public class TestDbArray_basic extends BaseTestCase {
   //@Test//(dependsOnMethods = "insert")
   public void json_parse_format() {
 
-    String asJson = Ebean.json().toJson(found);
+    String asJson = DB.json().toJson(found);
     assertThat(asJson).contains("\"phoneNumbers\":[\"4321\",\"9823\"]");
     assertThat(asJson).contains("\"id\":");
 
-    EArrayBean fromJson = Ebean.json().toBean(EArrayBean.class, asJson);
+    EArrayBean fromJson = DB.json().toBean(EArrayBean.class, asJson);
     assertEquals(found.getId(), fromJson.getId());
     assertEquals(found.getId(), fromJson.getId());
     assertEquals(found.getName(), fromJson.getName());
@@ -144,7 +143,7 @@ public class TestDbArray_basic extends BaseTestCase {
 
     found.setName("jack");
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
@@ -158,7 +157,7 @@ public class TestDbArray_basic extends BaseTestCase {
     found.getUids().add(UUID.randomUUID());
 
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     assertSql(sql.get(0)).contains("update earray_bean set phone_numbers=?, uids=?, version=? where");
@@ -173,8 +172,8 @@ public class TestDbArray_basic extends BaseTestCase {
     bean.setPhoneNumbers(null);
     bean.setOtherIds(null);
 
-    Ebean.save(bean);
-    Ebean.delete(bean);
+    DB.save(bean);
+    DB.delete(bean);
   }
 
   @Test
@@ -190,8 +189,8 @@ public class TestDbArray_basic extends BaseTestCase {
     List<EArrayBean> all = new ArrayList<>();
     all.add(bean);
 
-    Ebean.saveAll(all);
-    Ebean.deleteAll(all);
+    DB.saveAll(all);
+    DB.deleteAll(all);
   }
 
   /**
@@ -237,9 +236,9 @@ public class TestDbArray_basic extends BaseTestCase {
     bean.getIntEnums().add(null);
     bean.getIntEnums().add(IntEnum.TWO);
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    found = Ebean.find(EArrayBean.class, bean.getId());
+    found = DB.find(EArrayBean.class, bean.getId());
     assertThat(found.getPhoneNumbers()).containsExactly("111222333", null, "333222111");
     assertThat(found.getOtherIds()).containsExactly(15L, null, 30L, null);
     assertNull(found.getUids().get(1));
@@ -247,7 +246,7 @@ public class TestDbArray_basic extends BaseTestCase {
     assertThat(found.getStatuses()).containsExactly(EArrayBean.Status.ONE, null, EArrayBean.Status.THREE);
     assertThat(found.getVcEnums()).containsExactly(VarcharEnum.ONE, null, VarcharEnum.TWO);
     assertThat(found.getIntEnums()).containsExactly(null, IntEnum.ZERO, null, IntEnum.TWO);
-    Ebean.delete(bean);
+    DB.delete(bean);
   }
 
   @Test
@@ -267,11 +266,11 @@ public class TestDbArray_basic extends BaseTestCase {
     bean.setUids(uids);
     bean.setStatuses(statuses);
 
-    Ebean.save(bean);
+    DB.save(bean);
     // load cache
-    Ebean.find(EArrayBean.class, bean.getId());
+    DB.find(EArrayBean.class, bean.getId());
     // hit cache
-    EArrayBean found = Ebean.find(EArrayBean.class, bean.getId());
+    EArrayBean found = DB.find(EArrayBean.class, bean.getId());
 
     assertThat(found.getUids()).isEqualTo(uids);
     assertThat(found.getStatuses()).isEqualTo(statuses);
diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java
index e51c5f417..3f9a8d347 100644
--- a/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java
+++ b/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java
@@ -6,11 +6,13 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 
+import io.ebean.annotation.Identity;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Where;
 
 import java.util.List;
 
+@Identity(start = 1000)
 @Entity
 public class MnyNode {
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
index 01275cfa0..edfe7f344 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -220,7 +220,12 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sqlList = LoggedSqlCollector.stop();
     assertEquals(1, sqlList.size());
-    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where t1.status in (?) order by t0.id");
+    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where t1.status ");
+    if (isPostgres()) {
+      assertThat(sqlList.get(0)).contains("where t1.status = any(?) order by t0.id");
+    } else {
+      assertThat(sqlList.get(0)).contains("where t1.status in (?) order by t0.id");
+    }
   }
 
   @Test
@@ -239,8 +244,13 @@ public class TestQueryFilterMany extends BaseTestCase {
     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 on t1.id = t0.kcustomer_id where t0.order_date is not null and (t0.kcustomer_id) in ");
-    assertThat(sqlList.get(1)).contains(" and t0.status in ");
+    if (isPostgres()) {
+      assertThat(sqlList.get(1)).contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where t0.order_date is not null and (t0.kcustomer_id) = any(?)");
+      assertThat(sqlList.get(1)).contains(" and t0.status = any(?)");
+    } else {
+      assertThat(sqlList.get(1)).contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where t0.order_date is not null and (t0.kcustomer_id) = any");
+      assertThat(sqlList.get(1)).contains(" and t0.status in ");
+    }
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
index 0eb99f326..e9744ad30 100644
--- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
@@ -69,14 +69,20 @@ public class TestSubQuery extends BaseTestCase {
     // execute the subQuery as copy (generatedSQL must be part of original query)
     Query<OrderDetail> debugSq = sq.copy();
     debugSq.findSingleAttribute();
-    assertThat(debugSq.getGeneratedSql()).isEqualTo(
-        "select t1.id from o_order_detail t0 join o_order t1 on t1.id = t0.order_id where t0.product_id in (?)");
+    if (isPostgres()) {
+      assertThat(debugSq.getGeneratedSql()).isEqualTo("select t1.id from o_order_detail t0 join o_order t1 on t1.id = t0.order_id where t0.product_id = any(?)");
+    } else {
+      assertThat(debugSq.getGeneratedSql()).isEqualTo("select t1.id from o_order_detail t0 join o_order t1 on t1.id = t0.order_id where t0.product_id in (?)");
+    }
 
     Query<Order> query = DB.find(Order.class).select("shipDate").where().isIn("id", sq).query();
     query.findSingleAttribute();
 
-    assertThat(query.getGeneratedSql())
-        .isEqualTo("select t0.ship_date from o_order t0 where  (t0.id) in (" + debugSq.getGeneratedSql() + ")");
+    if (isPostgres()) {
+      assertThat(query.getGeneratedSql()).isEqualTo("select t0.ship_date from o_order t0 where  (t0.id) in (" + debugSq.getGeneratedSql() + ")");
+    } else {
+      assertThat(query.getGeneratedSql()).isEqualTo("select t0.ship_date from o_order t0 where  (t0.id) in (" + debugSq.getGeneratedSql() + ")");
+    }
   }
 
   /**
@@ -108,7 +114,7 @@ public class TestSubQuery extends BaseTestCase {
     List<Integer> productIds = new ArrayList<>();
     productIds.add(3);
 
-    Query<OrderDetail> sq = DB.createQuery(OrderDetail.class).fetch("order.shipments", "id").where()
+    Query<OrderDetail> sq = DB.createQuery(OrderDetail.class).alias("a").fetch("order.shipments", "id").where()
         .isIn("product.id", productIds).query();
 
     // execute the subQuery as copy (generatedSQL must be part of original query)
diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java
index f90360371..f98ff3d81 100644
--- a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java
+++ b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java
@@ -169,9 +169,9 @@ public class TestWhereRawClause extends BaseTestCase {
 
     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()");
+    assertThat(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where t0.name = any(?);");
+    assertThat(sql.get(1)).contains("select t0.id, t0.name from o_customer t0; --bind()");
+    assertThat(sql.get(2)).contains("select t0.id, t0.name from o_customer t0; --bind()");
   }
 
   @Test
diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
index 5fedc53e0..40818cc91 100644
--- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
+++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
@@ -76,7 +76,9 @@ public class SqlQueryCancelTest extends BaseTestCase {
       EBasic model = new EBasic("Basic " + i);
       DB.save(model);
     }
-    SlowDownEBasic.setSelectWaitMillis(0);
+    if (Platform.H2.equals(DB.getDefault().getPlatform())) {
+      SlowDownEBasic.setSelectWaitMillis(0);
+    }
   }
 
   @Test

From c4c4663144973b7ef644acc41755c04b6581c0a8 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 24 Aug 2021 14:31:30 +1200
Subject: [PATCH 434/447] #2327 - findSingleAttribute() on a ToMany path
 includes the id column

---
 .../java/io/ebeaninternal/server/query/SqlTreeBuilder.java    | 4 ++--
 .../io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java    | 4 ++--
 ebean-core/src/test/java/org/tests/query/TestSubQuery.java    | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 43e3a0215..5963b84cd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -299,10 +299,10 @@ public final class SqlTreeBuilder {
       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);
+      boolean withId = isNotSingleAttribute() && !subQuery;
+      return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, withId, temporalMode, disableLazyLoad);
 
     } else {
-      // do not read Id on child beans (e.g. when used with fetch())
       boolean withId = isNotSingleAttribute() && !subQuery;
       return new SqlTreeNodeBean(prefix, prop, props, myList, withId, temporalMode, disableLazyLoad);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
index d920b57ef..c030e96bc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java
@@ -13,8 +13,8 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
   private final STreePropertyAssocMany manyProp;
 
   SqlTreeNodeManyRoot(String prefix, STreePropertyAssocMany prop, SqlTreeProperties props, List<SqlTreeNode> myList,
-                      SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
-    super(prefix, prop, props, myList, true, temporalMode, disableLazyLoad);
+                      boolean withId, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
+    super(prefix, prop, props, myList, withId, temporalMode, disableLazyLoad);
     this.manyProp = prop;
   }
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
index e9744ad30..2da642523 100644
--- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
@@ -114,12 +114,13 @@ public class TestSubQuery extends BaseTestCase {
     List<Integer> productIds = new ArrayList<>();
     productIds.add(3);
 
-    Query<OrderDetail> sq = DB.createQuery(OrderDetail.class).alias("a").fetch("order.shipments", "id").where()
+    Query<OrderDetail> sq = DB.createQuery(OrderDetail.class).fetch("order.shipments", "id").where()
         .isIn("product.id", productIds).query();
 
     // execute the subQuery as copy (generatedSQL must be part of original query)
     Query<OrderDetail> debugSq = sq.copy();
     debugSq.findSingleAttribute();
+    assertThat(debugSq.getGeneratedSql()).contains("select t2.id from o_order_detail a join o_order t1 on t1.id = a.order_id left join or_order_ship t2");
 
     Query<OrderShipment> query = DB.find(OrderShipment.class).select("shipTime").where().isIn("id", sq).query();
     query.findSingleAttribute();

From bedb841fa964f7a5278c24a829229838275ade78 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 24 Aug 2021 14:52:54 +1200
Subject: [PATCH 435/447] #2327 - findSingleAttribute() on a ToMany path
 includes the id column

Follow up test changes
---
 ebean-core/src/test/java/org/tests/query/TestSubQuery.java      | 2 +-
 .../java/org/tests/query/other/TestQuerySingleAttribute.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
index 2da642523..7386f9bac 100644
--- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java
@@ -120,7 +120,7 @@ public class TestSubQuery extends BaseTestCase {
     // execute the subQuery as copy (generatedSQL must be part of original query)
     Query<OrderDetail> debugSq = sq.copy();
     debugSq.findSingleAttribute();
-    assertThat(debugSq.getGeneratedSql()).contains("select t2.id from o_order_detail a join o_order t1 on t1.id = a.order_id left join or_order_ship t2");
+    assertThat(debugSq.getGeneratedSql()).contains("select t2.id from o_order_detail t0 join o_order t1 on t1.id = t0.order_id left join or_order_ship t2");
 
     Query<OrderShipment> query = DB.find(OrderShipment.class).select("shipTime").where().isIn("id", sq).query();
     query.findSingleAttribute();
diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index dd230b866..989ae123d 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -231,7 +231,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
       .where().query();
     query.findSingleAttributeList();
     assertThat(sqlOf(query)).contains("select r1.attribute_, count(*)"
-      + " from (select t1.id, t1.name as attribute_ from om_basic_parent t0 left join om_basic_child t1 on t1.parent_id = t0.id) r1 "
+      + " from (select t1.name as attribute_ from om_basic_parent t0 left join om_basic_child t1 on t1.parent_id = t0.id) r1 "
       + "group by r1.attribute_ order by count(*) desc, r1.attribute_"); // sub-query select clause includes t1.id,
   }
 

From d4d9bb204df67e5dd9c6ae32887b04e4dab1c1f2 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 24 Aug 2021 15:04:23 +1200
Subject: [PATCH 436/447] #2327 - findSingleAttribute() on a ToMany path
 includes the id column

Follow up refactor SqlTreeBuilder
---
 .../server/query/SqlTreeBuilder.java          | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 5963b84cd..c3e3fb736 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -299,15 +299,31 @@ public final class SqlTreeBuilder {
       return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad, sqlDistinct, baseTable);
 
     } else if (prop instanceof STreePropertyAssocMany) {
-      boolean withId = isNotSingleAttribute() && !subQuery;
-      return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, withId, temporalMode, disableLazyLoad);
+      return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, withId(), temporalMode, disableLazyLoad);
 
     } else {
-      boolean withId = isNotSingleAttribute() && !subQuery;
-      return new SqlTreeNodeBean(prefix, prop, props, myList, withId, temporalMode, disableLazyLoad);
+      return new SqlTreeNodeBean(prefix, prop, props, myList, withId(), temporalMode, disableLazyLoad);
     }
   }
 
+  boolean withId() {
+    return isNotSingleAttribute() && !subQuery;
+  }
+
+  /**
+   * 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.
+   */
+  private boolean isNotSingleAttribute() {
+    return query == null || !query.isSingleAttribute();
+  }
+
   /**
    * Build extra joins to support properties used in where clause but not
    * already in select clause.
@@ -666,20 +682,6 @@ public final class SqlTreeBuilder {
       }
       return extras.toArray(new String[0]);
     }
-
   }
 
-  /**
-   * 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.
-   */
-  private boolean isNotSingleAttribute() {
-    return query == null || !query.isSingleAttribute();
-  }
 }

From 3bfb6dbc20d997d92bb93420d0c5b3e15a914e11 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 24 Aug 2021 15:04:52 +1200
Subject: [PATCH 437/447] #2327 - Follow up and fix test TestQueryFilterMany

---
 .../org/tests/query/TestQueryFilterMany.java  | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
index edfe7f344..92c334ed0 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -2,9 +2,7 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.Ebean;
 import io.ebean.ExpressionList;
-import io.ebean.FetchConfig;
 import io.ebean.Query;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -28,21 +26,22 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Customer customer = Ebean.find(Customer.class)
+    Customer customer = DB.find(Customer.class)
       .fetchLazy("orders")
       .filterMany("orders").eq("status", Order.Status.NEW)
       .where().ieq("name", "Rob")
       .order().asc("id").setMaxRows(1)
       .findList().get(0);
 
-    customer.getOrders().size();
+    final int size = customer.getOrders().size();
+    assertThat(size).isGreaterThan(0);
 
     List<String> sqlList = LoggedSqlCollector.stop();
     assertEquals(2, sqlList.size());
     assertThat(sqlList.get(1)).contains("status = ?");
 
     // Currently this does not include the query filter
-    Ebean.refreshMany(customer, "orders");
+    DB.refreshMany(customer, "orders");
 
   }
 
@@ -139,7 +138,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Customer customer = Ebean.find(Customer.class)
+    Customer customer = DB.find(Customer.class)
       .setMaxRows(1)
       .order().asc("id")
       .fetch("orders")
@@ -154,7 +153,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Optional<Customer> customer = Ebean.find(Customer.class)
+    Optional<Customer> customer = DB.find(Customer.class)
       .setMaxRows(1)
       .order().asc("id")
       .fetch("orders")
@@ -171,7 +170,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .filterMany("orders").raw("1=0")
       .where().isNotEmpty("orders")
       .query();
@@ -193,7 +192,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .fetch("orders")
       .filterMany("orders").in("status", Order.Status.NEW)
       .order().asc("id");
@@ -211,7 +210,7 @@ public class TestQueryFilterMany extends BaseTestCase {
     ResetBasicData.reset();
     LoggedSqlCollector.start();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .fetch("orders")
       .filterMany("orders").in("status", Order.Status.NEW)
       .order().asc("id");
@@ -234,7 +233,7 @@ public class TestQueryFilterMany extends BaseTestCase {
     ResetBasicData.reset();
     LoggedSqlCollector.start();
 
-    Query<Customer> query = Ebean.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .fetchQuery("orders") // explicitly fetch orders separately
       .filterMany("orders").in("status", Order.Status.NEW)
       .order().asc("id");
@@ -248,7 +247,7 @@ public class TestQueryFilterMany extends BaseTestCase {
       assertThat(sqlList.get(1)).contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where t0.order_date is not null and (t0.kcustomer_id) = any(?)");
       assertThat(sqlList.get(1)).contains(" and t0.status = any(?)");
     } else {
-      assertThat(sqlList.get(1)).contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where t0.order_date is not null and (t0.kcustomer_id) = any");
+      assertThat(sqlList.get(1)).contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where t0.order_date is not null and (t0.kcustomer_id) in ");
       assertThat(sqlList.get(1)).contains(" and t0.status in ");
     }
   }
@@ -259,7 +258,7 @@ public class TestQueryFilterMany extends BaseTestCase {
     ResetBasicData.reset();
     LoggedSqlCollector.start();
 
-    Ebean.find(Customer.class)
+    DB.find(Customer.class)
       .filterMany("orders")
       .or()
       .eq("status", Order.Status.NEW)
@@ -276,7 +275,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     ResetBasicData.reset();
     LoggedSqlCollector.start();
-    Ebean.find(Customer.class)
+    DB.find(Customer.class)
       .filterMany("contacts").isNotNull("firstName")
       .filterMany("contacts.notes").istartsWith("title", "foo")
       .findList();
@@ -295,7 +294,7 @@ public class TestQueryFilterMany extends BaseTestCase {
     ResetBasicData.reset();
     LoggedSqlCollector.start();
 
-    Ebean.find(Customer.class)
+    DB.find(Customer.class)
       .where()
       .filterMany("contacts", "firstName isNotNull and email istartsWith ?", "rob")
       .findList();

From 60db0b099921e3c83496cc988cfab128573de91f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 24 Aug 2021 15:58:29 +1200
Subject: [PATCH 438/447] #2328 - Postgres JSONB dirty checking - trim json

---
 .../ebeaninternal/server/type/JsonTrim.java   | 33 +++++++++++++++++++
 .../type/ScalarTypeJsonObjectMapper.java      | 12 ++++++-
 .../server/type/JsonTrimTest.java             | 21 ++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java
 create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java
new file mode 100644
index 000000000..97592fb34
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java
@@ -0,0 +1,33 @@
+package io.ebeaninternal.server.type;
+
+/**
+ * Helper that removes whitespace from JSON. Used to normalise Postgres JSONB content.
+ */
+final class JsonTrim {
+
+  /**
+   * Return JSON with whitespace trimmed.
+   */
+  static String trim(String json) {
+    if (json == null) {
+      return null;
+    }
+    int len = json.length();
+    StringBuilder builder = new StringBuilder(len);
+    boolean escaped = false;
+    boolean quoted = false;
+    for (int i = 0; i < len; i++) {
+      char c = json.charAt(i);
+      if (c == '\"') {
+        if (!escaped) quoted = !quoted;
+        else escaped = false;
+      } else if (quoted && c == '\\') {
+        escaped = true;
+      }
+      if (quoted || !Character.isWhitespace(c)) {
+        builder.append(c);
+      }
+    }
+    return builder.toString();
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 5cda3f921..3a863df1e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -39,7 +39,11 @@ final class ScalarTypeJsonObjectMapper {
       return new GenericObject(jsonManager, field, dbType, docType);
     }
     // using the global default MutationDetection mode (defaults to HASH)
-    prop.setMutationDetection(jsonManager.mutationDetection());
+    final MutationDetection defaultMode = jsonManager.mutationDetection();
+    prop.setMutationDetection(defaultMode);
+    if (MutationDetection.NONE == defaultMode) {
+      return new NoMutationDetection(jsonManager, field, dbType, docType);
+    }
     return new GenericObject(jsonManager, field, dbType, docType);
   }
 
@@ -68,8 +72,11 @@ final class ScalarTypeJsonObjectMapper {
    */
   private static final class GenericObject extends Base<Object> {
 
+    private final boolean jsonb;
+
     GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
       super(Object.class, jsonManager, field, dbType, docType);
+      this.jsonb = "jsonb".equals(pgType);
     }
 
     @Override
@@ -80,6 +87,9 @@ final class ScalarTypeJsonObjectMapper {
     @Override
     public Object read(DataReader reader) throws SQLException {
       String json = reader.getString();
+      if (jsonb) {
+        json = JsonTrim.trim(json);
+      }
       // pushJson such that we MD5 and store on EntityBeanIntercept later
       reader.pushJson(json);
       if (json == null || json.isEmpty()) {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java
new file mode 100644
index 000000000..622ceb3f7
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java
@@ -0,0 +1,21 @@
+package io.ebeaninternal.server.type;
+
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JsonTrimTest {
+
+  @Test
+  public void trim_array() {
+    final String trimmed = JsonTrim.trim("[{\"name\": \"one\", \"along\": 1, \"timestamp\": 1629609021559}, {\"name\": \"two\", \"along\": 2, \"timestamp\": 1629609021559}]");
+    assertThat(trimmed).isEqualTo("[{\"name\":\"one\",\"along\":1,\"timestamp\":1629609021559},{\"name\":\"two\",\"along\":2,\"timestamp\":1629609021559}]");
+  }
+
+  @Test
+  public void trim_object() {
+    final String trimmed = JsonTrim.trim("{\"name\":  \"one\",\t \t \"along\": 1, \"timestamp\": 1629609021559}");
+    assertThat(trimmed).isEqualTo("{\"name\":\"one\",\"along\":1,\"timestamp\":1629609021559}");
+  }
+}

From 1e34d6567583135b3429d44354b61f6e3298dc09 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 24 Aug 2021 15:59:58 +1200
Subject: [PATCH 439/447] Tests only - update ddl review for Postgres

---
 ebean-core/src/test/ddl-review/pg-create-all.sql | 4 ++--
 ebean-core/src/test/ddl-review/pg-drop-all.sql   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-core/src/test/ddl-review/pg-create-all.sql b/ebean-core/src/test/ddl-review/pg-create-all.sql
index 3299399c4..c20bc7c96 100644
--- a/ebean-core/src/test/ddl-review/pg-create-all.sql
+++ b/ebean-core/src/test/ddl-review/pg-create-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2021-08-22T04:36:53.704559Z
+-- Generated by ebean unknown at 2021-08-24T03:53:40.190310002Z
 create table asimple_bean (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
@@ -2712,7 +2712,7 @@ create table mny_edge (
 );
 
 create table mny_node (
-  id                            integer generated by default as identity not null,
+  id                            integer generated by default as identity (start with 1000) not null,
   name                          varchar(255),
   constraint pk_mny_node primary key (id)
 );
diff --git a/ebean-core/src/test/ddl-review/pg-drop-all.sql b/ebean-core/src/test/ddl-review/pg-drop-all.sql
index bcf680914..48b50416d 100644
--- a/ebean-core/src/test/ddl-review/pg-drop-all.sql
+++ b/ebean-core/src/test/ddl-review/pg-drop-all.sql
@@ -1,4 +1,4 @@
--- Generated by ebean unknown at 2021-08-22T04:36:53.704559Z
+-- Generated by ebean unknown at 2021-08-24T03:53:40.190310002Z
 alter table if exists bar drop constraint if exists fk_bar_foo_id;
 drop index if exists ix_bar_foo_id;
 

From f2a578cd76f012a5d6f84cc998a1fd60cc9f3810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Tue, 24 Aug 2021 14:28:21 +0200
Subject: [PATCH 440/447] FIX: OrderdColums did not work properly with cache

---
 .../deploy/BeanDescriptorCacheHelp.java       |  7 +-
 .../server/persist/SaveManyBeans.java         | 13 ++--
 .../tests/cascade/OmCacheOrderedDetail.java   | 60 +++++++++++++++
 .../tests/cascade/OmCacheOrderedMaster.java   | 66 ++++++++++++++++
 .../org/tests/cascade/TestOrderedList.java    | 75 +++++++++++++++++++
 5 files changed, 215 insertions(+), 6 deletions(-)
 create mode 100644 ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java
 create mode 100644 ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 61d7366bc..7cdaf95df 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -294,8 +294,13 @@ final class BeanDescriptorCacheHelp<T> {
 
     List<Object> idList = entry.getIdList();
     bc.checkEmptyLazyLoad();
+    int i = 0;
     for (Object id : idList) {
-      many.add(bc, targetDescriptor.createReference(readOnly, id, persistenceContext));
+      final EntityBean ref = targetDescriptor.createReference(readOnly, id, persistenceContext);
+      if (many.hasOrderColumn()) {
+        ref._ebean_getIntercept().setSortOrder(++i);
+      }
+      many.add(bc, ref);
     }
     return true;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 33edf8dd8..f4a70f763 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -18,7 +18,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
@@ -165,11 +164,15 @@ public final class SaveManyBeans extends SaveManyBase {
         if (many.hasJoinTable()) {
           skipSavingThisBean = targetDescriptor.isReference(ebi);
         } else {
-          if (orderColumn != null && !Objects.equals(sortOrder, orderColumn.getValue(detail))) {
-            orderColumn.setValue(detail, sortOrder);
-            ebi.setDirty(true);
+          int originalOrder = 0;
+          if (orderColumn != null) {
+            originalOrder = detail._ebean_getIntercept().getSortOrder();
+            if (sortOrder != originalOrder) {
+              detail._ebean_intercept().setSortOrder(sortOrder);
+              ebi.setDirty(true);
+            }
           }
-          if (targetDescriptor.isReference(ebi)) {
+          if (targetDescriptor.isReference(ebi) && originalOrder == 0) {
             // we can skip this one
             skipSavingThisBean = true;
           } else if (ebi.isNewOrDirty()) {
diff --git a/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java b/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java
new file mode 100644
index 000000000..2febada00
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java
@@ -0,0 +1,60 @@
+package org.tests.cascade;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+@Cache
+public class OmCacheOrderedDetail {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @ManyToOne
+  OmCacheOrderedMaster master;
+
+  @Version
+  Long version;
+
+  public OmCacheOrderedDetail(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 OmCacheOrderedMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(OmCacheOrderedMaster master) {
+    this.master = master;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java
new file mode 100644
index 000000000..7e0dd4df3
--- /dev/null
+++ b/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java
@@ -0,0 +1,66 @@
+package org.tests.cascade;
+
+import io.ebean.annotation.Cache;
+
+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
+@Cache
+public class OmCacheOrderedMaster {
+
+  @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<OmCacheOrderedDetail> details;
+
+  @Version
+  Long version;
+
+  public OmCacheOrderedMaster(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<OmCacheOrderedDetail> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<OmCacheOrderedDetail> details) {
+    this.details = details;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}
diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java
index 0045a502b..a306cb105 100644
--- a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java
+++ b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java
@@ -5,6 +5,7 @@ import io.ebean.DB;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
+import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -113,4 +114,78 @@ public class TestOrderedList extends BaseTestCase {
     final OmOrderedMaster masterDb = DB.find(OmOrderedMaster.class, master.getId());
     assertThat(masterDb.getDetails()).hasSize(1);
   }
+
+  @Test
+  public void testModifyList() {
+    final OmOrderedMaster master = new OmOrderedMaster("Master");
+    final OmOrderedDetail detail1 = new OmOrderedDetail("Detail1");
+    final OmOrderedDetail detail2 = new OmOrderedDetail("Detail2");
+    final OmOrderedDetail detail3 = new OmOrderedDetail("Detail3");
+    DB.save(detail1);
+    DB.save(detail2);
+    DB.save(detail3);
+    master.getDetails().add(detail1);
+    master.getDetails().add(detail2);
+    master.getDetails().add(detail3);
+
+    DB.save(master);
+
+    OmOrderedMaster masterDb = DB.find(OmOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).containsExactly(detail1, detail2, detail3);
+
+    Collections.reverse(masterDb.getDetails());
+
+    DB.save(masterDb);
+
+    masterDb = DB.find(OmOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).containsExactly(detail3, detail2, detail1);
+
+    masterDb.getDetails().remove(1);
+
+    DB.save(masterDb);
+
+    masterDb = DB.find(OmOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).containsExactly(detail3, detail1);
+
+  }
+
+  @Test
+  public void testModifyListWithCache() {
+    final OmCacheOrderedMaster master = new OmCacheOrderedMaster("Master");
+    final OmCacheOrderedDetail detail1 = new OmCacheOrderedDetail("Detail1");
+    final OmCacheOrderedDetail detail2 = new OmCacheOrderedDetail("Detail2");
+    final OmCacheOrderedDetail detail3 = new OmCacheOrderedDetail("Detail3");
+    DB.save(detail1);
+    DB.save(detail2);
+    DB.save(detail3);
+    master.getDetails().add(detail1);
+    master.getDetails().add(detail2);
+    master.getDetails().add(detail3);
+
+    DB.save(master);
+
+    OmCacheOrderedMaster masterDb = DB.find(OmCacheOrderedMaster.class, master.getId()); // load cache
+    assertThat(masterDb.getDetails()).containsExactly(detail1, detail2, detail3);
+
+    masterDb = DB.find(OmCacheOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).containsExactly(detail1, detail2, detail3); // hit cache
+
+    Collections.reverse(masterDb.getDetails());
+
+    DB.save(masterDb);
+
+    masterDb = DB.find(OmCacheOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).containsExactly(detail3, detail2, detail1); // load cache
+
+    masterDb = DB.find(OmCacheOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).containsExactly(detail3, detail2, detail1); // hit cache
+
+    masterDb.getDetails().remove(1);
+
+    DB.save(masterDb);
+
+    masterDb = DB.find(OmCacheOrderedMaster.class, master.getId());
+    assertThat(masterDb.getDetails()).containsExactly(detail3, detail1);
+
+  }
 }

From 69c721b66e4370c14f1c4177018a3d823888bf70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20P=C3=B6hler?= <jonas.poehler@foconis.de>
Date: Tue, 24 Aug 2021 14:48:22 +0200
Subject: [PATCH 441/447] ADD: getSortOrder accessible in BeanState API

---
 ebean-api/src/main/java/io/ebean/BeanState.java              | 5 +++++
 .../java/io/ebeaninternal/server/core/DefaultBeanState.java  | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ebean-api/src/main/java/io/ebean/BeanState.java b/ebean-api/src/main/java/io/ebean/BeanState.java
index da8c24d81..daf163cc7 100644
--- a/ebean-api/src/main/java/io/ebean/BeanState.java
+++ b/ebean-api/src/main/java/io/ebean/BeanState.java
@@ -118,4 +118,9 @@ public interface BeanState {
    */
   @Nullable
   Map<String, Exception> getLoadErrors();
+
+  /**
+   * Return the sort order value for an order column.
+   */
+  int getSortOrder();
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
index 332b4fc0d..5bedf1355 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java
@@ -94,4 +94,8 @@ public final class DefaultBeanState implements BeanState {
     return intercept.getLoadErrors();
   }
 
+  @Override
+  public int getSortOrder() {
+    return intercept.getSortOrder();
+  }
 }

From 371a50176e934ab2c49270830b0558200a3ba032 Mon Sep 17 00:00:00 2001
From: rob <robin.bygrave@gmail.com>
Date: Mon, 30 Aug 2021 22:39:11 +1200
Subject: [PATCH 442/447] Tidy tests only - ClusterTest and
 TestAggregateFormula

---
 .../java/org/tests/aggregateformula/TestAggregateFormula.java   | 2 --
 ebean-redis/src/test/java/org/integration/ClusterTest.java      | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
index ff9bfb70a..223316cc1 100644
--- a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+++ b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
@@ -81,7 +81,6 @@ public class TestAggregateFormula extends BaseTestCase {
     for (Contact contact : contacts) {
       Customer customer = contact.getCustomer();
       assertNotNull(customer.getName());
-      assertNotNull(customer.getStatus());
     }
 
     List<String> sql = LoggedSqlCollector.stop();
@@ -112,7 +111,6 @@ public class TestAggregateFormula extends BaseTestCase {
     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());
diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java
index 64c54baaa..2d1046009 100644
--- a/ebean-redis/src/test/java/org/integration/ClusterTest.java
+++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java
@@ -40,6 +40,7 @@ public class ClusterTest {
     foo.save();
 
     DB.getServerCacheManager().clearAll();
+    DB.getDefault().getMetaInfoManager().resetAllMetrics();
     other.getMetaInfoManager().resetAllMetrics();
 
     Person fooA = DB.find(Person.class, foo.getId());

From c5dca6948222aa03d39ac05ac2fe2ff35b6a12a7 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 30 Aug 2021 22:42:12 +1200
Subject: [PATCH 443/447] Tests only - update tests for sql server

---
 .../java/org/tests/m2m/TestM2MDistinct_sqlServer.java    | 4 ++--
 .../src/test/java/org/tests/model/cache/EColAB.java      | 6 +++---
 .../java/org/tests/model/json/TestJacksonPlainBean.java  | 9 +++++++--
 .../test/java/org/tests/query/TestQueryFilterMany.java   | 6 +++++-
 .../java/org/tests/softdelete/TestSoftDeleteBasic.java   | 4 ++--
 .../softdelete/TestSoftDeleteOptionalRelationship.java   | 6 +++++-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java
index 29c216ce7..d06989acb 100644
--- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java
+++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java
@@ -29,8 +29,8 @@ public class TestM2MDistinct_sqlServer extends BaseTestCase {
 
     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 = ? "
+      + "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/ebean-core/src/test/java/org/tests/model/cache/EColAB.java b/ebean-core/src/test/java/org/tests/model/cache/EColAB.java
index f3a7377b7..763d70e6c 100644
--- a/ebean-core/src/test/java/org/tests/model/cache/EColAB.java
+++ b/ebean-core/src/test/java/org/tests/model/cache/EColAB.java
@@ -13,7 +13,7 @@ import javax.persistence.Table;
 public class EColAB extends Model {
 
   @Id
-  private Long id;
+  private Integer id;
 
   private String columnA;
 
@@ -24,11 +24,11 @@ public class EColAB extends Model {
     this.columnB = columnB;
   }
 
-  public Long getId() {
+  public Integer getId() {
     return id;
   }
 
-  public void setId(Long id) {
+  public void setId(Integer id) {
     this.id = id;
   }
 
diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
index b2237731d..2a7456b07 100644
--- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
+++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java
@@ -1,12 +1,13 @@
 package org.tests.model.json;
 
+import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebeantest.LoggedSql;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestJacksonPlainBean {
+public class TestJacksonPlainBean extends BaseTestCase {
 
   @Test
   public void insertNullStayNull() {
@@ -46,7 +47,11 @@ public class TestJacksonPlainBean {
     bean.setPlainBean2(new PlainBean("bar", 27));
 
     DB.save(bean);
-    expectedSql(0, "insert into ebasic_plain (attr, plain_bean, plain_bean2, version) values (?,?,?,?)");
+    if (isSqlServer()) {
+      expectedSql(0, "insert into ebasic_plain (id, attr, plain_bean, plain_bean2, version) values (?,?,?,?,?)");
+    } else {
+      expectedSql(0, "insert into ebasic_plain (attr, plain_bean, plain_bean2, version) values (?,?,?,?)");
+    }
 
     // inserted plainBean has not been mutated
     bean.setAttr("attr1");
diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
index 92c334ed0..eafadf8b8 100644
--- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
+++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java
@@ -302,6 +302,10 @@ public class TestQueryFilterMany extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     assertThat(sql).hasSize(1);
-    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? escape'|' ) order by t0.id; --bind(rob%)");
+    if (isSqlServer()) {
+      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? ) order by t0.id; --bind(rob%)");
+    } else {
+      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? escape'|' ) order by t0.id; --bind(rob%)");
+    }
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index 3364417b9..4f271f0f6 100644
--- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -241,7 +241,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
                                          .query();
 
     List<EBasicSoftDelete> list = query.findList();
-    if (isMySql() || isMariaDB()) {
+    if (isMySql() || isMariaDB() || isSqlServer()) {
       assertSql(query).contains("t0.deleted = 0");
       assertSql(query).contains("u1.deleted = 0");
     } else {
@@ -277,7 +277,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
 
     List<EBasicNoSDChild> list = query.findList();
     // Make sure that query includes that the child mustn't've been deleted
-    if (isMySql() || isMariaDB()) {
+    if (isMySql() || isMariaDB() || isSqlServer()) {
       assertSql(query).contains("u1.deleted = 0");
       assertSql(query).contains("u2.deleted = 0");
     } else {
diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
index b4e320b21..8f730921a 100644
--- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
+++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java
@@ -60,7 +60,11 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase {
 
     final List<String> sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = false where");
+    if (isSqlServer()) {
+      assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = 0 where");
+    } else {
+      assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = false where");
+    }
   }
 
 }

From da6f7d671b8b777ca3f42f2534b307d516060280 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 31 Aug 2021 14:26:52 +1200
Subject: [PATCH 444/447] #2336 - @DbArray List or Set of UUID or enum returned
 as String (not converted) when DB does not support ARRAY

---
 .../server/type/DefaultTypeManager.java       | 32 ++++---------
 .../type/PlatformArrayTypeJsonList.java       | 41 ++++++++++++++++
 .../server/type/PlatformArrayTypeJsonSet.java | 41 ++++++++++++++++
 .../server/type/ScalarTypeJsonList.java       | 48 ++++++++++++++++++-
 .../server/type/ScalarTypeJsonSet.java        | 47 +++++++++++++++++-
 .../tests/model/array/TestDbArray_asSet.java  | 10 ++--
 .../tests/model/array/TestDbArray_basic.java  |  9 ++--
 7 files changed, 193 insertions(+), 35 deletions(-)
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java
 create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index d58c284f3..5d95efd6e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -162,30 +162,22 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
-  /**
-   * Return the factory to use to support DB ARRAY types.
-   */
   private PlatformArrayTypeFactory arrayTypeListFactory(DatabasePlatform databasePlatform) {
     if (databasePlatform.isNativeArrayType()) {
       return ScalarTypeArrayList.factory();
     } else if (databasePlatform.isPlatform(Platform.H2)) {
       return ScalarTypeArrayListH2.factory();
     }
-    // not supported for this DB platform
-    return null;
+    return new PlatformArrayTypeJsonList();
   }
 
-  /**
-   * Return the factory to use to support DB ARRAY types.
-   */
   private PlatformArrayTypeFactory arrayTypeSetFactory(DatabasePlatform databasePlatform) {
     if (databasePlatform.isNativeArrayType()) {
       return ScalarTypeArraySet.factory();
     } else if (databasePlatform.isPlatform(Platform.H2)) {
       return ScalarTypeArraySetH2.factory();
     }
-    // not supported for this DB platform
-    return null;
+    return new PlatformArrayTypeJsonSet();
   }
 
   /**
@@ -305,25 +297,17 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private ScalarType<?> getArrayScalarTypeSet(Type valueType, boolean nullable) {
-    if (arrayTypeSetFactory != null) {
-      if (isEnumType(valueType)) {
-        return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable);
-      }
-      return arrayTypeSetFactory.typeFor(valueType, nullable);
+    if (isEnumType(valueType)) {
+      return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable);
     }
-    // fallback to JSON storage in VARCHAR column
-    return new ScalarTypeJsonSet.Varchar(getDocType(valueType), nullable, false); // TODO: keepSource for @DbArray?
+    return arrayTypeSetFactory.typeFor(valueType, nullable);
   }
 
   private ScalarType<?> getArrayScalarTypeList(Type valueType, boolean nullable) {
-    if (arrayTypeListFactory != null) {
-      if (isEnumType(valueType)) {
-        return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable);
-      }
-      return arrayTypeListFactory.typeFor(valueType, nullable);
+    if (isEnumType(valueType)) {
+      return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable);
     }
-    // fallback to JSON storage in VARCHAR column
-    return new ScalarTypeJsonList.Varchar(getDocType(valueType), nullable, false); // TODO: keepSource for @DbArray?
+    return arrayTypeListFactory.typeFor(valueType, nullable);
   }
 
   private Class<? extends Enum<?>> asEnumClass(Type valueType) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java
new file mode 100644
index 000000000..8b3232b28
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java
@@ -0,0 +1,41 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;
+
+import java.lang.reflect.Type;
+import java.util.UUID;
+
+/**
+ * Fallback for DbArray as Json List.
+ */
+class PlatformArrayTypeJsonList implements PlatformArrayTypeFactory {
+
+  private DocPropertyType docType(Type valueType) {
+    if (valueType.equals(Long.class)) {
+      return DocPropertyType.LONG;
+    }
+    if (valueType.equals(Integer.class)) {
+      return DocPropertyType.INTEGER;
+    }
+    if (valueType.equals(Double.class)) {
+      return DocPropertyType.DOUBLE;
+    }
+    return DocPropertyType.TEXT;
+  }
+
+  @Override
+  public ScalarType<?> typeFor(Type valueType, boolean nullable) {
+    if (valueType.equals(UUID.class)) {
+      // TODO: keepSource for @DbArray?
+      return new ScalarTypeJsonList.VarcharWithConverter(DocPropertyType.UUID, nullable, false, ArrayElementConverter.UUID);
+    }
+    return new ScalarTypeJsonList.Varchar(docType(valueType), nullable, false);
+  }
+
+  @Override
+  public ScalarType<?> typeForEnum(ScalarType<?> scalarType, boolean nullable) {
+    final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType);
+    return new ScalarTypeJsonList.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter);
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java
new file mode 100644
index 000000000..a5c7595f7
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java
@@ -0,0 +1,41 @@
+package io.ebeaninternal.server.type;
+
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;
+
+import java.lang.reflect.Type;
+import java.util.UUID;
+
+/**
+ * Fallback for DbArray as Json Set.
+ */
+class PlatformArrayTypeJsonSet implements PlatformArrayTypeFactory {
+
+  private DocPropertyType docType(Type valueType) {
+    if (valueType.equals(Long.class)) {
+      return DocPropertyType.LONG;
+    }
+    if (valueType.equals(Integer.class)) {
+      return DocPropertyType.INTEGER;
+    }
+    if (valueType.equals(Double.class)) {
+      return DocPropertyType.DOUBLE;
+    }
+    return DocPropertyType.TEXT;
+  }
+
+  @Override
+  public ScalarType<?> typeFor(Type valueType, boolean nullable) {
+    if (valueType.equals(UUID.class)) {
+      // TODO: keepSource for @DbArray?
+      return new ScalarTypeJsonSet.VarcharWithConverter(DocPropertyType.UUID, nullable, false, ArrayElementConverter.UUID);
+    }
+    return new ScalarTypeJsonSet.Varchar(docType(valueType), nullable, false);
+  }
+
+  @Override
+  public ScalarType<?> typeForEnum(ScalarType<?> scalarType, boolean nullable) {
+    final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType);
+    return new ScalarTypeJsonSet.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter);
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index 71179dba7..4abd85931 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -9,11 +9,13 @@ import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
+import io.ebeaninternal.json.ModifyAwareList;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,6 +38,46 @@ final class ScalarTypeJsonList {
     return new ScalarTypeJsonList.Varchar(docType, nullable, keepSource);
   }
 
+  @SuppressWarnings("rawtypes")
+  static final class VarcharWithConverter extends ScalarTypeJsonList.Base {
+    private final ArrayElementConverter converter;
+
+    VarcharWithConverter(DocPropertyType docType, boolean nullable, boolean keepSource, ArrayElementConverter converter) {
+      super(Types.VARCHAR, docType, nullable, keepSource);
+      this.converter = converter;
+    }
+
+    @Override
+    List readJsonConvert(String json) {
+      try {
+        return convertElements(EJson.parseList(json, false));
+      } catch (IOException e) {
+        throw new TextException("Failed to parse JSON [{}] as List", json, e);
+      }
+    }
+
+    @SuppressWarnings("unchecked")
+    private List convertElements(List<Object> rawList) {
+      if (rawList == null) {
+        return null;
+      }
+      final List result = new ArrayList<>(rawList.size());
+      for (Object o : rawList) {
+        result.add(converter.fromSerialized(o));
+      }
+      return new ModifyAwareList(result);
+    }
+
+    @Override
+    public List parse(String value) {
+      try {
+        return convertElements(EJson.parseList(value, false));
+      } catch (IOException e) {
+        throw new TextException("Failed to parse JSON [{}] as List", value, e);
+      }
+    }
+  }
+
   /**
    * List mapped to DB VARCHAR.
    */
@@ -86,6 +128,10 @@ final class ScalarTypeJsonList {
       if (keepSource) {
         reader.pushJson(json);
       }
+      return readJsonConvert(json);
+    }
+
+    List readJsonConvert(String json) {
       try {
         // parse JSON into modifyAware list
         return EJson.parseList(json, true);
@@ -130,7 +176,7 @@ final class ScalarTypeJsonList {
     }
 
     @Override
-    public final List parse(String value) {
+    public List parse(String value) {
       try {
         return EJson.parseList(value, false);
       } catch (IOException e) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index 50cc7f0b3..354d793d7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -9,6 +9,7 @@ import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
+import io.ebeaninternal.json.ModifyAwareSet;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -38,6 +39,45 @@ final class ScalarTypeJsonSet {
     return new ScalarTypeJsonSet.Varchar(docPropertyType, nullable, keepSource);
   }
 
+  @SuppressWarnings("rawtypes")
+  static final class VarcharWithConverter extends ScalarTypeJsonSet.Base {
+    private final ArrayElementConverter converter;
+
+    VarcharWithConverter(DocPropertyType docType, boolean nullable, boolean keepSource, ArrayElementConverter converter) {
+      super(Types.VARCHAR, docType, nullable, keepSource);
+      this.converter = converter;
+    }
+
+    @Override
+    Set readJsonConvert(String json) {
+      try {
+        return convertElements(EJson.parseSet(json, false));
+      } catch (IOException e) {
+        throw new TextException("Failed to parse JSON [{}] as List", json, e);
+      }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Set convertElements(Set<Object> rawSet) {
+      if (rawSet == null) {
+        return null;
+      }
+      final Set result = new LinkedHashSet(rawSet.size());
+      for (Object o : rawSet) {
+        result.add(converter.fromSerialized(o));
+      }
+      return new ModifyAwareSet(result);
+    }
+
+    @Override
+    public Set parse(String value) {
+      try {
+        return convertElements(EJson.parseSet(value, false));
+      } catch (IOException e) {
+        throw new PersistenceException("Failed to parse JSON content as Set: [" + value + "]", e);
+      }
+    }
+  }
   /**
    * List mapped to DB VARCHAR.
    */
@@ -86,8 +126,11 @@ final class ScalarTypeJsonSet {
       if (keepSource) {
         reader.pushJson(json);
       }
+      return readJsonConvert(json);
+    }
+
+    Set readJsonConvert(String json) {
       try {
-        // parse JSON into modifyAware list
         return EJson.parseSet(json, true);
       } catch (IOException e) {
         throw new TextException("Failed to parse JSON [{}] as Set", json, e);
@@ -130,7 +173,7 @@ final class ScalarTypeJsonSet {
     }
 
     @Override
-    public final Set parse(String value) {
+    public Set parse(String value) {
       try {
         return convertList(EJson.parseList(value));
       } catch (IOException e) {
diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
index 36b917c36..5c1791056 100644
--- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
+++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
@@ -179,11 +179,13 @@ public class TestDbArray_asSet extends BaseTestCase {
 
     Ebean.save(bean);
     // load cache
-    Ebean.find(EArraySetBean.class, bean.getId());
+    final EArraySetBean entry = Ebean.find(EArraySetBean.class, bean.getId());
+    assertThat(entry.getUids()).hasSameElementsAs(uids);
+    assertThat(entry.getStatus()).hasSameElementsAs(statuses);
+
     // hit cache
     EArraySetBean found = Ebean.find(EArraySetBean.class, bean.getId());
-
-    assertThat(found.getUids()).isEqualTo(uids);
-    assertThat(found.getStatus()).isEqualTo(statuses);
+    assertThat(found.getUids()).hasSameElementsAs(uids);
+    assertThat(found.getStatus()).hasSameElementsAs(statuses);
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
index a3b5ad3d0..f6c7b7da1 100644
--- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -268,11 +268,12 @@ public class TestDbArray_basic extends BaseTestCase {
 
     DB.save(bean);
     // load cache
-    DB.find(EArrayBean.class, bean.getId());
+    final EArrayBean entry = DB.find(EArrayBean.class, bean.getId());
+    assertThat(entry.getUids()).hasSameElementsAs(uids);
+    assertThat(entry.getStatuses()).hasSameElementsAs(statuses);
     // hit cache
     EArrayBean found = DB.find(EArrayBean.class, bean.getId());
-
-    assertThat(found.getUids()).isEqualTo(uids);
-    assertThat(found.getStatuses()).isEqualTo(statuses);
+    assertThat(found.getUids()).hasSameElementsAs(uids);
+    assertThat(found.getStatuses()).hasSameElementsAs(statuses);
   }
 }

From 172c1d10a18a31f93380bc894e8d1ed0eaadc729 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 31 Aug 2021 14:28:54 +1200
Subject: [PATCH 445/447] Tidy test only - tidy TestDbArray_asSet

---
 .../tests/model/array/TestDbArray_asSet.java  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
index 5c1791056..907bac4ac 100644
--- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
+++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java
@@ -1,7 +1,7 @@
 package org.tests.model.array;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals;
 
 public class TestDbArray_asSet extends BaseTestCase {
 
-  private EArraySetBean bean = new EArraySetBean();
+  private final EArraySetBean bean = new EArraySetBean();
 
   private EArraySetBean found;
 
@@ -51,14 +51,14 @@ public class TestDbArray_asSet extends BaseTestCase {
     status.add(EArrayBean.Status.TWO);
     bean.setStatus(status);
 
-    Ebean.save(bean);
+    DB.save(bean);
 
-    found = Ebean.find(EArraySetBean.class, bean.getId());
+    found = DB.find(EArraySetBean.class, bean.getId());
 
     assertThat(found.getPhoneNumbers()).containsExactly("4321", "9823");
 
     if (isPostgres()) {
-      Query<EArraySetBean> query = Ebean.find(EArraySetBean.class)
+      Query<EArraySetBean> query = DB.find(EArraySetBean.class)
         .where()
         .arrayContains("otherIds", 96L, 97L)
         .arrayContains("uids", first)
@@ -74,7 +74,7 @@ public class TestDbArray_asSet extends BaseTestCase {
       assertSql(query).contains(" coalesce(cardinality(t0.phone_numbers),0) <> 0");
       assertThat(list).hasSize(1);
 
-      query = Ebean.find(EArraySetBean.class)
+      query = DB.find(EArraySetBean.class)
         .where()
         .arrayIsEmpty("otherIds")
         .arrayNotContains("uids", first)
@@ -93,11 +93,11 @@ public class TestDbArray_asSet extends BaseTestCase {
   //@Test//(dependsOnMethods = "insert")
   public void json_parse_format() {
 
-    String asJson = Ebean.json().toJson(found);
+    String asJson = DB.json().toJson(found);
     assertThat(asJson).contains("\"phoneNumbers\":[\"4321\",\"9823\"]");
     assertThat(asJson).contains("\"id\":");
 
-    EArraySetBean fromJson = Ebean.json().toBean(EArraySetBean.class, asJson);
+    EArraySetBean fromJson = DB.json().toBean(EArraySetBean.class, asJson);
     assertEquals(found.getId(), fromJson.getId());
     assertEquals(found.getId(), fromJson.getId());
     assertEquals(found.getName(), fromJson.getName());
@@ -109,7 +109,7 @@ public class TestDbArray_asSet extends BaseTestCase {
 
     found.setName("jack");
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
@@ -123,7 +123,7 @@ public class TestDbArray_asSet extends BaseTestCase {
     found.getUids().add(UUID.randomUUID());
 
     LoggedSqlCollector.start();
-    Ebean.save(found);
+    DB.save(found);
     List<String> sql = LoggedSqlCollector.stop();
 
     assertSql(sql.get(0)).contains("update earray_set_bean set phone_numbers=?, uids=?, version=? where");
@@ -139,8 +139,8 @@ public class TestDbArray_asSet extends BaseTestCase {
     bean.setOtherIds(null);
     bean.setUids(null);
 
-    Ebean.save(bean);
-    Ebean.delete(bean);
+    DB.save(bean);
+    DB.delete(bean);
   }
 
   @Test
@@ -156,8 +156,8 @@ public class TestDbArray_asSet extends BaseTestCase {
     Set<EArraySetBean> all = new HashSet<>();
     all.add(bean);
 
-    Ebean.saveAll(all);
-    Ebean.deleteAll(all);
+    DB.saveAll(all);
+    DB.deleteAll(all);
   }
 
   @Test
@@ -177,14 +177,14 @@ public class TestDbArray_asSet extends BaseTestCase {
     bean.setUids(uids);
     bean.setStatus(statuses);
 
-    Ebean.save(bean);
+    DB.save(bean);
     // load cache
-    final EArraySetBean entry = Ebean.find(EArraySetBean.class, bean.getId());
+    final EArraySetBean entry = DB.find(EArraySetBean.class, bean.getId());
     assertThat(entry.getUids()).hasSameElementsAs(uids);
     assertThat(entry.getStatus()).hasSameElementsAs(statuses);
 
     // hit cache
-    EArraySetBean found = Ebean.find(EArraySetBean.class, bean.getId());
+    EArraySetBean found = DB.find(EArraySetBean.class, bean.getId());
     assertThat(found.getUids()).hasSameElementsAs(uids);
     assertThat(found.getStatus()).hasSameElementsAs(statuses);
   }

From aa27aedca97236825ae978b3a39c23cacebb49bb Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 31 Aug 2021 17:21:52 +1200
Subject: [PATCH 446/447] [maven-release-plugin] prepare release
 ebean-parent-12.11.2

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index b6adad05d..9745a7ce7 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index c244053d2..f311eea17 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.2</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 6468059fe..64b9947af 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,88 +71,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.11.2-SNAPSHOT</version>
+        <version>12.11.2</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 10c45ea74..ef4b45445 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 66eb107fb..495c59f15 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.2</tag>
   </scm>
 
   <profiles>
@@ -78,19 +78,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index e454770b8..b10976b3d 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index c2ea63651..470c49fce 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index b62c33793..d64653732 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.2</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 42b18f4f1..8b7029ff7 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index a91cdb4ef..867a485ff 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 835a05812..bae231e85 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 894f7f1b9..c80b9cc27 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index b17e93449..69901301e 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 68601c019..6f8b62397 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2-SNAPSHOT</version>
+      <version>12.11.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 9e8ae831a..06ad4a27f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.11.2-SNAPSHOT</version>
+  <version>12.11.2</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.8.0</tag>
+    <tag>ebean-parent-12.11.2</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 1cf09f8be..5219348aa 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2-SNAPSHOT</version>
+    <version>12.11.2</version>
   </parent>
 
   <name>querybean generator</name>

From c0007d3c1a2b71c0b0c454b3b3f1074b9904d26f Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 31 Aug 2021 17:21:59 +1200
Subject: [PATCH 447/447] [maven-release-plugin] prepare for next development
 iteration

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  6 +++---
 ebean-bom/pom.xml                  | 30 +++++++++++++++---------------
 ebean-core-type/pom.xml            |  4 ++--
 ebean-core/pom.xml                 | 10 +++++-----
 ebean-ddl-generator/pom.xml        |  6 +++---
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 10 +++++-----
 ebean-postgis/pom.xml              |  6 +++---
 ebean-querybean/pom.xml            | 10 +++++-----
 ebean-redis/pom.xml                | 12 ++++++------
 ebean-test/pom.xml                 |  6 +++---
 ebean/pom.xml                      |  8 ++++----
 kotlin-querybean-generator/pom.xml |  8 ++++----
 pom.xml                            |  4 ++--
 querybean-generator/pom.xml        |  2 +-
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 9745a7ce7..9bb40a671 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index f311eea17..79101340c 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 64b9947af..5cd61b30c 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,88 +71,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.11.2</version>
+        <version>12.11.3-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index ef4b45445..ebe821cc6 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 495c59f15..3ca1e8a3b 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <profiles>
@@ -78,19 +78,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index b10976b3d..44cdee7e6 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 470c49fce..f620a73b1 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index d64653732..8fc4b1715 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 8b7029ff7..5fc612855 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 867a485ff..946d9c61a 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index bae231e85..0006d6a65 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index c80b9cc27..c8c51c856 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 69901301e..dcd62a0d1 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 6f8b62397..b573491cb 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.2</version>
+      <version>12.11.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 06ad4a27f..02228496e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.11.2</version>
+  <version>12.11.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.2</tag>
+    <tag>ebean-parent-12.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 5219348aa..540ef7273 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.2</version>
+    <version>12.11.3-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>